Fix compare LSP positions

internal/ls/utilities.go

@@ -28,7 +28,7 @@ func ComparePositions(pos, other lsproto.Position) int {
 	if lineComp := cmp.Compare(pos.Line, other.Line); lineComp != 0 {
 		return lineComp
 	}
-	return cmp.Compare(pos.Line, other.Line)
+	return cmp.Compare(pos.Character, other.Character)
 }
 
 // Implements a cmp.Compare like function for two *lsproto.Range

testdata/baselines/reference/fourslash/findAllRef/AutoImportProvider_referencesCrash.baseline.jsonc

@@ -9,4 +9,4 @@
 // === /home/src/workspaces/project/b/b.ts ===
 
 // /// <reference path="../a/index.d.ts" />
-// new A/*FIND ALL REFS*/[|A|]();
+// new [|A|]/*FIND ALL REFS*/();

testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesImportMeta.baseline.jsonc

@@ -3,4 +3,4 @@
 
 // // Haha that's so meta!
 // 
-// let x = import.meta/*FIND ALL REFS*/[|meta|];
+// let x = import.[|meta|]/*FIND ALL REFS*/;

testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsOverloadedFunctionParameter.baseline.jsonc

@@ -5,6 +5,6 @@
 //  * @param {unknown} x
 //  * @returns {unknown} 
 //  */
-// function foo(x/*FIND ALL REFS*/[|x|]) {
+// function foo([|x|]/*FIND ALL REFS*/) {
 //   return [|x|];
 // }

testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag1.baseline.jsonc

@@ -2,7 +2,7 @@
 // === /findAllReferencesLinkTag1.ts ===
 
 // class C {
-//     m/*FIND ALL REFS*/[|m|]() { }
+//     [|m|]/*FIND ALL REFS*/() { }
 //     n = 1
 //     static s() { }
 //     /**
@@ -26,7 +26,7 @@
 
 // class C {
 //     m() { }
-//     n/*FIND ALL REFS*/[|n|] = 1
+//     [|n|]/*FIND ALL REFS*/ = 1
 //     static s() { }
 //     /**
 //      * {@link m}
@@ -52,7 +52,7 @@
 // class C {
 //     m() { }
 //     n = 1
-//     static s/*FIND ALL REFS*/[|s|]() { }
+//     static [|s|]/*FIND ALL REFS*/() { }
 //     /**
 //      * {@link m}
 //      * @see {m}
@@ -79,7 +79,7 @@
 // }
 // 
 // interface I {
-//     a/*FIND ALL REFS*/[|a|]()
+//     [|a|]/*FIND ALL REFS*/()
 //     b: 1
 //     /**
 //      * {@link a}
@@ -95,7 +95,7 @@
 // 
 // interface I {
 //     a()
-//     b/*FIND ALL REFS*/[|b|]: 1
+//     [|b|]/*FIND ALL REFS*/: 1
 //     /**
 //      * {@link a}
 //      * @see {a}
@@ -115,7 +115,7 @@
 //     function ref() { }
 //     /** @see {r2} */
 //     function d3() { }
-//     function r2/*FIND ALL REFS*/[|r2|]() { }
+//     function [|r2|]/*FIND ALL REFS*/() { }
 // }
 
 
@@ -124,7 +124,7 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag1.ts ===
 
-// class C/*FIND ALL REFS*/[|C|] {
+// class [|C|]/*FIND ALL REFS*/ {
 //     m() { }
 //     n = 1
 //     static s() { }
@@ -169,7 +169,7 @@
 //     r() { }
 // }
 // 
-// interface I/*FIND ALL REFS*/[|I|] {
+// interface [|I|]/*FIND ALL REFS*/ {
 //     a()
 //     b: 1
 //     /**

testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag2.baseline.jsonc

@@ -6,7 +6,7 @@
 //         This = class {
 //             show() { }
 //         }
-//         m/*FIND ALL REFS*/[|m|]() { }
+//         [|m|]/*FIND ALL REFS*/() { }
 //     }
 //     /**
 //      * @see {Consider.prototype.m}
@@ -21,7 +21,7 @@
 // namespace NPR {
 //     export class Consider {
 //         This = class {
-//             show/*FIND ALL REFS*/[|show|]() { }
+//             [|show|]/*FIND ALL REFS*/() { }
 //         }
 //         m() { }
 //     }
@@ -35,7 +35,7 @@
 
 // namespace NPR {
 //     export class Consider {
-//         This/*FIND ALL REFS*/[|This|] = class {
+//         [|This|]/*FIND ALL REFS*/ = class {
 //             show() { }
 //         }
 //         m() { }
@@ -48,7 +48,7 @@
 // === /findAllReferencesLinkTag2.ts ===
 
 // namespace NPR {
-//     export class Consider/*FIND ALL REFS*/[|Consider|] {
+//     export class [|Consider|]/*FIND ALL REFS*/ {
 //         This = class {
 //             show() { }
 //         }
@@ -80,7 +80,7 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag2.ts ===
 
-// namespace NPR/*FIND ALL REFS*/[|NPR|] {
+// namespace [|NPR|]/*FIND ALL REFS*/ {
 //     export class Consider {
 //         This = class {
 //             show() { }

testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag3.baseline.jsonc

@@ -6,7 +6,7 @@
 //         This = class {
 //             show() { }
 //         }
-//         m/*FIND ALL REFS*/[|m|]() { }
+//         [|m|]/*FIND ALL REFS*/() { }
 //     }
 //     /**
 //      * {@linkcode Consider.prototype.[|m|]}
@@ -24,7 +24,7 @@
 // namespace NPR {
 //     export class Consider {
 //         This = class {
-//             show/*FIND ALL REFS*/[|show|]() { }
+//             [|show|]/*FIND ALL REFS*/() { }
 //         }
 //         m() { }
 //     }
@@ -38,7 +38,7 @@
 
 // namespace NPR {
 //     export class Consider {
-//         This/*FIND ALL REFS*/[|This|] = class {
+//         [|This|]/*FIND ALL REFS*/ = class {
 //             show() { }
 //         }
 //         m() { }
@@ -51,7 +51,7 @@
 // === /findAllReferencesLinkTag3.ts ===
 
 // namespace NPR {
-//     export class Consider/*FIND ALL REFS*/[|Consider|] {
+//     export class [|Consider|]/*FIND ALL REFS*/ {
 //         This = class {
 //             show() { }
 //         }
@@ -83,7 +83,7 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag3.ts ===
 
-// namespace NPR/*FIND ALL REFS*/[|NPR|] {
+// namespace [|NPR|]/*FIND ALL REFS*/ {
 //     export class Consider {
 //         This = class {
 //             show() { }

testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesNonExistentExportBinding.baseline.jsonc

@@ -1,4 +1,4 @@
 // === findAllReferences ===
 // === /bar.ts ===
 
-// import { Foo/*FIND ALL REFS*/[|Foo|] } from "./foo";
+// import { [|Foo|]/*FIND ALL REFS*/ } from "./foo";

testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesTripleSlash.baseline.jsonc

@@ -0,0 +1,14 @@
+// === findAllReferences ===
+// === /a.ts ===
+
+// /// <reference path="b.ts/*FIND ALL REFS*/" />
+// /// <reference types="globals" />
+
+
+
+
+// === findAllReferences ===
+// === /a.ts ===
+
+// /// <reference path="b.ts" />
+// /// <reference types="globals/*FIND ALL REFS*/" />

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumMember.baseline.jsonc

@@ -20,4 +20,4 @@
 // === /findAllRefsEnumMember.ts ===
 
 // enum E { [|A|], B }
-// const e: E.A = E./*FIND ALL REFS*/[|A|] = E.[|A|];
+// const e: E.[|A|] = E./*FIND ALL REFS*/[|A|];

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForFunctionExpression01.baseline.jsonc

@@ -21,7 +21,7 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// var foo = function foo(a = /*FIND ALL REFS*/[|foo|](a = [|foo|](), b = () => [|foo|]) {
+// var foo = function [|foo|](a = /*FIND ALL REFS*/[|foo|](), b = () => [|foo|]) {
 //     [|foo|]([|foo|], [|foo|]);
 // }
 
@@ -31,7 +31,7 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// var foo = function foo(a = foo(), b = () => /*FIND ALL REFS*/[|foo|](a = [|foo|](), b = () => [|foo|]) {
+// var foo = function [|foo|](a = [|foo|](), b = () => /*FIND ALL REFS*/[|foo|]) {
 //     [|foo|]([|foo|], [|foo|]);
 // }
 
@@ -52,7 +52,7 @@
 // === /file1.ts ===
 
 // var foo = function [|foo|](a = [|foo|](), b = () => [|foo|]) {
-//     foo(/*FIND ALL REFS*/[|foo|]([|foo|], [|foo|]);
+//     [|foo|](/*FIND ALL REFS*/[|foo|], [|foo|]);
 // }
 
 
@@ -62,5 +62,5 @@
 // === /file1.ts ===
 
 // var foo = function [|foo|](a = [|foo|](), b = () => [|foo|]) {
-//     foo(foo, /*FIND ALL REFS*/[|foo|]([|foo|], [|foo|]);
+//     [|foo|]([|foo|], /*FIND ALL REFS*/[|foo|]);
 // }

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCall.baseline.jsonc

@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /app.ts ===
 
-// export function he/*FIND ALL REFS*/[|hello|]() {};
+// export function [|he/*FIND ALL REFS*/llo|]() {};
 
 
 // === /direct-use.ts ===

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCallType.baseline.jsonc

@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /app.ts ===
 
-// export function he/*FIND ALL REFS*/[|hello|]() {};
+// export function [|he/*FIND ALL REFS*/llo|]() {};
 
 
 // === /indirect-use.ts ===

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates1.baseline.jsonc

@@ -29,4 +29,4 @@
 // === /findAllRefsInsideTemplates1.ts ===
 
 // var [|x|] = 10;
-// var y = `${ x } ${ /*FIND ALL REFS*/[|x|] } ${ [|x|] }`
+// var y = `${ [|x|] } ${ /*FIND ALL REFS*/[|x|] }`

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates2.baseline.jsonc

@@ -29,7 +29,7 @@
 // === /findAllRefsInsideTemplates2.ts ===
 
 // function [|f|](...rest: any[]) { }
-// f `${ /*FIND ALL REFS*/[|f|] `${ [|f|] } ${ [|f|] }`
+// [|f|] `${ /*FIND ALL REFS*/[|f|] } ${ [|f|] }`
 
 
 
@@ -38,4 +38,4 @@
 // === /findAllRefsInsideTemplates2.ts ===
 
 // function [|f|](...rest: any[]) { }
-// f `${ f } ${ /*FIND ALL REFS*/[|f|] `${ [|f|] } ${ [|f|] }`
+// [|f|] `${ [|f|] } ${ /*FIND ALL REFS*/[|f|] }`

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideWithBlock.baseline.jsonc

@@ -50,4 +50,4 @@
 //     y++;        // also reference for y should be ignored
 // }
 // 
-// x = /*FIND ALL REFS*/[|x|] = [|x|] + 1;
+// [|x|] = /*FIND ALL REFS*/[|x|] + 1;

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIsDefinition.baseline.jsonc

@@ -3,7 +3,7 @@
 
 // declare function [|foo|](a: number): number;
 // declare function [|foo|](a: string): string;
-// declare function foo/*FIND ALL REFS*/[|foo|](a: string | number): string | number;
+// declare function [|foo|]/*FIND ALL REFS*/(a: string | number): string | number;
 // 
 // function foon(a: number): number;
 // function foon(a: string): string;
@@ -29,7 +29,7 @@
 // 
 // function [|foon|](a: number): number;
 // function [|foon|](a: string): string;
-// function foon/*FIND ALL REFS*/[|foon|](a: string | number): string | number {
+// function [|foon|]/*FIND ALL REFS*/(a: string | number): string | number {
 //     return a
 // }
 // 
@@ -49,7 +49,7 @@
 // 
 // foo; foon;
 // 
-// export const bar/*FIND ALL REFS*/[|bar|] = 123;
+// export const [|bar|]/*FIND ALL REFS*/ = 123;
 // console.log({ [|bar|] });
 // 
 // interface IFoo {
@@ -66,7 +66,7 @@
 // console.log({ bar });
 // 
 // interface IFoo {
-//     foo/*FIND ALL REFS*/[|foo|](): void;
+//     [|foo|]/*FIND ALL REFS*/(): void;
 // }
 // class Foo implements IFoo {
 //     constructor(n: number)
@@ -110,6 +110,6 @@
 //     constructor(n: number)
 //     constructor()
 //     constructor(n: number?) { }
-//     foo/*FIND ALL REFS*/[|foo|](): void { }
+//     [|foo|]/*FIND ALL REFS*/(): void { }
 //     static init() { return new this() }
 // }

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag.baseline.jsonc

@@ -6,6 +6,6 @@
 //  */
 // 
 // /**
-//  * @param { A/*FIND ALL REFS*/[|A|] } a
+//  * @param { [|A|]/*FIND ALL REFS*/ } a
 //  */
 // function f(a) {}

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag2.baseline.jsonc

@@ -13,7 +13,7 @@
 // import [|Component|] from './component.js';
 // 
 // /**
-//  * @extends Component/*FIND ALL REFS*/[|Component|]
+//  * @extends [|Component|]/*FIND ALL REFS*/
 //  */
 // export class Player extends [|Component|] {}
 

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag3.baseline.jsonc

@@ -13,7 +13,7 @@
 // import { [|Component|] } from './component.js';
 // 
 // /**
-//  * @extends Component/*FIND ALL REFS*/[|Component|]
+//  * @extends [|Component|]/*FIND ALL REFS*/
 //  */
 // export class Player extends [|Component|] {}
 

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag4.baseline.jsonc

@@ -4,6 +4,6 @@
 // import * as [|C|] from './component.js';
 // 
 // /**
-//  * @extends C/*FIND ALL REFS*/[|C|].Component
+//  * @extends [|C|]/*FIND ALL REFS*/.Component
 //  */
 // export class Player extends Component {}

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMissingModulesOverlappingSpecifiers.baseline.jsonc

@@ -13,4 +13,4 @@
 
 // // https://github.com/microsoft/TypeScript/issues/5551
 // import { resolve as resolveUrl } from "idontcare";
-// import { resolve/*FIND ALL REFS*/[|resolve|] } from "whatever";
+// import { [|resolve|]/*FIND ALL REFS*/ } from "whatever";

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName03.baseline.jsonc

@@ -21,4 +21,4 @@
 // }
 // 
 // var foo: I;
-// var [ { property1: prop1 }, { /*FIND ALL REFS*/[|property1|]: prop1 }, { [|property1|], property2 } ] = [foo, foo];
+// var [ { [|property1|]: prop1 }, { /*FIND ALL REFS*/[|property1|], property2 } ] = [foo, foo];

testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName10.baseline.jsonc

@@ -48,5 +48,5 @@
 //     value: any;
 // }
 // 
-// function f ({ next: { /*FIND ALL REFS*/[|next|]: { [|next|]: x} }: Recursive) {
+// function f ({ [|next|]: { /*FIND ALL REFS*/[|next|]: x} }: Recursive) {
 // }