refactor LS host

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

internal/ls/autoimports.go

@@ -702,7 +702,7 @@ func (l *LanguageService) createPackageJsonImportFilter(fromFile *ast.SourceFile
 			return nil
 		}
 		specifier := modulespecifiers.GetNodeModulesPackageName(
-			l.host.GetProgram().Options(),
+			l.program.Options(),
 			fromFile,
 			importedFileName,
 			moduleSpecifierResolutionHost,

internal/ls/host.go

@@ -1,9 +1,8 @@
 package ls
 
-import (
-	"github.com/microsoft/typescript-go/internal/compiler"
-)
-
 type Host interface {
-	GetProgram() *compiler.Program
+	UseCaseSensitiveFileNames() bool
+	ReadFile(path string) (contents string, ok bool)
+	FileExists(path string) bool
+	Converters() *Converters
 }

internal/ls/languageservice.go

@@ -8,33 +8,26 @@ import (
 )
 
 type LanguageService struct {
-	host                      Host
-	converters                *Converters
-	documentPositionMappers   map[string]*sourcemap.DocumentPositionMapper
-	useCaseSensitiveFileNames bool
-	readFile                  func(path string) (contents string, ok bool)
-	fileExists                func(path string) bool
+	host                    Host
+	program                 *compiler.Program
+	converters              *Converters
+	documentPositionMappers map[string]*sourcemap.DocumentPositionMapper
 }
 
 func NewLanguageService(
+	program *compiler.Program,
 	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{},
+		host:                    host,
+		program:                 program,
+		converters:              host.Converters(),
+		documentPositionMappers: map[string]*sourcemap.DocumentPositionMapper{},
 	}
 }
 
 func (l *LanguageService) GetProgram() *compiler.Program {
-	return l.host.GetProgram()
+	return l.program
 }
 
 func (l *LanguageService) tryGetProgramAndFile(fileName string) (*compiler.Program, *ast.SourceFile) {
@@ -62,11 +55,11 @@ func (l *LanguageService) GetDocumentPositionMapper(fileName string) *sourcemap.
 }
 
 func (l *LanguageService) ReadFile(fileName string) (string, bool) {
-	return l.readFile(fileName)
+	return l.host.ReadFile(fileName)
 }
 
 func (l *LanguageService) UseCaseSensitiveFileNames() bool {
-	return l.useCaseSensitiveFileNames
+	return l.host.UseCaseSensitiveFileNames()
 }
 
 func (l *LanguageService) GetLineInfo(fileName string) *sourcemap.LineInfo {

internal/ls/source_map.go

@@ -41,7 +41,7 @@ func (s *script) Text() string {
 }
 
 func (l *LanguageService) getScript(fileName string) *script {
-	text, ok := l.readFile(fileName)
+	text, ok := l.host.ReadFile(fileName)
 	if !ok {
 		return nil
 	}
@@ -54,7 +54,7 @@ func (l *LanguageService) tryGetSourcePosition(
 ) *sourcemap.DocumentPosition {
 	newPos := l.tryGetSourcePositionWorker(fileName, position)
 	if newPos != nil {
-		if !l.fileExists(newPos.FileName) {
+		if !l.host.FileExists(newPos.FileName) {
 			return nil
 		}
 	}

internal/project/project.go

@@ -9,7 +9,6 @@ import (
 	"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/ls"
 	"github.com/microsoft/typescript-go/internal/lsp/lsproto"
 	"github.com/microsoft/typescript-go/internal/project/ata"
 	"github.com/microsoft/typescript-go/internal/project/logging"
@@ -49,8 +48,6 @@ const (
 	PendingReloadFull
 )
 
-var _ ls.Host = (*Project)(nil)
-
 // Project represents a TypeScript project.
 // If changing struct fields, also update the Clone method.
 type Project struct {
@@ -195,7 +192,6 @@ func (p *Project) ConfigFilePath() tspath.Path {
 	return p.configFilePath
 }
 
-// GetProgram implements ls.Host.
 func (p *Project) GetProgram() *compiler.Program {
 	return p.Program
 }

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

internal/sourcemap/source_mapper.go

@@ -286,8 +286,7 @@ func tryGetSourceMappingURL(host Host, fileName string) string {
 	return TryGetSourceMappingURL(lineInfo)
 }
 
-// Originally: /^data:(?:application\/json;charset=[uU][tT][fF]-8;base64,([A-Za-z0-9+/=]+)$)?/
-// Should have been /^data:(?:application\/json;(?:charset=[uU][tT][fF]-8;)?base64,([A-Za-z0-9+/=]+)$)?/
+// Equivalent to /^data:(?:application\/json;(?:charset=[uU][tT][fF]-8;)?base64,([A-Za-z0-9+/=]+)$)?/
 func tryParseBase64Url(url string) (parseableUrl string, isBase64Url bool) {
 	var found bool
 	if url, found = strings.CutPrefix(url, `data:`); !found {