fix(1342): adjust node ranges to ignore trivia

internal/ls/findallreferences.go

@@ -419,7 +419,7 @@ func (l *LanguageService) convertSymbolAndEntryToLocation(s *SymbolAndEntries) [
 	for _, ref := range s.references {
 		if ref.textRange == nil {
 			sourceFile := ast.GetSourceFileOfNode(ref.node)
-			ref.textRange = l.createLspRangeFromNode(ref.node, ast.GetSourceFileOfNode(ref.node))
+			ref.textRange = l.getRangeOfNode(ref.node, sourceFile, nil /*endNode*/)
 			ref.fileName = sourceFile.FileName()
 		}
 		locations = append(locations, &lsproto.Location{

internal/ls/findallreferences_test.go

@@ -241,6 +241,19 @@ class C extends [|/*3*/Base|] { }`,
 				"3": collections.NewSetFromItems("2", "3"),
 			},
 		},
+		{
+			title: "findAllRefsTrivia",
+			input: `export interface A {
+    /** Comment */
+    [|/*m1*/method|](): string;
+    /** Comment */
+    [|/*m2*/method|](format: string): string;
+}`,
+			expectedLocations: map[string]*collections.Set[string]{
+				"m1": collections.NewSetFromItems("m1", "m2"),
+				"m2": collections.NewSetFromItems("m1", "m2"),
+			},
+		},
 	}
 
 	for _, testCase := range testCases {

internal/ls/findallreferencesexport_test.go

@@ -13,7 +13,7 @@ func (l *LanguageService) GetExpectedReferenceFromMarker(fileName string, pos in
 	node := astnav.GetTouchingPropertyName(sourceFile, pos)
 	return &lsproto.Location{
 		Uri:   FileNameToDocumentURI(fileName),
-		Range: *l.createLspRangeFromNode(node, sourceFile),
+		Range: *l.getRangeOfNode(node, sourceFile, nil /*endNode*/),
 	}
 }
 

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

@@ -1,12 +1,12 @@
 // === findAllReferences ===
 // === /home/src/workspaces/project/a/index.d.ts ===
 
-// declare class[| A|] {
+// declare class [|A|] {
 // }
 // //# sourceMappingURL=index.d.ts.map
 
 
 // === /home/src/workspaces/project/b/b.ts ===
 
 // /// <reference path="../a/index.d.ts" />
-// new A/*FIND ALL REFS*/[| A|]();
+// new A/*FIND ALL REFS*/[|A|]();

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

@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /constructorFindAllReferences3.ts ===
 
-// export class[| C|] {
+// export class [|C|] {
 //     /*FIND ALL REFS*/constructor() { }
 //     public foo() { }
 // }
 // 
-// new[| C|]().foo();
+// new [|C|]().foo();

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

@@ -7,7 +7,7 @@
 // === /abc.d.ts ===
 
 // declare module "a" {
-//     export const /*FIND ALL REFS*/[| x|]: number;
+//     export const /*FIND ALL REFS*/[|x|]: number;
 // }
 
 
@@ -17,5 +17,5 @@
 // === /abc.d.ts ===
 
 // declare module "a" {
-//     export const[| x|]: number;
+//     export const [|x|]: number;
 // }

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

@@ -7,7 +7,7 @@
 // === /a.d.ts ===
 
 // export as namespace abc;
-// export const /*FIND ALL REFS*/[| x|]: number;
+// export const /*FIND ALL REFS*/[|x|]: number;
 
 
 
@@ -16,7 +16,7 @@
 // === /a.d.ts ===
 
 // export as namespace abc;
-// export const[| x|]: number;
+// export const [|x|]: number;
 
 
 // === /b.ts ===

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

@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllReferencesFilteringMappedTypeProperty.ts ===
 
-// const obj = { /*FIND ALL REFS*/[| a|]: 1, b: 2 };
+// const obj = { /*FIND ALL REFS*/[|a|]: 1, b: 2 };
 // const filtered: { [P in keyof typeof obj as P extends 'b' ? never : P]: 0; } = { a: 0 };
 // filtered.[|a|];
 
@@ -12,7 +12,7 @@
 // === /findAllReferencesFilteringMappedTypeProperty.ts ===
 
 // const obj = { a: 1, b: 2 };
-// const filtered: { [P in keyof typeof obj as P extends 'b' ? never : P]: 0; } = { /*FIND ALL REFS*/[| a|]: 0 };
+// const filtered: { [P in keyof typeof obj as P extends 'b' ? never : P]: 0; } = { /*FIND ALL REFS*/[|a|]: 0 };
 // filtered.a;
 
 
@@ -21,6 +21,6 @@
 // === findAllReferences ===
 // === /findAllReferencesFilteringMappedTypeProperty.ts ===
 
-// const obj = {[| a|]: 1, b: 2 };
+// const obj = { [|a|]: 1, b: 2 };
 // const filtered: { [P in keyof typeof obj as P extends 'b' ? never : P]: 0; } = { a: 0 };
 // filtered./*FIND ALL REFS*/[|a|];

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

@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllReferencesFromLinkTagReference1.ts ===
 
-// enum E {[|
+// enum E {
 //     /** {@link /*FIND ALL REFS*/[|A|]} */
-//     A|]
+//     [|A|]
 // }

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

@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// enum E {[|
+// enum E {
 //     /** {@link /*FIND ALL REFS*/[|Foo|]} */
-//     Foo|]
+//     [|Foo|]
 // }
 // interface Foo {
 //     foo: E.[|Foo|];

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

@@ -8,7 +8,7 @@
 
 // === /b.ts ===
 
-// enum E {[|
+// enum E {
 //     /** {@link /*FIND ALL REFS*/[|Foo|]} */
-//     Foo|]
+//     [|Foo|]
 // }

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

@@ -3,6 +3,6 @@
 
 // enum E {
 //     /** {@link /*FIND ALL REFS*/[|B|]} */
-//     A,[|
-//     B|]
+//     A,
+//     [|B|]
 // }

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

@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllReferencesFromLinkTagReference5.ts ===
 
-// enum E {[|
+// enum E {
 //     /** {@link E./*FIND ALL REFS*/[|A|]} */
-//     A|]
+//     [|A|]
 // }

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

@@ -2,4 +2,4 @@
 // === /Foo.js ===
 
 // /** @type {function (this: string, string): string} */
-// var f = function (s) { return /*FIND ALL REFS*/[| this|] + s; }
+// var f = function (s) { return /*FIND ALL REFS*/[|this|] + s; }

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

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

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

@@ -1,11 +1,11 @@
 // === findAllReferences ===
 // === /bar.js ===
 
-// const { /*FIND ALL REFS*/[| foo|]: bar } = require('./foo');
+// const { /*FIND ALL REFS*/[|foo|]: bar } = require('./foo');
 
 
 // === /foo.js ===
 
-// module.exports = {[|
-//     foo|]: '1'
+// module.exports = {
+//     [|foo|]: '1'
 // };

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

@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /X.js ===
 
-// module.exports = {[| x|]: 1 };
+// module.exports = { [|x|]: 1 };
 
 
 // === /Y.js ===
 
-// const { /*FIND ALL REFS*/[| x|]: { y } } = require("./X");
+// const { /*FIND ALL REFS*/[|x|]: { y } } = require("./X");

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

@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag1.ts ===
 
-// class C {[|
-//     m|]/*FIND ALL REFS*/() { }
+// class C {
+//     m/*FIND ALL REFS*/[|m|]() { }
 //     n = 1
 //     static s() { }
 //     /**
@@ -25,8 +25,8 @@
 // === /findAllReferencesLinkTag1.ts ===
 
 // class C {
-//     m() { }[|
-//     n|]/*FIND ALL REFS*/ = 1
+//     m() { }
+//     n/*FIND ALL REFS*/[|n|] = 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*/[|s|]() { }
 //     /**
 //      * {@link m}
 //      * @see {m}
@@ -75,12 +75,11 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag1.ts ===
 
-// --- (line: 32) skipped ---
-//     r() { }
+// --- (line: 33) skipped ---
 // }
 // 
-// interface I {[|
-//     a|]/*FIND ALL REFS*/()
+// interface I {
+//     a/*FIND ALL REFS*/[|a|]()
 //     b: 1
 //     /**
 //      * {@link a}
@@ -92,12 +91,11 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag1.ts ===
 
-// --- (line: 33) skipped ---
-// }
+// --- (line: 34) skipped ---
 // 
 // interface I {
-//     a()[|
-//     b|]/*FIND ALL REFS*/: 1
+//     a()
+//     b/*FIND ALL REFS*/[|b|]: 1
 //     /**
 //      * {@link a}
 //      * @see {a}
@@ -117,7 +115,7 @@
 //     function ref() { }
 //     /** @see {r2} */
 //     function d3() { }
-//     function r2/*FIND ALL REFS*/[| r2|]() { }
+//     function r2/*FIND ALL REFS*/[|r2|]() { }
 // }
 
 
@@ -126,7 +124,7 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag1.ts ===
 
-// class C/*FIND ALL REFS*/[| C|] {
+// class C/*FIND ALL REFS*/[|C|] {
 //     m() { }
 //     n = 1
 //     static s() { }
@@ -171,7 +169,7 @@
 //     r() { }
 // }
 // 
-// interface I/*FIND ALL REFS*/[| I|] {
+// interface I/*FIND ALL REFS*/[|I|] {
 //     a()
 //     b: 1
 //     /**

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

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