More simplification

Author: pokey

packages/common/src/index.ts

@@ -11,7 +11,7 @@ export { getKey, splitKey } from "./util/splitKey";
 export { hrtimeBigintToSeconds } from "./util/timeUtils";
 export * from "./util/walkSync";
 export * from "./util/walkAsync";
-export * from "./util/Disposer";
+export * from "./util/disposableFrom";
 export * from "./util/camelCaseToAllDown";
 export { Notifier } from "./util/Notifier";
 export type { Listener } from "./util/Notifier";

packages/common/src/util/Disposer.ts

@@ -1,6 +1,6 @@
 import {
   CommandComplete,
-  Disposer,
+  Disposable,
   Listener,
   ScopeType,
 } from "@cursorless/common";
@@ -19,19 +19,19 @@ export class CustomSpokenFormGeneratorImpl
 {
   private customSpokenForms: CustomSpokenForms;
   private spokenFormGenerator: SpokenFormGenerator;
-  private disposer = new Disposer();
+  private disposable: Disposable;
 
   constructor(talonSpokenForms: TalonSpokenForms) {
     this.customSpokenForms = new CustomSpokenForms(talonSpokenForms);
     this.spokenFormGenerator = new SpokenFormGenerator(
       this.customSpokenForms.spokenFormMap,
     );
-    this.disposer.push(
-      this.customSpokenForms.onDidChangeCustomSpokenForms(() => {
+    this.disposable = this.customSpokenForms.onDidChangeCustomSpokenForms(
+      () => {
         this.spokenFormGenerator = new SpokenFormGenerator(
           this.customSpokenForms.spokenFormMap,
         );
-      }),
+      },
     );
   }
 
@@ -56,6 +56,6 @@ export class CustomSpokenFormGeneratorImpl
   }
 
   dispose() {
-    this.disposer.dispose();
+    this.disposable.dispose();
   }
 }

packages/cursorless-engine/src/generateSpokenForm/CustomSpokenFormGeneratorImpl.ts

@@ -1,4 +1,4 @@
-import { Disposer, FileSystem, Notifier } from "@cursorless/common";
+import { Disposable, FileSystem, Notifier } from "@cursorless/common";
 import { readFile } from "fs/promises";
 
 import * as path from "path";
@@ -16,15 +16,13 @@ interface TalonSpokenFormsPayload {
 const LATEST_SPOKEN_FORMS_JSON_VERSION = 0;
 
 export class TalonSpokenFormsJsonReader implements TalonSpokenForms {
-  private disposer = new Disposer();
+  private disposable: Disposable;
   private notifier = new Notifier();
 
   constructor(private fileSystem: FileSystem) {
-    this.disposer.push(
-      this.fileSystem.watchDir(
-        path.dirname(this.fileSystem.cursorlessTalonStateJsonPath),
-        () => this.notifier.notifyListeners(),
-      ),
+    this.disposable = this.fileSystem.watchDir(
+      path.dirname(this.fileSystem.cursorlessTalonStateJsonPath),
+      () => this.notifier.notifyListeners(),
     );
   }
 
@@ -62,7 +60,7 @@ export class TalonSpokenFormsJsonReader implements TalonSpokenForms {
   }
 
   dispose() {
-    this.disposer.dispose();
+    this.disposable.dispose();
   }
 }
 

packages/cursorless-engine/src/nodeCommon/TalonSpokenFormsJsonReader.ts

@@ -1,13 +1,13 @@
 import {
   CustomRegexScopeType,
-  Disposer,
+  Disposable,
   Notifier,
   showError,
 } from "@cursorless/common";
 import { isEqual } from "lodash";
 import {
-  SUPPORTED_ENTRY_TYPES,
   NeedsInitialTalonUpdateError,
+  SUPPORTED_ENTRY_TYPES,
   SpokenFormEntry,
   TalonSpokenForms,
 } from "../scopeProviders/TalonSpokenForms";
@@ -31,7 +31,7 @@ type Writable<T> = {
  * forms for a subset of all customizable spoken forms.
  */
 export class CustomSpokenForms {
-  private disposer = new Disposer();
+  private disposable: Disposable;
   private notifier = new Notifier();
 
   private spokenFormMap_: Writable<SpokenFormMap> = { ...defaultSpokenFormMap };
@@ -61,8 +61,8 @@ export class CustomSpokenForms {
   }
 
   constructor(private talonSpokenForms: TalonSpokenForms) {
-    this.disposer.push(
-      talonSpokenForms.onDidChange(() => this.updateSpokenFormMaps()),
+    this.disposable = talonSpokenForms.onDidChange(() =>
+      this.updateSpokenFormMaps(),
     );
 
     this.updateSpokenFormMaps();
@@ -129,7 +129,7 @@ export class CustomSpokenForms {
   }
 
   dispose() {
-    this.disposer.dispose();
+    this.disposable.dispose();
   }
 }