navigate to source when we can when reporting references

Author: sheetalkamat

internal/ls/documenthighlights.go

@@ -75,7 +75,7 @@ func (l *LanguageService) toDocumentHighlight(entry *ReferenceEntry) (string, *l
 	kind := lsproto.DocumentHighlightKindRead
 	if entry.kind == entryKindRange {
 		return entry.fileName, &lsproto.DocumentHighlight{
-			Range: *entry.textRange,
+			Range: *l.getRangeOfEntry(entry),
 			Kind:  &kind,
 		}
 	}
@@ -86,7 +86,7 @@ func (l *LanguageService) toDocumentHighlight(entry *ReferenceEntry) (string, *l
 	}
 
 	dh := &lsproto.DocumentHighlight{
-		Range: *entry.textRange,
+		Range: *l.getRangeOfEntry(entry),
 		Kind:  &kind,
 	}
 

internal/ls/findallreferences.go

@@ -104,7 +104,8 @@ type ReferenceEntry struct {
 	node      *ast.Node
 	context   *ast.Node // !!! ContextWithStartAndEndNode, optional
 	fileName  string
-	textRange *lsproto.Range
+	textRange *core.TextRange
+	lspRange  *lsproto.Location
 }
 
 func (entry *SymbolAndEntries) canUseDefinitionSymbol() bool {
@@ -126,29 +127,29 @@ func (entry *SymbolAndEntries) canUseDefinitionSymbol() bool {
 }
 
 func (l *LanguageService) getRangeOfEntry(entry *ReferenceEntry) *lsproto.Range {
-	return l.resolveEntry(entry).textRange
+	return &l.resolveEntry(entry).lspRange.Range
 }
 
-func (l *LanguageService) getFileNameOfEntry(entry *ReferenceEntry) string {
-	return l.resolveEntry(entry).fileName
+func (l *LanguageService) getFileNameOfEntry(entry *ReferenceEntry) lsproto.DocumentUri {
+	return l.resolveEntry(entry).lspRange.Uri
+}
+
+func (l *LanguageService) getLocationOfEntry(entry *ReferenceEntry) *lsproto.Location {
+	return l.resolveEntry(entry).lspRange
 }
 
 func (l *LanguageService) resolveEntry(entry *ReferenceEntry) *ReferenceEntry {
 	if entry.textRange == nil {
 		sourceFile := ast.GetSourceFileOfNode(entry.node)
-		entry.textRange = l.getLspRangeOfNode(entry.node, sourceFile, nil /*endNode*/)
+		textRange := getRangeOfNode(entry.node, sourceFile, nil /*endNode*/)
+		entry.textRange = &textRange
 		entry.fileName = sourceFile.FileName()
 	}
-	return entry
-}
-
-func (l *LanguageService) newRangeEntry(file *ast.SourceFile, start, end int) *ReferenceEntry {
-	// !!! used in not-yet implemented features
-	return &ReferenceEntry{
-		kind:      entryKindRange,
-		fileName:  file.FileName(),
-		textRange: l.createLspRangeFromBounds(start, end, file),
+	if entry.lspRange == nil {
+		location := l.getMappedLocation(entry.fileName, *entry.textRange)
+		entry.lspRange = &location
 	}
+	return entry
 }
 
 func newNodeEntryWithKind(node *ast.Node, kind entryKind) *ReferenceEntry {
@@ -284,10 +285,9 @@ func (l *LanguageService) getLspRangeOfNode(node *ast.Node, sourceFile *ast.Sour
 		sourceFile = ast.GetSourceFileOfNode(node)
 	}
 	textRange := getRangeOfNode(node, sourceFile, endNode)
-	return l.createLspRangeFromRange(textRange, sourceFile)
+	return l.createLspRangeFromBounds(textRange.Pos(), textRange.End(), sourceFile)
 }
 
-// `getTextSpan`
 func getRangeOfNode(node *ast.Node, sourceFile *ast.SourceFile, endNode *ast.Node) core.TextRange {
 	if sourceFile == nil {
 		sourceFile = ast.GetSourceFileOfNode(node)
@@ -447,9 +447,9 @@ func (nld *position) TextDocumentPosition() lsproto.Position { return nld.pos }
 func getFileAndStartPosFromDeclaration(declaration *ast.Node) (*ast.SourceFile, core.TextPos) {
 	file := ast.GetSourceFileOfNode(declaration)
 	name := core.OrElse(ast.GetNameOfDeclaration(declaration), declaration)
-	startPos := getStartPosFromNode(name, file)
+	textRange := getRangeOfNode(name, file, nil /*endNode*/)
 
-	return file, startPos
+	return file, core.TextPos(textRange.Pos())
 }
 
 func (l *LanguageService) GetNonLocalDefinition(ctx context.Context, entry *SymbolAndEntries) lsproto.HasTextDocumentPosition {
@@ -579,7 +579,7 @@ func (l *LanguageService) ProvideRenameFromSymbolAndEntries(ctx context.Context,
 	checker, done := program.GetTypeChecker(ctx)
 	defer done()
 	for _, entry := range entries {
-		uri := lsconv.FileNameToDocumentURI(l.getFileNameOfEntry(entry))
+		uri := l.getFileNameOfEntry(entry)
 		textEdit := &lsproto.TextEdit{
 			Range:   *l.getRangeOfEntry(entry),
 			NewText: l.getTextForRename(originalNode, entry, params.NewName, checker),
@@ -649,41 +649,28 @@ func (l *LanguageService) convertSymbolAndEntriesToLocations(s *SymbolAndEntries
 func (l *LanguageService) convertEntriesToLocations(entries []*ReferenceEntry) []lsproto.Location {
 	locations := make([]lsproto.Location, len(entries))
 	for i, entry := range entries {
-		locations[i] = lsproto.Location{
-			Uri:   lsconv.FileNameToDocumentURI(l.getFileNameOfEntry(entry)),
-			Range: *l.getRangeOfEntry(entry),
-		}
+		locations[i] = *l.getLocationOfEntry(entry)
 	}
 	return locations
 }
 
 func (l *LanguageService) convertEntriesToLocationLinks(entries []*ReferenceEntry) []*lsproto.LocationLink {
 	links := make([]*lsproto.LocationLink, len(entries))
 	for i, entry := range entries {
-		var targetSelectionRange, targetRange *lsproto.Range
+
+		// Get the selection range (the actual reference)
+		targetSelectionRange := &l.getLocationOfEntry(entry).Range
+		targetRange := targetSelectionRange
 
 		// For entries with nodes, compute ranges directly from the node
 		if entry.node != nil {
-			sourceFile := ast.GetSourceFileOfNode(entry.node)
-			entry.fileName = sourceFile.FileName()
-
-			// Get the selection range (the actual reference)
-			selectionTextRange := getRangeOfNode(entry.node, sourceFile, nil /*endNode*/)
-			targetSelectionRange = l.createLspRangeFromRange(selectionTextRange, sourceFile)
-
 			// Get the context range (broader scope including declaration context)
 			contextNode := core.OrElse(getContextNode(entry.node), entry.node)
-			contextTextRange := toContextRange(&selectionTextRange, sourceFile, contextNode)
+			contextTextRange := toContextRange(entry.textRange, l.program.GetSourceFile(entry.fileName), contextNode)
 			if contextTextRange != nil {
-				targetRange = l.createLspRangeFromRange(*contextTextRange, sourceFile)
-			} else {
-				targetRange = targetSelectionRange
+				contextLocation := l.getMappedLocation(entry.fileName, *contextTextRange)
+				targetRange = &contextLocation.Range
 			}
-		} else {
-			// For range entries, use the pre-computed range
-			l.resolveEntry(entry)
-			targetSelectionRange = entry.textRange
-			targetRange = targetSelectionRange
 		}
 
 		links[i] = &lsproto.LocationLink{
@@ -1216,7 +1203,7 @@ func (l *LanguageService) getReferencedSymbolsForModule(ctx context.Context, pro
 			return &ReferenceEntry{
 				kind:      entryKindRange,
 				fileName:  reference.referencingFile.FileName(),
-				textRange: l.createLspRangeFromBounds(reference.ref.Pos(), reference.ref.End(), reference.referencingFile),
+				textRange: &reference.ref.TextRange,
 			}
 		}
 		return nil

internal/ls/utilities.go

@@ -417,10 +417,6 @@ func createRangeFromNode(node *ast.Node, file *ast.SourceFile) core.TextRange {
 	return core.NewTextRange(scanner.GetTokenPosOfNode(node, file, false /*includeJSDoc*/), node.End())
 }
 
-func getStartPosFromNode(node *ast.Node, file *ast.SourceFile) core.TextPos {
-	return core.TextPos(scanner.GetTokenPosOfNode(node, file, false /*includeJSDoc*/))
-}
-
 func (l *LanguageService) createLspRangeFromBounds(start, end int, file *ast.SourceFile) *lsproto.Range {
 	lspRange := l.converters.ToLSPRange(file, core.NewTextRange(start, end))
 	return &lspRange

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

@@ -1,8 +1,6 @@
 // === findAllReferences ===
-// === /home/src/workspaces/project/a/index.d.ts ===
-// declare class [|A|] {
-// }
-// //# sourceMappingURL=index.d.ts.map
+// === /home/src/workspaces/project/a/index.ts ===
+// class A {}[||]
 
 // === /home/src/workspaces/project/b/b.ts ===
 // /// <reference path="../a/index.d.ts" />

testdata/baselines/reference/lspservertests/declarationMaps/findAllReferences.js

@@ -110,13 +110,6 @@ Config::
 // export interface IfaceA {}
 // export const instanceA: IfaceA = {};
 
-// === /home/src/projects/project/a/bin/a.d.ts ===
-// export declare function [|fnA|](): void;
-// export interface IfaceA {
-// }
-// export declare const instanceA: IfaceA;
-// //# sourceMappingURL=a.d.ts.map
-
 // === /home/src/projects/project/user/user.ts ===
 // import * as a from "../a/bin/a";
 // import * as b from "../b/bin/b";

testdata/baselines/reference/lspservertests/declarationMaps/opening-original-location-project-disableSourceOfProjectReferenceRedirect.js

@@ -92,11 +92,6 @@ Config::
       /user/username/projects/b/tsconfig.json  
     RetainingOpenFiles:
       /user/username/projects/b/b.ts  
-// === /user/username/projects/a/a.d.ts ===
-// export declare class [|A|] {
-// }
-// //# sourceMappingURL=a.d.ts.map
-
 // === /user/username/projects/a/a.ts ===
 // export class [|A|] { }
 

testdata/baselines/reference/lspservertests/declarationMaps/rename.js

@@ -108,13 +108,6 @@ Config::
 // export interface IfaceA {}
 // export const instanceA: IfaceA = {};
 
-// === /home/src/projects/project/a/bin/a.d.ts ===
-// export declare function [|fnARENAME|](): void;
-// export interface IfaceA {
-// }
-// export declare const instanceA: IfaceA;
-// //# sourceMappingURL=a.d.ts.map
-
 // === /home/src/projects/project/user/user.ts ===
 // import * as a from "../a/bin/a";
 // import * as b from "../b/bin/b";

testdata/baselines/reference/lspservertests/findAllRefs/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js

@@ -142,9 +142,3 @@ Config::
 // export class [|B|] {
 //     M() {}
 // }
-
-// === /user/username/projects/myproject/b/lib/index.d.ts ===
-// export declare class [|B|] {
-//     M(): void;
-// }
-// //# sourceMappingURL=index.d.ts.map

testdata/baselines/reference/lspservertests/findAllRefs/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js

@@ -142,9 +142,3 @@ Config::
 // export class [|B|] {
 //     M() {}
 // }
-
-// === /user/username/projects/myproject/b/lib/index.d.ts ===
-// export declare class [|B|] {
-//     M(): void;
-// }
-// //# sourceMappingURL=index.d.ts.map

testdata/baselines/reference/lspservertests/findAllRefs/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js

@@ -142,9 +142,3 @@ Config::
 // export class [|B|] {
 //     M() {}
 // }
-
-// === /user/username/projects/myproject/b/lib/index.d.ts ===
-// export declare class [|B|] {
-//     M(): void;
-// }
-// //# sourceMappingURL=index.d.ts.map