Use GetCommonParents instead of node_modules strategy

Author: andrewbranch

internal/project/configfileregistry.go

@@ -41,7 +41,7 @@ type configFileEntry struct {
 	// when this is set, no other fields will be used.
 	retainingConfigs map[tspath.Path]struct{}
 	// rootFilesWatch is a watch for the root files of this config file.
-	rootFilesWatch *WatchedFiles[[]string]
+	rootFilesWatch *WatchedFiles[patternsAndIgnored]
 }
 
 func newConfigFileEntry(fileName string) *configFileEntry {

internal/project/configfileregistrybuilder.go

@@ -165,6 +165,7 @@ func (c *configFileRegistryBuilder) updateRootFilesWatch(fileName string, entry
 		return
 	}
 
+	var ignored map[string]struct{}
 	var globs []string
 	var externalDirectories []string
 	var includeWorkspace bool
@@ -197,10 +198,10 @@ func (c *configFileRegistryBuilder) updateRootFilesWatch(fileName string, entry
 	}
 
 	if includeWorkspace {
-		globs = append(globs, fmt.Sprintf("%s/%s", c.sessionOptions.CurrentDirectory, recursiveFileGlobPattern))
+		globs = append(globs, getRecursiveGlobPattern(c.sessionOptions.CurrentDirectory))
 	}
 	if includeTsconfigDir {
-		globs = append(globs, fmt.Sprintf("%s/%s", tsconfigDir, recursiveFileGlobPattern))
+		globs = append(globs, getRecursiveGlobPattern(tsconfigDir))
 	}
 	for _, fileName := range entry.commandLine.ExtendedSourceFiles() {
 		if includeWorkspace && tspath.ContainsPath(c.sessionOptions.CurrentDirectory, fileName, comparePathsOptions) {
@@ -209,13 +210,18 @@ func (c *configFileRegistryBuilder) updateRootFilesWatch(fileName string, entry
 		globs = append(globs, fileName)
 	}
 	if len(externalDirectories) > 0 {
-		for _, parent := range tspath.GetCommonParents(externalDirectories, minWatchLocationDepth, comparePathsOptions) {
-			globs = append(globs, fmt.Sprintf("%s/%s", parent, recursiveFileGlobPattern))
+		commonParents, ignoredExternalDirs := tspath.GetCommonParents(externalDirectories, minWatchLocationDepth, getPathComponentsForWatching, comparePathsOptions)
+		for _, parent := range commonParents {
+			globs = append(globs, getRecursiveGlobPattern(parent))
 		}
+		ignored = ignoredExternalDirs
 	}
 
 	slices.Sort(globs)
-	entry.rootFilesWatch = entry.rootFilesWatch.Clone(globs)
+	entry.rootFilesWatch = entry.rootFilesWatch.Clone(patternsAndIgnored{
+		patterns: globs,
+		ignored:  ignored,
+	})
 }
 
 // acquireConfigForProject loads a config file entry from the cache, or parses it if not already

internal/project/project.go

@@ -72,10 +72,10 @@ type Project struct {
 	// The ID of the snapshot that created the program stored in this project.
 	ProgramLastUpdate uint64
 
-	programFilesWatch       *WatchedFiles[[]string]
+	programFilesWatch       *WatchedFiles[patternsAndIgnored]
 	failedLookupsWatch      *WatchedFiles[map[tspath.Path]string]
 	affectingLocationsWatch *WatchedFiles[map[tspath.Path]string]
-	typingsWatch            *WatchedFiles[map[tspath.Path]string]
+	typingsWatch            *WatchedFiles[patternsAndIgnored]
 
 	checkerPool *checkerPool
 
@@ -168,7 +168,7 @@ func NewProject(
 			project.typingsWatch = NewWatchedFiles(
 				"typings installer files",
 				lsproto.WatchKindCreate|lsproto.WatchKindChange|lsproto.WatchKindDelete,
-				globMapperForTypingsInstaller,
+				core.Identity,
 			)
 		}
 	}
@@ -331,7 +331,7 @@ func (p *Project) CreateProgram() CreateProgramResult {
 	}
 }
 
-func (p *Project) CloneWatchers(workspaceDir string) (programFilesWatch *WatchedFiles[[]string], failedLookupsWatch *WatchedFiles[map[tspath.Path]string], affectingLocationsWatch *WatchedFiles[map[tspath.Path]string]) {
+func (p *Project) CloneWatchers(workspaceDir string) (programFilesWatch *WatchedFiles[patternsAndIgnored], failedLookupsWatch *WatchedFiles[map[tspath.Path]string], affectingLocationsWatch *WatchedFiles[map[tspath.Path]string]) {
 	failedLookups := make(map[tspath.Path]string)
 	affectingLocations := make(map[tspath.Path]string)
 	programFiles := getNonRootFileGlobs(workspaceDir, p.Program.GetSourceFiles(), p.CommandLine.FileNamesByPath(), tspath.ComparePathsOptions{

internal/project/session.go

@@ -449,6 +449,14 @@ func updateWatch[T any](ctx context.Context, session *Session, logger logging.Lo
 					logger.Log("")
 				}
 			}
+			if len(newWatcher.ignored) > 0 {
+				logger.Logf("%d paths ineligible for watching", len(newWatcher.ignored))
+				if logger.IsVerbose() {
+					for path := range newWatcher.ignored {
+						logger.Log("\t" + path)
+					}
+				}
+			}
 		}
 	}
 	if oldWatcher != nil {