fix(useFsWatcher): should store new watchers correctly

KermanX · Sep 28, 2024 · b5d6e76 · b5d6e76
1 parent c1a8147
commit b5d6e76
Showing 1 changed file with 89 additions and 88 deletions.
diff --git a/packages/core/src/composables/useFsWatcher.ts b/packages/core/src/composables/useFsWatcher.ts
@@ -1,88 +1,89 @@
-import type { MaybeRefOrGetter, ShallowReactive } from '@reactive-vscode/reactivity'
-import { computed, onScopeDispose, shallowReactive, toValue, watch } from '@reactive-vscode/reactivity'
-import type { Event, FileSystemWatcher, GlobPattern, Uri } from 'vscode'
-import { workspace } from 'vscode'
-import type { MaybeNullableRefOrGetter } from '../utils'
-import { useEventEmitter } from './useEventEmitter'
-
-export interface UseFSWatcher {
-  readonly watchers: ShallowReactive<Map<GlobPattern, FileSystemWatcher>>
-  readonly onDidCreate: Event<Uri>
-  readonly onDidChange: Event<Uri>
-  readonly onDidDelete: Event<Uri>
-}
-
-/**
- * @reactive `workspace.createFileSystemWatcher`
- */
-export function useFsWatcher(
-  globPattern: MaybeRefOrGetter<GlobPattern | readonly GlobPattern[] | ReadonlySet<GlobPattern>>,
-  ignoreCreateEvents?: MaybeNullableRefOrGetter<boolean>,
-  ignoreChangeEvents?: MaybeNullableRefOrGetter<boolean>,
-  ignoreDeleteEvents?: MaybeNullableRefOrGetter<boolean>,
-): UseFSWatcher {
-  const watchers = shallowReactive(new Map<GlobPattern, FileSystemWatcher>())
-  const createEmitter = useEventEmitter<Uri>()
-  const changeEmitter = useEventEmitter<Uri>()
-  const deleteEmitter = useEventEmitter<Uri>()
-
-  const normalizedPatterns = computed(() => {
-    const globPatternValue = toValue(globPattern)
-    return Array.isArray(globPatternValue)
-      ? globPatternValue
-      : globPatternValue instanceof Set
-        ? Array.from(globPatternValue)
-        : [globPatternValue]
-  })
-
-  function updateWatchers() {
-    const newPatterns = normalizedPatterns.value
-    for (const [pattern, watcher] of watchers) {
-      if (!newPatterns.includes(pattern)) {
-        watcher.dispose()
-        watchers.delete(pattern)
-      }
-    }
-    for (const pattern of newPatterns) {
-      if (!watchers.has(pattern)) {
-        const w = workspace.createFileSystemWatcher(
-          pattern,
-          toValue(ignoreCreateEvents) || false,
-          toValue(ignoreChangeEvents) || false,
-          toValue(ignoreDeleteEvents) || false,
-        )
-        w.onDidCreate(createEmitter.fire)
-        w.onDidChange(changeEmitter.fire)
-        w.onDidDelete(deleteEmitter.fire)
-      }
-    }
-  }
-
-  function clearWatchers() {
-    for (const watcher of watchers.values()) {
-      watcher.dispose()
-    }
-    watchers.clear()
-  }
-
-  watch(normalizedPatterns, updateWatchers)
-  watch(
-    () => [
-      toValue(ignoreCreateEvents),
-      toValue(ignoreChangeEvents),
-      toValue(ignoreDeleteEvents),
-    ],
-    () => {
-      clearWatchers()
-      updateWatchers()
-    },
-  )
-  onScopeDispose(clearWatchers)
-
-  return {
-    watchers,
-    onDidCreate: createEmitter.event,
-    onDidChange: changeEmitter.event,
-    onDidDelete: deleteEmitter.event,
-  }
-}
+import type { MaybeRefOrGetter, ShallowReactive } from '@reactive-vscode/reactivity'
+import { computed, onScopeDispose, shallowReactive, toValue, watch } from '@reactive-vscode/reactivity'
+import type { Event, FileSystemWatcher, GlobPattern, Uri } from 'vscode'
+import { workspace } from 'vscode'
+import type { MaybeNullableRefOrGetter } from '../utils'
+import { useEventEmitter } from './useEventEmitter'
+
+export interface UseFSWatcher {
+  readonly watchers: ShallowReactive<Map<GlobPattern, FileSystemWatcher>>
+  readonly onDidCreate: Event<Uri>
+  readonly onDidChange: Event<Uri>
+  readonly onDidDelete: Event<Uri>
+}
+
+/**
+ * @reactive `workspace.createFileSystemWatcher`
+ */
+export function useFsWatcher(
+  globPattern: MaybeRefOrGetter<GlobPattern | readonly GlobPattern[] | ReadonlySet<GlobPattern>>,
+  ignoreCreateEvents?: MaybeNullableRefOrGetter<boolean>,
+  ignoreChangeEvents?: MaybeNullableRefOrGetter<boolean>,
+  ignoreDeleteEvents?: MaybeNullableRefOrGetter<boolean>,
+): UseFSWatcher {
+  const watchers = shallowReactive(new Map<GlobPattern, FileSystemWatcher>())
+  const createEmitter = useEventEmitter<Uri>()
+  const changeEmitter = useEventEmitter<Uri>()
+  const deleteEmitter = useEventEmitter<Uri>()
+
+  const normalizedPatterns = computed(() => {
+    const globPatternValue = toValue(globPattern)
+    return Array.isArray(globPatternValue)
+      ? globPatternValue
+      : globPatternValue instanceof Set
+        ? Array.from(globPatternValue)
+        : [globPatternValue]
+  })
+
+  function updateWatchers() {
+    const newPatterns = normalizedPatterns.value
+    for (const [pattern, watcher] of watchers) {
+      if (!newPatterns.includes(pattern)) {
+        watcher.dispose()
+        watchers.delete(pattern)
+      }
+    }
+    for (const pattern of newPatterns) {
+      if (!watchers.has(pattern)) {
+        const w = workspace.createFileSystemWatcher(
+          pattern,
+          toValue(ignoreCreateEvents) || false,
+          toValue(ignoreChangeEvents) || false,
+          toValue(ignoreDeleteEvents) || false,
+        )
+        w.onDidCreate(createEmitter.fire)
+        w.onDidChange(changeEmitter.fire)
+        w.onDidDelete(deleteEmitter.fire)
+        watchers.set(pattern, w)
+      }
+    }
+  }
+
+  function clearWatchers() {
+    for (const watcher of watchers.values()) {
+      watcher.dispose()
+    }
+    watchers.clear()
+  }
+
+  watch(normalizedPatterns, updateWatchers)
+  watch(
+    () => [
+      toValue(ignoreCreateEvents),
+      toValue(ignoreChangeEvents),
+      toValue(ignoreDeleteEvents),
+    ],
+    () => {
+      clearWatchers()
+      updateWatchers()
+    },
+  )
+  onScopeDispose(clearWatchers)
+
+  return {
+    watchers,
+    onDidCreate: createEmitter.event,
+    onDidChange: changeEmitter.event,
+    onDidDelete: deleteEmitter.event,
+  }
+}