Handle closed files part of configured projects

Author: andrewbranch

internal/api/api.go

@@ -356,7 +356,7 @@ func (api *API) getOrCreateScriptInfo(fileName string, path tspath.Path, scriptK
 	if !ok {
 		return nil
 	}
-	info = project.NewScriptInfo(fileName, path, scriptKind)
+	info = project.NewScriptInfo(fileName, path, scriptKind, api.host.FS())
 	info.SetTextFromDisk(content)
 	api.scriptInfosMu.Lock()
 	defer api.scriptInfosMu.Unlock()

internal/project/documentregistry.go

@@ -92,9 +92,9 @@ func (r *DocumentRegistry) getDocumentWorker(
 	if entry, ok := r.documents.Load(key); ok {
 		// We have an entry for this file. However, it may be for a different version of
 		// the script snapshot. If so, update it appropriately.
-		if entry.sourceFile.Version != scriptInfo.version {
+		if entry.sourceFile.Version != scriptInfo.Version() {
 			sourceFile := parser.ParseSourceFile(scriptInfo.fileName, scriptInfo.path, scriptInfo.text, scriptTarget, scanner.JSDocParsingModeParseAll)
-			sourceFile.Version = scriptInfo.version
+			sourceFile.Version = scriptInfo.Version()
 			entry.mu.Lock()
 			defer entry.mu.Unlock()
 			entry.sourceFile = sourceFile
@@ -104,7 +104,7 @@ func (r *DocumentRegistry) getDocumentWorker(
 	} else {
 		// Have never seen this file with these settings. Create a new source file for it.
 		sourceFile := parser.ParseSourceFile(scriptInfo.fileName, scriptInfo.path, scriptInfo.text, scriptTarget, scanner.JSDocParsingModeParseAll)
-		sourceFile.Version = scriptInfo.version
+		sourceFile.Version = scriptInfo.Version()
 		entry, _ := r.documents.LoadOrStore(key, &registryEntry{
 			sourceFile: sourceFile,
 			refCount:   0,

internal/project/project.go

@@ -19,6 +19,10 @@ import (
 )
 
 //go:generate go tool golang.org/x/tools/cmd/stringer -type=Kind -output=project_stringer_generated.go
+const (
+	fileGlobPattern          = "*.{js,jsx,mjs,cjs,ts,tsx,mts,cts}"
+	recursiveFileGlobPattern = "**/*.{js,jsx,mjs,cjs,ts,tsx,mts,cts}"
+)
 
 var projectNamer = &namer{}
 
@@ -62,18 +66,20 @@ type Project struct {
 	deferredClose             bool
 	pendingConfigReload       bool
 
-	currentDirectory string
+	comparePathsOptions tspath.ComparePathsOptions
+	currentDirectory    string
 	// Inferred projects only
 	rootPath tspath.Path
 
 	configFileName string
 	configFilePath tspath.Path
 	// rootFileNames was a map from Path to { NormalizedPath, ScriptInfo? } in the original code.
 	// But the ProjectService owns script infos, so it's not clear why there was an extra pointer.
-	rootFileNames   *collections.OrderedMap[tspath.Path, string]
-	compilerOptions *core.CompilerOptions
-	languageService *ls.LanguageService
-	program         *compiler.Program
+	rootFileNames     *collections.OrderedMap[tspath.Path, string]
+	compilerOptions   *core.CompilerOptions
+	parsedCommandLine *tsoptions.ParsedCommandLine
+	languageService   *ls.LanguageService
+	program           *compiler.Program
 
 	watchedGlobs []string
 	watcherID    WatcherHandle
@@ -103,6 +109,10 @@ func NewProject(name string, kind Kind, currentDirectory string, host ProjectHos
 		currentDirectory: currentDirectory,
 		rootFileNames:    &collections.OrderedMap[tspath.Path, string]{},
 	}
+	project.comparePathsOptions = tspath.ComparePathsOptions{
+		CurrentDirectory:          currentDirectory,
+		UseCaseSensitiveFileNames: host.FS().UseCaseSensitiveFileNames(),
+	}
 	project.languageService = ls.NewLanguageService(project)
 	project.markAsDirty()
 	return project
@@ -213,25 +223,28 @@ func (p *Project) LanguageService() *ls.LanguageService {
 }
 
 func (p *Project) getWatchGlobs() []string {
-	// !!!
 	if p.kind == KindConfigured {
-		return []string{
-			p.configFileName,
+		wildcardDirectories := p.parsedCommandLine.WildcardDirectories()
+		result := make([]string, 0, len(wildcardDirectories)+1)
+		result = append(result, p.configFileName)
+		for dir, recursive := range wildcardDirectories {
+			result = append(result, fmt.Sprintf("%s/%s", dir, core.IfElse(recursive, recursiveFileGlobPattern, fileGlobPattern)))
 		}
+		return result
 	}
 	return nil
 }
 
 func (p *Project) updateWatchers() {
-	watchHost := p.host.Client()
-	if watchHost == nil {
+	client := p.host.Client()
+	if client == nil {
 		return
 	}
 
 	globs := p.getWatchGlobs()
 	if !slices.Equal(p.watchedGlobs, globs) {
 		if p.watcherID != "" {
-			if err := watchHost.UnwatchFiles(p.watcherID); err != nil {
+			if err := client.UnwatchFiles(p.watcherID); err != nil {
 				p.log(fmt.Sprintf("Failed to unwatch files: %v", err))
 			}
 		}
@@ -248,7 +261,7 @@ func (p *Project) updateWatchers() {
 					Kind: &kind,
 				}
 			}
-			if watcherID, err := watchHost.WatchFiles(watchers); err != nil {
+			if watcherID, err := client.WatchFiles(watchers); err != nil {
 				p.log(fmt.Sprintf("Failed to watch files: %v", err))
 			} else {
 				p.watcherID = watcherID
@@ -284,6 +297,7 @@ func (p *Project) markAsDirty() {
 	}
 }
 
+// updateIfDirty returns true if the project was updated.
 func (p *Project) updateIfDirty() bool {
 	// !!! p.invalidateResolutionsOfFailedLookupLocations()
 	return p.dirty && p.updateGraph()
@@ -437,6 +451,7 @@ func (p *Project) LoadConfig() error {
 			}, "    ", "  ")),
 		)
 
+		p.parsedCommandLine = parsedCommandLine
 		p.compilerOptions = parsedCommandLine.CompilerOptions()
 		p.setRootFiles(parsedCommandLine.FileNames())
 	} else {

internal/project/scriptinfo.go

@@ -27,9 +27,11 @@ type ScriptInfo struct {
 	deferredDelete        bool
 
 	containingProjects []*Project
+
+	fs vfs.FS
 }
 
-func NewScriptInfo(fileName string, path tspath.Path, scriptKind core.ScriptKind) *ScriptInfo {
+func NewScriptInfo(fileName string, path tspath.Path, scriptKind core.ScriptKind, fs vfs.FS) *ScriptInfo {
 	isDynamic := isDynamicFileName(fileName)
 	realpath := core.IfElse(isDynamic, path, "")
 	return &ScriptInfo{
@@ -38,6 +40,7 @@ func NewScriptInfo(fileName string, path tspath.Path, scriptKind core.ScriptKind
 		realpath:   realpath,
 		isDynamic:  isDynamic,
 		scriptKind: scriptKind,
+		fs:         fs,
 	}
 }
 
@@ -51,15 +54,29 @@ func (s *ScriptInfo) Path() tspath.Path {
 
 func (s *ScriptInfo) LineMap() *ls.LineMap {
 	if s.lineMap == nil {
-		s.lineMap = ls.ComputeLineStarts(s.text)
+		s.lineMap = ls.ComputeLineStarts(s.Text())
 	}
 	return s.lineMap
 }
 
 func (s *ScriptInfo) Text() string {
+	s.reloadIfNeeded()
 	return s.text
 }
 
+func (s *ScriptInfo) Version() int {
+	s.reloadIfNeeded()
+	return s.version
+}
+
+func (s *ScriptInfo) reloadIfNeeded() {
+	if s.pendingReloadFromDisk {
+		if newText, ok := s.fs.ReadFile(s.fileName); ok {
+			s.SetTextFromDisk(newText)
+		}
+	}
+}
+
 func (s *ScriptInfo) open(newText string) {
 	s.isOpen = true
 	s.pendingReloadFromDisk = false
@@ -133,7 +150,7 @@ func (s *ScriptInfo) isOrphan() bool {
 }
 
 func (s *ScriptInfo) editContent(change ls.TextChange) {
-	s.setText(change.ApplyTo(s.text))
+	s.setText(change.ApplyTo(s.Text()))
 	s.markContainingProjectsAsDirty()
 }
 

internal/project/service.go

@@ -237,11 +237,31 @@ func (s *Service) OnWatchedFilesChanged(changes []lsproto.FileEvent) error {
 		fileName := ls.DocumentURIToFileName(change.Uri)
 		path := s.toPath(fileName)
 		if project, ok := s.configuredProjects[path]; ok {
+			// tsconfig of project
 			if err := s.onConfigFileChanged(project, change.Type); err != nil {
 				return fmt.Errorf("error handling config file change: %w", err)
 			}
+		} else if _, ok := s.openFiles[path]; ok {
+			// open file
+			continue
+		} else if info := s.GetScriptInfoByPath(path); info != nil {
+			// closed existing file
+			if change.Type == lsproto.FileChangeTypeDeleted {
+				s.handleDeletedFile(info, true /*deferredDelete*/)
+			} else {
+				info.deferredDelete = false
+				info.delayReloadNonMixedContentFile()
+				// !!! s.delayUpdateProjectGraphs(info.containingProjects, false /*clearSourceMapperCache*/)
+				// !!! s.handleSourceMapProjects(info)
+			}
 		} else {
-			// !!!
+			// must be wildcard watcher?
+		}
+	}
+
+	for _, project := range s.configuredProjects {
+		if project.updateIfDirty() {
+			s.publishDiagnosticsForOpenFiles(project)
 		}
 	}
 	return nil
@@ -262,8 +282,6 @@ func (s *Service) onConfigFileChanged(project *Project, changeKind lsproto.FileC
 	if !project.deferredClose {
 		project.pendingConfigReload = true
 		project.markAsDirty()
-		project.updateIfDirty()
-		return s.publishDiagnosticsForOpenFiles(project)
 	}
 	return nil
 }
@@ -434,7 +452,7 @@ func (s *Service) getOrCreateScriptInfoWorker(fileName string, path tspath.Path,
 			}
 		}
 
-		info = NewScriptInfo(fileName, path, scriptKind)
+		info = NewScriptInfo(fileName, path, scriptKind, s.host.FS())
 		if fromDisk {
 			info.SetTextFromDisk(fileContent)
 		}

internal/tsoptions/commandlineparser.go

@@ -9,6 +9,7 @@ import (
 	"github.com/microsoft/typescript-go/internal/compiler/diagnostics"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/stringutil"
+	"github.com/microsoft/typescript-go/internal/tspath"
 	"github.com/microsoft/typescript-go/internal/vfs"
 )
 
@@ -58,6 +59,11 @@ func ParseCommandLine(
 		Errors:        parser.errors,
 		Raw:           parser.options, // !!! keep optionsBase incase needed later. todo: figure out if this is still needed
 		CompileOnSave: nil,
+
+		comparePathsOptions: tspath.ComparePathsOptions{
+			UseCaseSensitiveFileNames: host.FS().UseCaseSensitiveFileNames(),
+			CurrentDirectory:          host.GetCurrentDirectory(),
+		},
 	}
 }
 

internal/tsoptions/parsedcommandline.go

@@ -2,20 +2,38 @@ package tsoptions
 
 import (
 	"slices"
+	"sync"
 
 	"github.com/microsoft/typescript-go/internal/ast"
 	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/tspath"
 )
 
 type ParsedCommandLine struct {
 	ParsedConfig *core.ParsedOptions `json:"parsedConfig"`
 
-	ConfigFile *TsConfigSourceFile `json:"configFile"` // TsConfigSourceFile, used in Program and ExecuteCommandLine
-	Errors     []*ast.Diagnostic   `json:"errors"`
-	Raw        any                 `json:"raw"`
-	// WildcardDirectories map[string]watchDirectoryFlags
-	CompileOnSave *bool `json:"compileOnSave"`
+	ConfigFile    *TsConfigSourceFile `json:"configFile"` // TsConfigSourceFile, used in Program and ExecuteCommandLine
+	Errors        []*ast.Diagnostic   `json:"errors"`
+	Raw           any                 `json:"raw"`
+	CompileOnSave *bool               `json:"compileOnSave"`
 	// TypeAquisition *core.TypeAcquisition
+
+	comparePathsOptions     tspath.ComparePathsOptions
+	wildcardDirectoriesOnce sync.Once
+	wildcardDirectories     map[string]bool
+}
+
+// WildcardDirectories returns the cached wildcard directories, initializing them if needed
+func (p *ParsedCommandLine) WildcardDirectories() map[string]bool {
+	p.wildcardDirectoriesOnce.Do(func() {
+		p.wildcardDirectories = getWildcardDirectories(
+			p.ConfigFile.configFileSpecs.validatedIncludeSpecs,
+			p.ConfigFile.configFileSpecs.validatedExcludeSpecs,
+			p.comparePathsOptions,
+		)
+	})
+
+	return p.wildcardDirectories
 }
 
 func (p *ParsedCommandLine) SetParsedOptions(o *core.ParsedOptions) {
@@ -45,3 +63,32 @@ func (p *ParsedCommandLine) GetConfigFileParsingDiagnostics() []*ast.Diagnostic
 	}
 	return p.Errors
 }
+
+func (p *ParsedCommandLine) MatchesFileName(fileName string, comparePathsOptions tspath.ComparePathsOptions) bool {
+	path := tspath.ToPath(fileName, comparePathsOptions.CurrentDirectory, comparePathsOptions.UseCaseSensitiveFileNames)
+	if slices.ContainsFunc(p.FileNames(), func(f string) bool {
+		return path == tspath.ToPath(f, comparePathsOptions.CurrentDirectory, comparePathsOptions.UseCaseSensitiveFileNames)
+	}) {
+		return true
+	}
+
+	if p.ConfigFile == nil {
+		return false
+	}
+
+	if slices.ContainsFunc(p.ConfigFile.configFileSpecs.validatedFilesSpec, func(f string) bool {
+		return path == tspath.ToPath(f, comparePathsOptions.CurrentDirectory, comparePathsOptions.UseCaseSensitiveFileNames)
+	}) {
+		return true
+	}
+
+	if len(p.ConfigFile.configFileSpecs.validatedIncludeSpecs) == 0 {
+		return false
+	}
+
+	if p.ConfigFile.configFileSpecs.matchesExclude(fileName, comparePathsOptions) {
+		return false
+	}
+
+	return p.ConfigFile.configFileSpecs.matchesInclude(fileName, comparePathsOptions)
+}