Include missing files in program’s root file list

Author: andrewbranch

internal/compiler/fileloader.go

@@ -38,6 +38,7 @@ type fileLoader struct {
 
 type processedFiles struct {
 	files                         []*ast.SourceFile
+	missingFiles                  []string
 	resolvedModules               map[tspath.Path]module.ModeAwareCache[*module.ResolvedModule]
 	sourceFileMetaDatas           map[tspath.Path]*ast.SourceFileMetaData
 	jsxRuntimeImportSpecifiers    map[tspath.Path]*jsxRuntimeImportSpecifier
@@ -84,6 +85,7 @@ func processAllProgramFiles(
 	totalFileCount := int(loader.totalFileCount.Load())
 	libFileCount := int(loader.libFileCount.Load())
 
+	var missingFiles []string
 	files := make([]*ast.SourceFile, 0, totalFileCount-libFileCount)
 	libFiles := make([]*ast.SourceFile, 0, totalFileCount) // totalFileCount here since we append files to it later to construct the final list
 
@@ -94,6 +96,10 @@ func processAllProgramFiles(
 
 	for task := range loader.collectTasks(loader.rootTasks) {
 		file := task.file
+		if file == nil {
+			missingFiles = append(missingFiles, task.normalizedFilePath)
+			continue
+		}
 		if task.isLib {
 			libFiles = append(libFiles, file)
 		} else {
@@ -189,10 +195,8 @@ func (p *fileLoader) collectTasksWorker(tasks []*parseTask, seen core.Set[*parse
 			}
 		}
 
-		if task.file != nil {
-			if !yield(task) {
-				return false
-			}
+		if !yield(task) {
+			return false
 		}
 	}
 	return true
@@ -244,6 +248,10 @@ func (t *parseTask) start(loader *fileLoader) {
 
 	loader.wg.Queue(func() {
 		file := loader.parseSourceFile(t.normalizedFilePath)
+		if file == nil {
+			return
+		}
+
 		t.file = file
 		loader.wg.Queue(func() {
 			t.metadata = loader.loadSourceFileMetaData(file.Path())

internal/project/project.go

@@ -158,13 +158,7 @@ func (p *Project) GetProjectVersion() int {
 
 // GetRootFileNames implements LanguageServiceHost.
 func (p *Project) GetRootFileNames() []string {
-	fileNames := make([]string, 0, p.rootFileNames.Size())
-	for path, fileName := range p.rootFileNames.Entries() {
-		if p.host.GetScriptInfoByPath(path) != nil {
-			fileNames = append(fileNames, fileName)
-		}
-	}
-	return fileNames
+	return slices.Collect(p.rootFileNames.Values())
 }
 
 // GetSourceFile implements LanguageServiceHost.

internal/project/service_test.go

@@ -293,7 +293,7 @@ func TestService(t *testing.T) {
 			service.OpenFile("/home/projects/TS/p1/src/index.ts", files["/home/projects/TS/p1/src/index.ts"], core.ScriptKindTS, "")
 			_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/index.ts")
 			program := project.GetProgram()
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 0)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 0)
 
 			filesCopy := maps.Clone(files)
 			filesCopy["/home/projects/TS/p1/tsconfig.json"] = `{
@@ -311,7 +311,7 @@ func TestService(t *testing.T) {
 			}))
 
 			program = project.GetProgram()
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 1)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 1)
 		})
 
 		t.Run("delete explicitly included file", func(t *testing.T) {
@@ -330,7 +330,7 @@ func TestService(t *testing.T) {
 			service.OpenFile("/home/projects/TS/p1/src/index.ts", files["/home/projects/TS/p1/src/index.ts"], core.ScriptKindTS, "")
 			_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/index.ts")
 			program := project.GetProgram()
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 0)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 0)
 
 			filesCopy := maps.Clone(files)
 			delete(filesCopy, "/home/projects/TS/p1/src/x.ts")
@@ -343,7 +343,7 @@ func TestService(t *testing.T) {
 			}))
 
 			program = project.GetProgram()
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 1)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 1)
 			assert.Check(t, program.GetSourceFile("/home/projects/TS/p1/src/x.ts") == nil)
 		})
 
@@ -363,7 +363,7 @@ func TestService(t *testing.T) {
 			service.OpenFile("/home/projects/TS/p1/src/x.ts", files["/home/projects/TS/p1/src/x.ts"], core.ScriptKindTS, "")
 			_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/x.ts")
 			program := project.GetProgram()
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/x.ts"))), 0)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/x.ts"))), 0)
 
 			filesCopy := maps.Clone(files)
 			delete(filesCopy, "/home/projects/TS/p1/src/index.ts")
@@ -376,7 +376,7 @@ func TestService(t *testing.T) {
 			}))
 
 			program = project.GetProgram()
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/x.ts"))), 1)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/x.ts"))), 1)
 		})
 
 		t.Run("create explicitly included file", func(t *testing.T) {
@@ -396,7 +396,7 @@ func TestService(t *testing.T) {
 			program := project.GetProgram()
 
 			// Initially should have an error because y.ts is missing
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 1)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 1)
 
 			// Add the missing file
 			filesCopy := maps.Clone(files)
@@ -411,7 +411,7 @@ func TestService(t *testing.T) {
 
 			// Error should be resolved
 			program = project.GetProgram()
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 0)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 0)
 			assert.Check(t, program.GetSourceFile("/home/projects/TS/p1/src/y.ts") != nil)
 		})
 
@@ -432,7 +432,7 @@ func TestService(t *testing.T) {
 			program := project.GetProgram()
 
 			// Initially should have an error because z.ts is missing
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 1)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 1)
 
 			// Add a new file through wildcard inclusion
 			filesCopy := maps.Clone(files)
@@ -447,7 +447,7 @@ func TestService(t *testing.T) {
 
 			// Error should be resolved and the new file should be included in the program
 			program = project.GetProgram()
-			assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 0)
+			assert.Equal(t, len(program.GetSemanticDiagnostics(t.Context(), program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 0)
 			assert.Check(t, program.GetSourceFile("/home/projects/TS/p1/src/z.ts") != nil)
 		})
 	})

internal/tsoptions/parsedcommandline.go

@@ -64,6 +64,7 @@ func (p *ParsedCommandLine) GetConfigFileParsingDiagnostics() []*ast.Diagnostic
 	return p.Errors
 }
 
+// Porting reference: ProjectService.isMatchedByConfig
 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 {