fix(1898): adjust location handling in find-refs (#1901)

Author: a-tarasyuk

internal/ls/documenthighlights.go

@@ -51,7 +51,7 @@ func (l *LanguageService) ProvideDocumentHighlights(ctx context.Context, documen
 }
 
 func (l *LanguageService) getSemanticDocumentHighlights(ctx context.Context, position int, node *ast.Node, program *compiler.Program, sourceFile *ast.SourceFile) []*lsproto.DocumentHighlight {
-	options := refOptions{use: referenceUseReferences}
+	options := refOptions{use: referenceUseNone}
 	referenceEntries := l.getReferencedSymbolsForNode(ctx, position, node, program, []*ast.SourceFile{sourceFile}, options, &collections.Set[string]{})
 	if referenceEntries == nil {
 		return nil

internal/ls/findallreferences.go

@@ -611,6 +611,10 @@ func (l *LanguageService) getReferencedSymbolsForNode(ctx context.Context, posit
 		}
 	}
 
+	if options.use == referenceUseReferences || options.use == referenceUseRename {
+		node = getAdjustedLocation(node, options.use == referenceUseRename, ast.GetSourceFileOfNode(node))
+	}
+
 	checker, done := program.GetTypeChecker(ctx)
 	defer done()
 

internal/ls/utilities.go

@@ -917,7 +917,7 @@ func getAdjustedLocation(node *ast.Node, forRename bool, sourceFile *ast.SourceF
 	// specially by `getSymbolAtLocation`.
 	isModifier := func(node *ast.Node) bool {
 		if ast.IsModifier(node) && (forRename || node.Kind != ast.KindDefaultKeyword) {
-			return ast.CanHaveModifiers(parent) && slices.Contains(parent.Modifiers().NodeList.Nodes, node)
+			return ast.CanHaveModifiers(parent) && parent.Modifiers() != nil && slices.Contains(parent.Modifiers().NodeList.Nodes, node)
 		}
 		switch node.Kind {
 		case ast.KindClassKeyword:

testdata/baselines/reference/fourslash/findAllReferences/constructorFindAllReferences1.baseline.jsonc

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

testdata/baselines/reference/fourslash/findAllReferences/constructorFindAllReferences2.baseline.jsonc

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

testdata/baselines/reference/fourslash/findAllReferences/constructorFindAllReferences4.baseline.jsonc

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

testdata/baselines/reference/fourslash/findAllReferences/findAllReferencesDynamicImport1.baseline.jsonc

@@ -18,7 +18,7 @@
 // === /foo.ts ===
 // export function foo() { return "foo"; }
 // import("./foo")
-// /*FIND ALL REFS*/var x = import("./foo")
+// /*FIND ALL REFS*/var [|x|] = import("./foo")
 
 
 

testdata/baselines/reference/fourslash/findAllReferences/findAllReferencesOfJsonModule.baseline.jsonc

@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /foo.ts ===
-// /*FIND ALL REFS*/import settings from "./settings.json";
-// settings;
+// /*FIND ALL REFS*/import [|settings|] from "./settings.json";
+// [|settings|];
 
 
 

testdata/baselines/reference/fourslash/findAllReferences/findAllRefsDeclareClass.baseline.jsonc

@@ -1,6 +1,6 @@
 // === findAllReferences ===
 // === /findAllRefsDeclareClass.ts ===
-// /*FIND ALL REFS*/declare class C {
+// /*FIND ALL REFS*/declare class [|C|] {
 //     static m(): void;
 // }
 

testdata/baselines/reference/fourslash/findAllReferences/findAllRefsEnumAsNamespace.baseline.jsonc

@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllRefsEnumAsNamespace.ts ===
-// /*FIND ALL REFS*/enum E { A }
-// let e: E.A;
+// /*FIND ALL REFS*/enum [|E|] { A }
+// let e: [|E|].A;