Don't dispose of individual subscriptions

cursorless-dev · Oct 16, 2023 · c2a01d8 · c2a01d8
1 parent 03165ad
commit c2a01d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/packages/cursorless-vscode/src/ide/vscode/VscodeFileSystem.ts b/packages/cursorless-vscode/src/ide/vscode/VscodeFileSystem.ts
@@ -1,5 +1,4 @@
 import { Disposable, FileSystem, PathChangeListener } from "@cursorless/common";
-import * as vscode from "vscode";
 import { RelativePattern, workspace } from "vscode";
 
 export class VscodeFileSystem implements FileSystem {
@@ -9,11 +8,10 @@ export class VscodeFileSystem implements FileSystem {
       new RelativePattern(path, "**"),
     );
 
-    return vscode.Disposable.from(
-      watcher,
-      watcher.onDidChange(onDidChange),
-      watcher.onDidCreate(onDidChange),
-      watcher.onDidDelete(onDidChange),
-    );
+    watcher.onDidChange(onDidChange);
+    watcher.onDidCreate(onDidChange);
+    watcher.onDidDelete(onDidChange);
+
+    return watcher;
   }
 }
diff --git a/packages/cursorless-vscode/src/ide/vscode/hats/VscodeHatRenderer.ts b/packages/cursorless-vscode/src/ide/vscode/hats/VscodeHatRenderer.ts
@@ -414,10 +414,9 @@ function watchDir(
     new vscode.RelativePattern(path, `**/*${CURSORLESS_HAT_SHAPES_SUFFIX}`),
   );
 
-  return vscode.Disposable.from(
-    hatsDirWatcher,
-    hatsDirWatcher.onDidChange(onDidChange),
-    hatsDirWatcher.onDidCreate(onDidChange),
-    hatsDirWatcher.onDidDelete(onDidChange),
-  );
+  hatsDirWatcher.onDidChange(onDidChange);
+  hatsDirWatcher.onDidCreate(onDidChange);
+  hatsDirWatcher.onDidDelete(onDidChange);
+
+  return hatsDirWatcher;
 }