Skip to content

Call IsDirCoveredByWatch less often to improve performance #4582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
terite wants to merge 2 commits into from
Closed

Call IsDirCoveredByWatch less often to improve performance #4582

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0baff24
Call IsDirCoveredByWatch less often to improve performance
terite Jul 10, 2026
212ec38
Avoid duplicate watches on case-insensitive filesystems
terite Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions internal/execute/watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,24 @@ func (w *Watcher) computeDesiredWatches(seenFilePaths []string) map[string]bool
resolvedDirs := w.wm.ResolveDesiredDirs(desiredDirs)

opts := w.comparePathsOptions()
toAddDirs := make(map[tspath.Path]string) // canonicalized dir → original dir
for _, filePath := range seenFilePaths {
dir := tspath.GetDirectoryPath(filePath)
if !watchmanager.IsDirCoveredByWatch(resolvedDirs, dir, opts) {
if watchmanager.CanWatchDirectory(dir) {
resolvedDirs[dir] = false
canonicalDir := tspath.ToPath(dir, cwd, opts.UseCaseSensitiveFileNames)
if _, has := toAddDirs[canonicalDir]; !has {
if !watchmanager.IsDirCoveredByWatch(resolvedDirs, dir, opts) && watchmanager.CanWatchDirectory(dir) {
toAddDirs[canonicalDir] = dir
} else {
// Cache the IsDirCoveredByWatch call, but don't add the dir
toAddDirs[canonicalDir] = ""
}
}
}
for _, dir := range toAddDirs {
if dir != "" {
resolvedDirs[dir] = false
}
}

// Re-resolve in case newly added dirs don't exist
return w.wm.ResolveDesiredDirs(resolvedDirs)
Expand Down