source maps + go to def

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())
+	languageService := ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, 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())
+	languageService := ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, 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())
+	languageService := ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.UseCaseSensitiveFileNames())
 	t := languageService.GetTypeOfSymbol(ctx, symbol)
 	if t == nil {
 		return nil, nil

internal/core/core.go

@@ -648,3 +648,22 @@ func Deduplicate[T comparable](slice []T) []T {
 	}
 	return slice
 }
+
+func DeduplicateSorted[T any](slice []T, isEqual func(a, b T) bool) []T {
+	if len(slice) == 0 {
+		return slice
+	}
+	last := slice[0]
+	deduplicated := slice[:1]
+	for i := 1; i < len(slice); i++ {
+		next := slice[i]
+		if isEqual(last, next) {
+			continue
+		}
+
+		deduplicated = append(deduplicated, next)
+		last = next
+	}
+
+	return deduplicated
+}

internal/ls/definition.go

@@ -8,6 +8,7 @@ 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"
 )
@@ -22,28 +23,54 @@ 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), nil
+			return l.createLocationsFromDeclarations(sym.Declarations)
 		}
 	}
 
 	if ast.IsJumpStatementTarget(node) {
 		if label := getTargetLabel(node.Parent, node.Text()); label != nil {
-			return l.createLocationsFromDeclarations([]*ast.Node{label}), nil
+			return l.createLocationsFromDeclarations([]*ast.Node{label})
 		}
 	}
 
 	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())), nil
+			return l.createLocationFromFileAndRange(file, scanner.GetRangeOfTokenAtPosition(file, stmt.Pos()))
 		}
 	}
 
 	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}), nil
+			return l.createLocationsFromDeclarations([]*ast.Node{fn})
 		}
 	}
 
@@ -54,7 +81,7 @@ func (l *LanguageService) ProvideDefinition(ctx context.Context, documentURI lsp
 		nonFunctionDeclarations := core.Filter(slices.Clip(declarations), func(node *ast.Node) bool { return !ast.IsFunctionLike(node) })
 		declarations = append(nonFunctionDeclarations, calledDeclaration)
 	}
-	return l.createLocationsFromDeclarations(declarations), nil
+	return l.createLocationsFromDeclarations(declarations)
 }
 
 func (l *LanguageService) ProvideTypeDefinition(ctx context.Context, documentURI lsproto.DocumentUri, position lsproto.Position) (lsproto.DefinitionResponse, error) {

internal/ls/languageservice.go

@@ -4,17 +4,29 @@ import (
 	"github.com/microsoft/typescript-go/internal/ast"
 	"github.com/microsoft/typescript-go/internal/compiler"
 	"github.com/microsoft/typescript-go/internal/lsp/lsproto"
+	"github.com/microsoft/typescript-go/internal/sourcemap"
 )
 
 type LanguageService struct {
-	host       Host
-	converters *Converters
+	host                      Host
+	converters                *Converters
+	documentPositionMappers   map[string]sourcemap.DocumentPositionMapper // !!! TODO: needs sync?
+	useCaseSensitiveFileNames bool
+	readFile                  func(path string) (contents string, ok bool)
 }
 
-func NewLanguageService(host Host, converters *Converters) *LanguageService {
+func NewLanguageService(
+	host Host,
+	converters *Converters,
+	readFile func(path string) (contents string, ok bool),
+	useCaseSensitiveFileNames bool,
+) *LanguageService {
 	return &LanguageService{
-		host:       host,
-		converters: converters,
+		host:                      host,
+		converters:                converters,
+		readFile:                  readFile,
+		useCaseSensitiveFileNames: useCaseSensitiveFileNames,
+		documentPositionMappers:   map[string]sourcemap.DocumentPositionMapper{},
 	}
 }
 
@@ -36,3 +48,32 @@ func (l *LanguageService) getProgramAndFile(documentURI lsproto.DocumentUri) (*c
 	}
 	return program, file
 }
+
+func (l *LanguageService) GetDocumentPositionMapper(fileName string) sourcemap.DocumentPositionMapper {
+	d, ok := l.documentPositionMappers[fileName]
+	if !ok {
+		d = sourcemap.GetDocumentPositionMapper(l, fileName)
+		l.documentPositionMappers[fileName] = d
+	}
+	return d
+}
+
+func (l *LanguageService) ReadFile(fileName string) (string, bool) {
+	return l.readFile(fileName)
+}
+
+func (l *LanguageService) UseCaseSensitiveFileNames() bool {
+	return l.useCaseSensitiveFileNames
+}
+
+func (l *LanguageService) GetLineInfo(fileName string) *sourcemap.LineInfo {
+	text, ok := l.ReadFile(fileName)
+	if !ok {
+		return nil
+	}
+	lineMap := l.converters.getLineMap(fileName)
+	if lineMap == nil {
+		return nil
+	}
+	return sourcemap.CreateLineInfo(text, lineMap.LineStarts)
+}

internal/ls/source_map.go

@@ -0,0 +1,84 @@
+package ls
+
+import (
+	"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/sourcemap"
+	"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
+	}
+	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},
+	}
+}
+
+func (l *LanguageService) getMappedPosition() {
+	// !!! HERE
+}
+
+type script struct {
+	fileName string
+	text     string
+}
+
+func (s *script) FileName() string {
+	return s.fileName
+}
+
+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)
+	if !ok {
+		return nil, nil
+	}
+	sourcePos := l.converters.PositionToLineAndCharacter(
+		&script{fileName: documentPos.FileName, text: sourceText},
+		core.TextPos(documentPos.Pos),
+	)
+	return &documentURI, &sourcePos
+}
+
+func (l *LanguageService) tryGetSourcePosition(
+	fileName string,
+	genPosition core.TextPos,
+) *sourcemap.DocumentPosition {
+	if !tspath.IsDeclarationFileName(fileName) {
+		return nil
+	}
+
+	positionMapper := l.GetDocumentPositionMapper(fileName)
+	documentPos := positionMapper.GetSourcePosition(&sourcemap.DocumentPosition{FileName: fileName, Pos: int(genPosition)})
+	if documentPos == nil {
+		return nil
+	}
+	if newPos := l.tryGetSourcePosition(documentPos.FileName, core.TextPos(documentPos.Pos)); newPos != nil {
+		return newPos
+	}
+	return documentPos
+}

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()), nil
+	return ls.NewLanguageService(project, snapshot.Converters(), snapshot.ReadFile, snapshot.UseCaseSensitiveFileNames()), nil
 }
 
 func (s *Session) UpdateSnapshot(ctx context.Context, overlays map[tspath.Path]*overlay, change SnapshotChange) *Snapshot {

internal/project/snapshot.go

@@ -89,6 +89,18 @@ func (s *Snapshot) ID() uint64 {
 	return s.id
 }
 
+func (s *Snapshot) UseCaseSensitiveFileNames() bool {
+	return s.fs.fs.UseCaseSensitiveFileNames()
+}
+
+func (s *Snapshot) ReadFile(fileName string) (string, bool) {
+	handle := s.GetFile(fileName)
+	if handle == nil {
+		return "", false
+	}
+	return handle.Content(), true
+}
+
 type APISnapshotRequest struct {
 	OpenProjects   *collections.Set[string]
 	CloseProjects  *collections.Set[tspath.Path]

internal/project/snapshotfs.go

@@ -1,6 +1,9 @@
 package project
 
 import (
+	"sync"
+
+	"github.com/microsoft/typescript-go/internal/collections"
 	"github.com/microsoft/typescript-go/internal/lsp/lsproto"
 	"github.com/microsoft/typescript-go/internal/project/dirty"
 	"github.com/microsoft/typescript-go/internal/tspath"
@@ -24,6 +27,12 @@ type snapshotFS struct {
 	fs        vfs.FS
 	overlays  map[tspath.Path]*overlay
 	diskFiles map[tspath.Path]*diskFile
+	readFiles collections.SyncMap[tspath.Path, memoizedFileEntry]
+}
+
+// !!! newtype?
+type memoizedFileEntry struct {
+	read func() *diskFile
 }
 
 func (s *snapshotFS) FS() vfs.FS {
@@ -37,6 +46,17 @@ func (s *snapshotFS) GetFile(fileName string) FileHandle {
 	if file, ok := s.diskFiles[s.toPath(fileName)]; ok {
 		return file
 	}
+	newEntry := memoizedFileEntry{
+		read: sync.OnceValue(func() *diskFile {
+			if contents, ok := s.fs.ReadFile(fileName); ok {
+				return newDiskFile(fileName, contents)
+			}
+			return nil
+		}),
+	}
+	if entry, ok := s.readFiles.LoadOrStore(s.toPath(fileName), newEntry); ok {
+		return entry.read()
+	}
 	return nil
 }
 

internal/sourcemap/lineinfo.go

@@ -7,7 +7,7 @@ type LineInfo struct {
 	lineStarts []core.TextPos
 }
 
-func GetLineInfo(text string, lineStarts []core.TextPos) *LineInfo {
+func CreateLineInfo(text string, lineStarts []core.TextPos) *LineInfo {
 	return &LineInfo{
 		text:       text,
 		lineStarts: lineStarts,