fix(2426): goToDefinition for pattern ambient module no longer goes to implementation

internal/fourslash/test_parser.go

@@ -215,6 +215,7 @@ const (
 
 func parseFileContent(fileName string, content string, fileOptions map[string]string) (*testFileWithMarkers, error) {
 	fileName = tspath.GetNormalizedAbsolutePath(fileName, "/")
+	content = chompLeadingSpace(content)
 
 	// The file content (minus metacharacters) so far
 	var output strings.Builder
@@ -466,6 +467,23 @@ func reportError(fileName string, line int, col int, message string) error {
 	return &fourslashError{fmt.Sprintf("%v (%v,%v): %v", fileName, line, col, message)}
 }
 
+func chompLeadingSpace(content string) string {
+	lines := strings.Split(content, "\n")
+	for _, line := range lines {
+		if len(line) > 0 && line[0] != ' ' {
+			return content
+		}
+	}
+
+	result := make([]string, len(lines))
+	for i, line := range lines {
+		if len(line) > 0 {
+			result[i] = line[1:]
+		}
+	}
+	return strings.Join(result, "\n")
+}
+
 type fourslashError struct {
 	err string
 }

internal/ls/definition.go

@@ -9,6 +9,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/collections"
 	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/ls/lsconv"
 	"github.com/microsoft/typescript-go/internal/lsp/lsproto"
 	"github.com/microsoft/typescript-go/internal/scanner"
 )
@@ -22,24 +23,31 @@ func (l *LanguageService) ProvideDefinition(
 	clientSupportsLink := caps.TextDocument.Definition.LinkSupport
 
 	program, file := l.getProgramAndFile(documentURI)
-	node := astnav.GetTouchingPropertyName(file, int(l.converters.LineAndCharacterToPosition(file, position)))
+	pos := int(l.converters.LineAndCharacterToPosition(file, position))
+	node := astnav.GetTouchingPropertyName(file, pos)
+	reference := getReferenceAtPosition(file, pos, program)
+
 	if node.Kind == ast.KindSourceFile {
 		return lsproto.LocationOrLocationsOrDefinitionLinksOrNull{}, nil
 	}
+
 	originSelectionRange := l.createLspRangeFromNode(node, file)
+	if reference != nil && reference.file != nil {
+		return l.createDefinitionLocations(originSelectionRange, clientSupportsLink, []*ast.Node{}, reference), nil
+	}
 
 	c, done := program.GetTypeCheckerForFile(ctx, file)
 	defer done()
 
 	if node.Kind == ast.KindOverrideKeyword {
 		if sym := getSymbolForOverriddenMember(c, node); sym != nil {
-			return l.createLocationsFromDeclarations(originSelectionRange, clientSupportsLink, sym.Declarations), nil
+			return l.createDefinitionLocations(originSelectionRange, clientSupportsLink, sym.Declarations, nil /*reference*/), nil
 		}
 	}
 
 	if ast.IsJumpStatementTarget(node) {
 		if label := getTargetLabel(node.Parent, node.Text()); label != nil {
-			return l.createLocationsFromDeclarations(originSelectionRange, clientSupportsLink, []*ast.Node{label}), nil
+			return l.createDefinitionLocations(originSelectionRange, clientSupportsLink, []*ast.Node{label}, nil /*reference*/), nil
 		}
 	}
 
@@ -52,7 +60,7 @@ func (l *LanguageService) ProvideDefinition(
 
 	if node.Kind == ast.KindReturnKeyword || node.Kind == ast.KindYieldKeyword || node.Kind == ast.KindAwaitKeyword {
 		if fn := ast.FindAncestor(node, ast.IsFunctionLikeDeclaration); fn != nil {
-			return l.createLocationsFromDeclarations(originSelectionRange, clientSupportsLink, []*ast.Node{fn}), nil
+			return l.createDefinitionLocations(originSelectionRange, clientSupportsLink, []*ast.Node{fn}, nil /*reference*/), nil
 		}
 	}
 
@@ -63,7 +71,7 @@ func (l *LanguageService) ProvideDefinition(
 		nonFunctionDeclarations := core.Filter(slices.Clip(declarations), func(node *ast.Node) bool { return !ast.IsFunctionLike(node) })
 		declarations = append(nonFunctionDeclarations, calledDeclaration)
 	}
-	return l.createLocationsFromDeclarations(originSelectionRange, clientSupportsLink, declarations), nil
+	return l.createDefinitionLocations(originSelectionRange, clientSupportsLink, declarations, reference), nil
 }
 
 func (l *LanguageService) ProvideTypeDefinition(
@@ -93,10 +101,10 @@ func (l *LanguageService) ProvideTypeDefinition(
 			declarations = core.Concatenate(getDeclarationsFromType(typeArgument), declarations)
 		}
 		if len(declarations) != 0 {
-			return l.createLocationsFromDeclarations(originSelectionRange, clientSupportsLink, declarations), nil
+			return l.createDefinitionLocations(originSelectionRange, clientSupportsLink, declarations, nil /*reference*/), nil
 		}
 		if symbol.Flags&ast.SymbolFlagsValue == 0 && symbol.Flags&ast.SymbolFlagsType != 0 {
-			return l.createLocationsFromDeclarations(originSelectionRange, clientSupportsLink, symbol.Declarations), nil
+			return l.createDefinitionLocations(originSelectionRange, clientSupportsLink, symbol.Declarations, nil /*reference*/), nil
 		}
 	}
 
@@ -121,13 +129,34 @@ type fileRange struct {
 	fileRange core.TextRange
 }
 
-func (l *LanguageService) createLocationsFromDeclarations(
+func (l *LanguageService) createDefinitionLocations(
 	originSelectionRange *lsproto.Range,
 	clientSupportsLink bool,
 	declarations []*ast.Node,
+	reference *refInfo,
 ) lsproto.DefinitionResponse {
-	locations := make([]*lsproto.LocationLink, 0, len(declarations))
+	locations := make([]*lsproto.LocationLink, 0)
 	locationRanges := collections.Set[fileRange]{}
+
+	if reference != nil {
+		targetRange := lsproto.Range{
+			Start: lsproto.Position{
+				Line:      0,
+				Character: 0,
+			},
+			End: lsproto.Position{
+				Line:      0,
+				Character: 0,
+			},
+		}
+		locations = append(locations, &lsproto.LocationLink{
+			OriginSelectionRange: originSelectionRange,
+			TargetUri:            lsconv.FileNameToDocumentURI(reference.fileName),
+			TargetRange:          targetRange,
+			TargetSelectionRange: targetRange,
+		})
+	}
+
 	for _, decl := range declarations {
 		file := ast.GetSourceFileOfNode(decl)
 		fileName := file.FileName()
@@ -146,10 +175,11 @@ func (l *LanguageService) createLocationsFromDeclarations(
 			})
 		}
 	}
-	if !clientSupportsLink {
-		return createLocationsFromLinks(locations)
+
+	if clientSupportsLink {
+		return lsproto.LocationOrLocationsOrDefinitionLinksOrNull{DefinitionLinks: &locations}
 	}
-	return lsproto.LocationOrLocationsOrDefinitionLinksOrNull{DefinitionLinks: &locations}
+	return createLocationsFromLinks(locations)
 }
 
 func createLocationsFromLinks(links []*lsproto.LocationLink) lsproto.DefinitionResponse {

internal/ls/findallreferences.go

@@ -1450,55 +1450,6 @@ func (l *LanguageService) getReferencedSymbolsForModule(ctx context.Context, pro
 	return []*SymbolAndEntries{}
 }
 
-func getReferenceAtPosition(sourceFile *ast.SourceFile, position int, program *compiler.Program) *refInfo {
-	if referencePath := findReferenceInPosition(sourceFile.ReferencedFiles, position); referencePath != nil {
-		if file := program.GetSourceFileFromReference(sourceFile, referencePath); file != nil {
-			return &refInfo{reference: referencePath, fileName: file.FileName(), file: file, unverified: false}
-		}
-		return nil
-	}
-
-	if typeReferenceDirective := findReferenceInPosition(sourceFile.TypeReferenceDirectives, position); typeReferenceDirective != nil {
-		if reference := program.GetResolvedTypeReferenceDirectiveFromTypeReferenceDirective(typeReferenceDirective, sourceFile); reference != nil {
-			if file := program.GetSourceFile(reference.ResolvedFileName); file != nil {
-				return &refInfo{reference: typeReferenceDirective, fileName: file.FileName(), file: file, unverified: false}
-			}
-		}
-		return nil
-	}
-
-	if libReferenceDirective := findReferenceInPosition(sourceFile.LibReferenceDirectives, position); libReferenceDirective != nil {
-		if file := program.GetLibFileFromReference(libReferenceDirective); file != nil {
-			return &refInfo{reference: libReferenceDirective, fileName: file.FileName(), file: file, unverified: false}
-		}
-		return nil
-	}
-
-	if len(sourceFile.Imports()) == 0 && len(sourceFile.ModuleAugmentations) == 0 {
-		return nil
-	}
-
-	node := astnav.GetTouchingToken(sourceFile, position)
-	if !isModuleSpecifierLike(node) || !tspath.IsExternalModuleNameRelative(node.Text()) {
-		return nil
-	}
-	if resolution := program.GetResolvedModuleFromModuleSpecifier(sourceFile, node); resolution != nil {
-		verifiedFileName := resolution.ResolvedFileName
-		fileName := resolution.ResolvedFileName
-		if fileName == "" {
-			fileName = tspath.ResolvePath(tspath.GetDirectoryPath(sourceFile.FileName()), node.Text())
-		}
-		return &refInfo{
-			file:       program.GetSourceFile(fileName),
-			fileName:   fileName,
-			reference:  nil,
-			unverified: verifiedFileName != "",
-		}
-	}
-
-	return nil
-}
-
 // -- Core algorithm for find all references --
 func getSpecialSearchKind(node *ast.Node) string {
 	if node == nil {

internal/ls/utilities.go

@@ -11,6 +11,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/astnav"
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/collections"
+	"github.com/microsoft/typescript-go/internal/compiler"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/debug"
 	"github.com/microsoft/typescript-go/internal/jsnum"
@@ -1590,3 +1591,53 @@ func toContextRange(textRange *core.TextRange, contextFile *ast.SourceFile, cont
 	}
 	return nil
 }
+
+func getReferenceAtPosition(sourceFile *ast.SourceFile, position int, program *compiler.Program) *refInfo {
+	if referencePath := findReferenceInPosition(sourceFile.ReferencedFiles, position); referencePath != nil {
+		if file := program.GetSourceFileFromReference(sourceFile, referencePath); file != nil {
+			return &refInfo{reference: referencePath, fileName: file.FileName(), file: file, unverified: false}
+		}
+		return nil
+	}
+
+	if typeReferenceDirective := findReferenceInPosition(sourceFile.TypeReferenceDirectives, position); typeReferenceDirective != nil {
+		if reference := program.GetResolvedTypeReferenceDirectiveFromTypeReferenceDirective(typeReferenceDirective, sourceFile); reference != nil {
+			if file := program.GetSourceFile(reference.ResolvedFileName); file != nil {
+				return &refInfo{reference: typeReferenceDirective, fileName: file.FileName(), file: file, unverified: false}
+			}
+		}
+		return nil
+	}
+
+	if libReferenceDirective := findReferenceInPosition(sourceFile.LibReferenceDirectives, position); libReferenceDirective != nil {
+		if file := program.GetLibFileFromReference(libReferenceDirective); file != nil {
+			return &refInfo{reference: libReferenceDirective, fileName: file.FileName(), file: file, unverified: false}
+		}
+		return nil
+	}
+
+	if len(sourceFile.Imports()) == 0 && len(sourceFile.ModuleAugmentations) == 0 {
+		return nil
+	}
+
+	node := astnav.GetTouchingToken(sourceFile, position)
+	if !isModuleSpecifierLike(node) || !tspath.IsExternalModuleNameRelative(node.Text()) {
+		return nil
+	}
+
+	if resolution := program.GetResolvedModuleFromModuleSpecifier(sourceFile, node); resolution != nil {
+		verifiedFileName := resolution.ResolvedFileName
+		fileName := resolution.ResolvedFileName
+		if fileName == "" {
+			fileName = tspath.ResolvePath(tspath.GetDirectoryPath(sourceFile.FileName()), node.Text())
+		}
+		return &refInfo{
+			file:       program.GetSourceFile(fileName),
+			fileName:   fileName,
+			reference:  nil,
+			unverified: verifiedFileName != "",
+		}
+	}
+
+	return nil
+}

testdata/baselines/reference/fourslash/documentHighlights/findAllRefsForModule.baseline.jsonc

@@ -12,4 +12,4 @@
 
 // === documentHighlights ===
 // === /d.ts ===
-//  /// <reference path="/*HIGHLIGHTS*/[|./a.ts|]" />
+// /// <reference path="/*HIGHLIGHTS*/[|./a.ts|]" />

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

@@ -6,7 +6,7 @@
 // const a = require("[|../a|]");
 
 // === /d.ts ===
-//  /// <reference path="[|./a.ts|]" />
+// /// <reference path="[|./a.ts|]" />
 
 
 
@@ -18,7 +18,7 @@
 // const a = require("/*FIND ALL REFS*/[|../a|]");
 
 // === /d.ts ===
-//  /// <reference path="[|./a.ts|]" />
+// /// <reference path="[|./a.ts|]" />
 
 
 
@@ -30,4 +30,4 @@
 // const a = require("[|../a|]");
 
 // === /d.ts ===
-//  /// <reference path="/*FIND ALL REFS*/[|./a.ts|]" />
+// /// <reference path="/*FIND ALL REFS*/[|./a.ts|]" />

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

@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /importing.ts ===
-//  import { Leaf } from './exporting';
-//  Leaf.[|hello|]()
+// import { Leaf } from './exporting';
+// Leaf.[|hello|]()
 
 // === /leafModule.ts ===
 // export const /*FIND ALL REFS*/[|hello|] = () => 'Hello';
@@ -10,8 +10,8 @@
 
 // === findAllReferences ===
 // === /importing.ts ===
-//  import { Leaf } from './exporting';
-//  Leaf./*FIND ALL REFS*/[|hello|]()
+// import { Leaf } from './exporting';
+// Leaf./*FIND ALL REFS*/[|hello|]()
 
 // === /leafModule.ts ===
 // export const [|hello|] = () => 'Hello';
@@ -23,8 +23,8 @@
 // export * as /*FIND ALL REFS*/[|Leaf|] from './leafModule';
 
 // === /importing.ts ===
-//  import { [|Leaf|] } from './exporting';
-//  [|Leaf|].hello()
+// import { [|Leaf|] } from './exporting';
+// [|Leaf|].hello()
 
 
 
@@ -33,8 +33,8 @@
 // export * as [|Leaf|] from './leafModule';
 
 // === /importing.ts ===
-//  import { /*FIND ALL REFS*/[|Leaf|] } from './exporting';
-//  [|Leaf|].hello()
+// import { /*FIND ALL REFS*/[|Leaf|] } from './exporting';
+// [|Leaf|].hello()
 
 
 
@@ -43,5 +43,5 @@
 // export * as [|Leaf|] from './leafModule';
 
 // === /importing.ts ===
-//  import { [|Leaf|] } from './exporting';
-//  /*FIND ALL REFS*/[|Leaf|].hello()
+// import { [|Leaf|] } from './exporting';
+// /*FIND ALL REFS*/[|Leaf|].hello()