Skip to content

fix(core): skip file watcher on filesystem roots #46148

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

Open
CannonRS wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −2
Open

fix(core): skip file watcher on filesystem roots #46148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions packages/core/src/filesystem/watcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,15 @@ const layer = Layer.effect(
)
}

const isRootOrSystemDirectory = (dir: string) => {
const normalized = dir.replace(/\\/g, "/").replace(/\/+$/, "")
return !normalized || /^[a-zA-Z]:$/.test(normalized) || normalized === "/"
}

const config = (yield* (yield* Config.Service).entries())
.filter((entry): entry is Config.Document => entry.type === "document")
.flatMap((item) => item.info.watcher?.ignore ?? [])
if (location.vcs && (yield* Flag.OPENCODE_EXPERIMENTAL_FILEWATCHER)) {
if (location.vcs && (yield* Flag.OPENCODE_EXPERIMENTAL_FILEWATCHER) && !isRootOrSystemDirectory(location.directory)) {
yield* Effect.forkScoped(
subscribe(location.directory, [...Ignore.PATTERNS, ...config, ...protecteds(location.directory)]),
)
Expand All @@ -115,7 +120,7 @@ const layer = Layer.effect(
if (location.vcs?.type === "git") {
const resolved = (yield* git.repo.discover(location.directory))?.gitDirectory
const vcs = resolved ? yield* fs.realPath(resolved).pipe(Effect.catch(() => Effect.succeed(resolved))) : undefined
if (vcs && !config.includes(".git") && !config.includes(vcs) && (!resolved || !config.includes(resolved))) {
if (vcs && !isRootOrSystemDirectory(vcs) && !config.includes(".git") && !config.includes(vcs) && (!resolved || !config.includes(resolved))) {
const ignore = (yield* fs.readDirectoryEntries(vcs).pipe(Effect.catch(() => Effect.succeed([])))).flatMap(
(entry) => (entry.name === "HEAD" ? [] : [entry.name]),
)
Expand Down
Loading