refactor, fix and update tests

Author: gabritto

internal/api/api.go

@@ -160,7 +160,7 @@ func (api *API) GetSymbolAtPosition(ctx context.Context, projectId Handle[projec
 		return nil, errors.New("project not found")
 	}
 
-	languageService := ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.UseCaseSensitiveFileNames())
+	languageService := ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.FileExists, snapshot.UseCaseSensitiveFileNames())
 	symbol, err := languageService.GetSymbolAtPosition(ctx, fileName, position)
 	if err != nil || symbol == nil {
 		return nil, err
@@ -202,7 +202,7 @@ func (api *API) GetSymbolAtLocation(ctx context.Context, projectId Handle[projec
 	if node == nil {
 		return nil, fmt.Errorf("node of kind %s not found at position %d in file %q", kind.String(), pos, sourceFile.FileName())
 	}
-	languageService := ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.UseCaseSensitiveFileNames())
+	languageService := ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.FileExists, snapshot.UseCaseSensitiveFileNames())
 	symbol := languageService.GetSymbolAtLocation(ctx, node)
 	if symbol == nil {
 		return nil, nil
@@ -232,7 +232,7 @@ func (api *API) GetTypeOfSymbol(ctx context.Context, projectId Handle[project.Pr
 	if !ok {
 		return nil, fmt.Errorf("symbol %q not found", symbolHandle)
 	}
-	languageService := ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.UseCaseSensitiveFileNames())
+	languageService := ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.FileExists, snapshot.UseCaseSensitiveFileNames())
 	t := languageService.GetTypeOfSymbol(ctx, symbol)
 	if t == nil {
 		return nil, nil

internal/ls/definition.go

@@ -8,7 +8,6 @@ import (
 	"github.com/microsoft/typescript-go/internal/astnav"
 	"github.com/microsoft/typescript-go/internal/checker"
 	"github.com/microsoft/typescript-go/internal/core"
-	"github.com/microsoft/typescript-go/internal/debug"
 	"github.com/microsoft/typescript-go/internal/lsp/lsproto"
 	"github.com/microsoft/typescript-go/internal/scanner"
 )
@@ -23,54 +22,28 @@ func (l *LanguageService) ProvideDefinition(ctx context.Context, documentURI lsp
 	c, done := program.GetTypeCheckerForFile(ctx, file)
 	defer done()
 
-	return l.getMappedDefinition(l.provideDefinitions(c, node)), nil
-}
-
-func (l *LanguageService) getMappedDefinition(definitions lsproto.DefinitionResponse) lsproto.DefinitionResponse {
-	if definitions.Location != nil {
-		definitions.Location = l.getMappedLocation(definitions.Location)
-	}
-	if definitions.Locations != nil {
-		for i, loc := range *definitions.Locations {
-			(*definitions.Locations)[i] = *l.getMappedLocation(&loc)
-		}
-	}
-	if definitions.DefinitionLinks != nil {
-		for i, link := range *definitions.DefinitionLinks {
-			mappedTarget := l.getMappedLocation(&lsproto.Location{Uri: link.TargetUri, Range: link.TargetRange})
-			mappedSelection := l.getMappedLocation(&lsproto.Location{Uri: link.TargetUri, Range: link.TargetSelectionRange})
-			debug.Assert(mappedTarget.Uri == mappedSelection.Uri, "target and selection should be in same file")
-			(*definitions.DefinitionLinks)[i].TargetUri = mappedTarget.Uri
-			(*definitions.DefinitionLinks)[i].TargetRange = mappedTarget.Range
-			(*definitions.DefinitionLinks)[i].TargetSelectionRange = mappedSelection.Range
-		}
-	}
-	return definitions
-}
-
-func (l *LanguageService) provideDefinitions(c *checker.Checker, node *ast.Node) lsproto.DefinitionResponse {
 	if node.Kind == ast.KindOverrideKeyword {
 		if sym := getSymbolForOverriddenMember(c, node); sym != nil {
-			return l.createLocationsFromDeclarations(sym.Declarations)
+			return l.createLocationsFromDeclarations(sym.Declarations), nil
 		}
 	}
 
 	if ast.IsJumpStatementTarget(node) {
 		if label := getTargetLabel(node.Parent, node.Text()); label != nil {
-			return l.createLocationsFromDeclarations([]*ast.Node{label})
+			return l.createLocationsFromDeclarations([]*ast.Node{label}), nil
 		}
 	}
 
 	if node.Kind == ast.KindCaseKeyword || node.Kind == ast.KindDefaultKeyword && ast.IsDefaultClause(node.Parent) {
 		if stmt := ast.FindAncestor(node.Parent, ast.IsSwitchStatement); stmt != nil {
 			file := ast.GetSourceFileOfNode(stmt)
-			return l.createLocationFromFileAndRange(file, scanner.GetRangeOfTokenAtPosition(file, stmt.Pos()))
+			return l.createLocationFromFileAndRange(file, scanner.GetRangeOfTokenAtPosition(file, stmt.Pos())), nil
 		}
 	}
 
 	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([]*ast.Node{fn})
+			return l.createLocationsFromDeclarations([]*ast.Node{fn}), nil
 		}
 	}
 
@@ -81,9 +54,31 @@ func (l *LanguageService) provideDefinitions(c *checker.Checker, node *ast.Node)
 		nonFunctionDeclarations := core.Filter(slices.Clip(declarations), func(node *ast.Node) bool { return !ast.IsFunctionLike(node) })
 		declarations = append(nonFunctionDeclarations, calledDeclaration)
 	}
-	return l.createLocationsFromDeclarations(declarations)
+	return l.createLocationsFromDeclarations(declarations), nil
 }
 
+// func (l *LanguageService) getMappedDefinition(definitions lsproto.DefinitionResponse) lsproto.DefinitionResponse {
+// 	if definitions.Location != nil {
+// 		definitions.Location = l.getMappedLocation(definitions.Location)
+// 	}
+// 	if definitions.Locations != nil {
+// 		for i, loc := range *definitions.Locations {
+// 			(*definitions.Locations)[i] = *l.getMappedLocation(&loc)
+// 		}
+// 	}
+// 	if definitions.DefinitionLinks != nil {
+// 		for i, link := range *definitions.DefinitionLinks {
+// 			mappedTarget := l.getMappedLocation(&lsproto.Location{Uri: link.TargetUri, Range: link.TargetRange})
+// 			mappedSelection := l.getMappedLocation(&lsproto.Location{Uri: link.TargetUri, Range: link.TargetSelectionRange})
+// 			debug.Assert(mappedTarget.Uri == mappedSelection.Uri, "target and selection should be in same file")
+// 			(*definitions.DefinitionLinks)[i].TargetUri = mappedTarget.Uri
+// 			(*definitions.DefinitionLinks)[i].TargetRange = mappedTarget.Range
+// 			(*definitions.DefinitionLinks)[i].TargetSelectionRange = mappedSelection.Range
+// 		}
+// 	}
+// 	return definitions
+// }
+
 func (l *LanguageService) ProvideTypeDefinition(ctx context.Context, documentURI lsproto.DocumentUri, position lsproto.Position) (lsproto.DefinitionResponse, error) {
 	program, file := l.getProgramAndFile(documentURI)
 	node := astnav.GetTouchingPropertyName(file, int(l.converters.LineAndCharacterToPosition(file, position)))
@@ -131,20 +126,17 @@ func (l *LanguageService) createLocationsFromDeclarations(declarations []*ast.No
 	for _, decl := range declarations {
 		file := ast.GetSourceFileOfNode(decl)
 		name := core.OrElse(ast.GetNameOfDeclaration(decl), decl)
-		locations = core.AppendIfUnique(locations, lsproto.Location{
-			Uri:   FileNameToDocumentURI(file.FileName()),
-			Range: *l.createLspRangeFromNode(name, file),
-		})
+		nodeRange := createRangeFromNode(name, file)
+		mappedLocation := l.getMappedLocation(file.FileName(), nodeRange)
+		locations = core.AppendIfUnique(locations, mappedLocation)
 	}
 	return lsproto.LocationOrLocationsOrDefinitionLinksOrNull{Locations: &locations}
 }
 
 func (l *LanguageService) createLocationFromFileAndRange(file *ast.SourceFile, textRange core.TextRange) lsproto.DefinitionResponse {
+	mappedLocation := l.getMappedLocation(file.FileName(), textRange)
 	return lsproto.LocationOrLocationsOrDefinitionLinksOrNull{
-		Location: &lsproto.Location{
-			Uri:   FileNameToDocumentURI(file.FileName()),
-			Range: *l.createLspRangeFromBounds(textRange.Pos(), textRange.End(), file),
-		},
+		Location: &mappedLocation,
 	}
 }
 

internal/ls/languageservice.go

@@ -10,23 +10,26 @@ import (
 type LanguageService struct {
 	host                      Host
 	converters                *Converters
-	documentPositionMappers   map[string]sourcemap.DocumentPositionMapper // !!! TODO: needs sync?
+	documentPositionMappers   map[string]*sourcemap.DocumentPositionMapper
 	useCaseSensitiveFileNames bool
 	readFile                  func(path string) (contents string, ok bool)
+	fileExists                func(path string) bool
 }
 
 func NewLanguageService(
 	host Host,
 	converters *Converters,
 	readFile func(path string) (contents string, ok bool),
+	fileExists func(path string) bool,
 	useCaseSensitiveFileNames bool,
 ) *LanguageService {
 	return &LanguageService{
 		host:                      host,
 		converters:                converters,
 		readFile:                  readFile,
+		fileExists:                fileExists,
 		useCaseSensitiveFileNames: useCaseSensitiveFileNames,
-		documentPositionMappers:   map[string]sourcemap.DocumentPositionMapper{},
+		documentPositionMappers:   map[string]*sourcemap.DocumentPositionMapper{},
 	}
 }
 
@@ -49,7 +52,7 @@ func (l *LanguageService) getProgramAndFile(documentURI lsproto.DocumentUri) (*c
 	return program, file
 }
 
-func (l *LanguageService) GetDocumentPositionMapper(fileName string) sourcemap.DocumentPositionMapper {
+func (l *LanguageService) GetDocumentPositionMapper(fileName string) *sourcemap.DocumentPositionMapper {
 	d, ok := l.documentPositionMappers[fileName]
 	if !ok {
 		d = sourcemap.GetDocumentPositionMapper(l, fileName)

internal/ls/source_map.go

@@ -8,24 +8,25 @@ import (
 	"github.com/microsoft/typescript-go/internal/tspath"
 )
 
-func (l *LanguageService) getMappedLocation(location *lsproto.Location) *lsproto.Location {
-	uriStart, start := l.tryGetSourceLSPPosition(location.Uri.FileName(), &location.Range.Start)
-	if uriStart == nil {
-		return location
+func (l *LanguageService) getMappedLocation(fileName string, fileRange core.TextRange) lsproto.Location {
+	startPos := l.tryGetSourcePosition(fileName, core.TextPos(fileRange.Pos()))
+	if startPos == nil {
+		lspRange := l.createLspRangeFromRange(fileRange, l.getScript(fileName))
+		return lsproto.Location{
+			Uri:   FileNameToDocumentURI(fileName),
+			Range: *lspRange,
+		}
 	}
-	uriEnd, end := l.tryGetSourceLSPPosition(location.Uri.FileName(), &location.Range.End)
-	debug.Assert(uriEnd == uriStart, "start and end should be in same file")
-	debug.Assert(end != nil, "end position should be valid")
-	return &lsproto.Location{
-		Uri:   *uriStart,
-		Range: lsproto.Range{Start: *start, End: *end},
+	endPos := l.tryGetSourcePosition(fileName, core.TextPos(fileRange.End()))
+	debug.Assert(endPos.FileName == startPos.FileName, "start and end should be in same file")
+	newRange := core.NewTextRange(startPos.Pos, endPos.Pos)
+	lspRange := l.createLspRangeFromRange(newRange, l.getScript(startPos.FileName))
+	return lsproto.Location{
+		Uri:   FileNameToDocumentURI(startPos.FileName),
+		Range: *lspRange,
 	}
 }
 
-func (l *LanguageService) getMappedPosition() {
-	// !!! HERE
-}
-
 type script struct {
 	fileName string
 	text     string
@@ -39,45 +40,41 @@ func (s *script) Text() string {
 	return s.text
 }
 
-func (l *LanguageService) tryGetSourceLSPPosition(
-	genFileName string,
-	position *lsproto.Position,
-) (*lsproto.DocumentUri, *lsproto.Position) {
-	genText, ok := l.ReadFile(genFileName)
-	if !ok {
-		return nil, nil // That shouldn't happen
-	}
-	genPos := l.converters.LineAndCharacterToPosition(&script{fileName: genFileName, text: genText}, *position)
-	documentPos := l.tryGetSourcePosition(genFileName, genPos)
-	if documentPos == nil {
-		return nil, nil
-	}
-	documentURI := FileNameToDocumentURI(documentPos.FileName)
-	sourceText, ok := l.ReadFile(documentPos.FileName)
+func (l *LanguageService) getScript(fileName string) *script {
+	text, ok := l.readFile(fileName)
 	if !ok {
-		return nil, nil
+		return nil
 	}
-	sourcePos := l.converters.PositionToLineAndCharacter(
-		&script{fileName: documentPos.FileName, text: sourceText},
-		core.TextPos(documentPos.Pos),
-	)
-	return &documentURI, &sourcePos
+	return &script{fileName: fileName, text: text}
 }
 
 func (l *LanguageService) tryGetSourcePosition(
 	fileName string,
-	genPosition core.TextPos,
+	position core.TextPos,
+) *sourcemap.DocumentPosition {
+	newPos := l.tryGetSourcePositionWorker(fileName, position)
+	if newPos != nil {
+		if !l.fileExists(newPos.FileName) {
+			return nil
+		}
+	}
+	return newPos
+}
+
+func (l *LanguageService) tryGetSourcePositionWorker(
+	fileName string,
+	position core.TextPos,
 ) *sourcemap.DocumentPosition {
 	if !tspath.IsDeclarationFileName(fileName) {
 		return nil
 	}
 
 	positionMapper := l.GetDocumentPositionMapper(fileName)
-	documentPos := positionMapper.GetSourcePosition(&sourcemap.DocumentPosition{FileName: fileName, Pos: int(genPosition)})
+	documentPos := positionMapper.GetSourcePosition(&sourcemap.DocumentPosition{FileName: fileName, Pos: int(position)})
 	if documentPos == nil {
 		return nil
 	}
-	if newPos := l.tryGetSourcePosition(documentPos.FileName, core.TextPos(documentPos.Pos)); newPos != nil {
+	if newPos := l.tryGetSourcePositionWorker(documentPos.FileName, core.TextPos(documentPos.Pos)); newPos != nil {
 		return newPos
 	}
 	return documentPos

internal/ls/utilities.go

@@ -433,11 +433,20 @@ func (l *LanguageService) createLspRangeFromNode(node *ast.Node, file *ast.Sourc
 	return l.createLspRangeFromBounds(scanner.GetTokenPosOfNode(node, file, false /*includeJSDoc*/), node.End(), file)
 }
 
+func createRangeFromNode(node *ast.Node, file *ast.SourceFile) core.TextRange {
+	return core.NewTextRange(scanner.GetTokenPosOfNode(node, file, false /*includeJSDoc*/), node.End())
+}
+
 func (l *LanguageService) createLspRangeFromBounds(start, end int, file *ast.SourceFile) *lsproto.Range {
 	lspRange := l.converters.ToLSPRange(file, core.NewTextRange(start, end))
 	return &lspRange
 }
 
+func (l *LanguageService) createLspRangeFromRange(textRange core.TextRange, script Script) *lsproto.Range {
+	lspRange := l.converters.ToLSPRange(script, textRange)
+	return &lspRange
+}
+
 func (l *LanguageService) createLspPosition(position int, file *ast.SourceFile) lsproto.Position {
 	return l.converters.PositionToLineAndCharacter(file, core.TextPos(position))
 }

internal/project/session.go

@@ -367,7 +367,7 @@ func (s *Session) GetLanguageService(ctx context.Context, uri lsproto.DocumentUr
 	if project == nil {
 		return nil, fmt.Errorf("no project found for URI %s", uri)
 	}
-	return ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.UseCaseSensitiveFileNames()), nil
+	return ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.FileExists, snapshot.UseCaseSensitiveFileNames()), nil
 }
 
 func (s *Session) UpdateSnapshot(ctx context.Context, overlays map[tspath.Path]*overlay, change SnapshotChange) *Snapshot {

internal/project/snapshot.go

@@ -101,6 +101,10 @@ func (s *Snapshot) ReadFile(fileName string) (string, bool) {
 	return handle.Content(), true
 }
 
+func (s *Snapshot) FileExists(fileName string) bool {
+	return s.fs.fs.FileExists(fileName)
+}
+
 type APISnapshotRequest struct {
 	OpenProjects   *collections.Set[string]
 	CloseProjects  *collections.Set[tspath.Path]