Port finding default project finder code (#1186)

Author: sheetalkamat

internal/compiler/fileloader.go

@@ -200,7 +200,7 @@ func (p *fileLoader) addProjectReferenceTasks() {
 		opts: p.opts,
 		host: p.opts.Host,
 	}
-	projectReferences := p.opts.Config.ProjectReferences()
+	projectReferences := p.opts.Config.ResolvedProjectReferencePaths()
 	if len(projectReferences) == 0 {
 		return
 	}

internal/compiler/program.go

@@ -124,7 +124,7 @@ func (p *Program) GetRedirectForResolution(file ast.HasFileName) *tsoptions.Pars
 }
 
 func (p *Program) ForEachResolvedProjectReference(
-	fn func(path tspath.Path, config *tsoptions.ParsedCommandLine) bool,
+	fn func(path tspath.Path, config *tsoptions.ParsedCommandLine),
 ) {
 	p.projectReferenceFileMapper.forEachResolvedProjectReference(fn)
 }

internal/compiler/projectreferencefilemapper.go

@@ -140,7 +140,7 @@ func (mapper *projectReferenceFileMapper) getResolvedReferenceFor(path tspath.Pa
 }
 
 func (mapper *projectReferenceFileMapper) forEachResolvedProjectReference(
-	fn func(path tspath.Path, config *tsoptions.ParsedCommandLine) bool,
+	fn func(path tspath.Path, config *tsoptions.ParsedCommandLine),
 ) {
 	if mapper.opts.Config.ConfigFile == nil {
 		return
@@ -150,14 +150,13 @@ func (mapper *projectReferenceFileMapper) forEachResolvedProjectReference(
 }
 
 func (mapper *projectReferenceFileMapper) forEachResolvedReferenceWorker(
-	referenes []tspath.Path,
-	fn func(path tspath.Path, config *tsoptions.ParsedCommandLine) bool,
+	references []tspath.Path,
+	fn func(path tspath.Path, config *tsoptions.ParsedCommandLine),
 ) {
-	for _, path := range referenes {
+	for _, path := range references {
 		config, _ := mapper.configToProjectReference[path]
-		if !fn(path, config) {
-			return
-		}
+		fn(path, config)
+		mapper.forEachResolvedReferenceWorker(mapper.referencesInConfigFile[path], fn)
 	}
 }
 

internal/compiler/projectreferenceparsetask.go

@@ -25,7 +25,7 @@ func (t *projectReferenceParseTask) start(loader *fileLoader) {
 			t.resolved.ParseInputOutputNames()
 		})
 	}
-	subReferences := t.resolved.ProjectReferences()
+	subReferences := t.resolved.ResolvedProjectReferencePaths()
 	if len(subReferences) == 0 {
 		return
 	}
@@ -36,13 +36,10 @@ func getSubTasksOfProjectReferenceParseTask(t *projectReferenceParseTask) []*pro
 	return t.subTasks
 }
 
-func createProjectReferenceParseTasks(projectReferences []*core.ProjectReference) []*projectReferenceParseTask {
-	tasks := make([]*projectReferenceParseTask, 0, len(projectReferences))
-	for _, reference := range projectReferences {
-		configName := core.ResolveProjectReferencePath(reference)
-		tasks = append(tasks, &projectReferenceParseTask{
+func createProjectReferenceParseTasks(projectReferences []string) []*projectReferenceParseTask {
+	return core.Map(projectReferences, func(configName string) *projectReferenceParseTask {
+		return &projectReferenceParseTask{
 			configName: configName,
-		})
-	}
-	return tasks
+		}
+	})
 }

internal/project/configfileregistry.go

@@ -17,6 +17,7 @@ type ConfigFileEntry struct {
 	mu             sync.Mutex
 	commandLine    *tsoptions.ParsedCommandLine
 	projects       collections.Set[*Project]
+	infos          collections.Set[*ScriptInfo]
 	pendingReload  PendingReload
 	rootFilesWatch *watchedFiles[[]string]
 }
@@ -28,6 +29,7 @@ type ExtendedConfigFileEntry struct {
 
 type ConfigFileRegistry struct {
 	Host                  ProjectHost
+	defaultProjectFinder  *defaultProjectFinder
 	ConfigFiles           collections.SyncMap[tspath.Path, *ConfigFileEntry]
 	ExtendedConfigCache   collections.SyncMap[tspath.Path, *tsoptions.ExtendedConfigCacheEntry]
 	ExtendedConfigsUsedBy collections.SyncMap[tspath.Path, *ExtendedConfigFileEntry]
@@ -60,26 +62,17 @@ func (c *configFileWatchHost) Log(message string) {
 	c.host.Log(message)
 }
 
-func (c *ConfigFileRegistry) ReleaseConfig(path tspath.Path, project *Project) {
+func (c *ConfigFileRegistry) releaseConfig(path tspath.Path, project *Project) {
 	entry, ok := c.ConfigFiles.Load(path)
 	if !ok {
 		return
 	}
 	entry.mu.Lock()
 	defer entry.mu.Unlock()
 	entry.projects.Delete(project)
-	if entry.projects.Len() == 0 {
-		c.ConfigFiles.Delete(path)
-		commandLine := entry.commandLine
-		entry.commandLine = nil
-		c.updateExtendedConfigsUsedBy(path, entry, commandLine)
-		if entry.rootFilesWatch != nil {
-			entry.rootFilesWatch.update(context.Background(), nil)
-		}
-	}
 }
 
-func (c *ConfigFileRegistry) AcquireConfig(fileName string, path tspath.Path, project *Project) *tsoptions.ParsedCommandLine {
+func (c *ConfigFileRegistry) acquireConfig(fileName string, path tspath.Path, project *Project, info *ScriptInfo) *tsoptions.ParsedCommandLine {
 	entry, ok := c.ConfigFiles.Load(path)
 	if !ok {
 		// Create parsed command line
@@ -97,7 +90,11 @@ func (c *ConfigFileRegistry) AcquireConfig(fileName string, path tspath.Path, pr
 	}
 	entry.mu.Lock()
 	defer entry.mu.Unlock()
-	entry.projects.Add(project)
+	if project != nil {
+		entry.projects.Add(project)
+	} else if info != nil {
+		entry.infos.Add(info)
+	}
 	if entry.pendingReload == PendingReloadNone {
 		return entry.commandLine
 	}
@@ -114,6 +111,23 @@ func (c *ConfigFileRegistry) AcquireConfig(fileName string, path tspath.Path, pr
 	return entry.commandLine
 }
 
+func (c *ConfigFileRegistry) getConfig(path tspath.Path) *tsoptions.ParsedCommandLine {
+	entry, ok := c.ConfigFiles.Load(path)
+	if ok {
+		return entry.commandLine
+	}
+	return nil
+}
+
+func (c *ConfigFileRegistry) releaseConfigsForInfo(info *ScriptInfo) {
+	c.ConfigFiles.Range(func(path tspath.Path, entry *ConfigFileEntry) bool {
+		entry.mu.Lock()
+		entry.infos.Delete(info)
+		entry.mu.Unlock()
+		return true
+	})
+}
+
 func (c *ConfigFileRegistry) updateRootFilesWatch(fileName string, entry *ConfigFileEntry) {
 	if entry.rootFilesWatch == nil {
 		return
@@ -187,6 +201,10 @@ func (c *ConfigFileRegistry) onConfigChange(path tspath.Path, changeKind lsproto
 	entry.mu.Lock()
 	defer entry.mu.Unlock()
 	if entry.SetPendingReload(PendingReloadFull) {
+		for info := range entry.infos.Keys() {
+			delete(c.defaultProjectFinder.configFileForOpenFiles, info.Path())
+			delete(c.defaultProjectFinder.configFilesAncestorForOpenFiles, info.Path())
+		}
 		for project := range entry.projects.Keys() {
 			if project.configFilePath == path {
 				switch changeKind {
@@ -202,6 +220,7 @@ func (c *ConfigFileRegistry) onConfigChange(path tspath.Path, changeKind lsproto
 				project.markAsDirty()
 			}
 		}
+		return true
 	}
 	return false
 }
@@ -224,3 +243,19 @@ func (c *ConfigFileRegistry) tryInvokeWildCardDirectories(fileName string, path
 		entry.mu.Unlock()
 	}
 }
+
+func (c *ConfigFileRegistry) cleanup(toRemoveConfigs map[tspath.Path]*ConfigFileEntry) {
+	for path, entry := range toRemoveConfigs {
+		entry.mu.Lock()
+		if entry.projects.Len() == 0 && entry.infos.Len() == 0 {
+			c.ConfigFiles.Delete(path)
+			commandLine := entry.commandLine
+			entry.commandLine = nil
+			c.updateExtendedConfigsUsedBy(path, entry, commandLine)
+			if entry.rootFilesWatch != nil {
+				entry.rootFilesWatch.update(context.Background(), nil)
+			}
+		}
+		entry.mu.Unlock()
+	}
+}