fix(1342): adjust node ranges to ignore trivia (#1355)

Author: a-tarasyuk

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|];