remove token and grapheme splitter singleton

Author: AndreasArvidsson

packages/cursorless-engine/src/core/HatAllocator.ts

@@ -1,5 +1,5 @@
 import type { Disposable, Hats, IDE, TokenHat } from "@cursorless/common";
-import tokenGraphemeSplitter from "../singletons/tokenGraphemeSplitter.singleton";
+import type { TokenGraphemeSplitter } from "../tokenGraphemeSplitter";
 import { allocateHats } from "../util/allocateHats";
 import type { IndividualHatMap } from "./IndividualHatMap";
 import { DecorationDebouncer } from "../util/DecorationDebouncer";
@@ -13,6 +13,7 @@ export class HatAllocator {
 
   constructor(
     private ide: IDE,
+    private tokenGraphemeSplitter: TokenGraphemeSplitter,
     private hats: Hats,
     private context: Context,
   ) {
@@ -42,7 +43,7 @@ export class HatAllocator {
       ide.onDidChangeTextEditorVisibleRanges(debouncer.run),
       // Re-draw hats on grapheme splitting algorithm change in case they
       // changed their token hat splitting setting.
-      tokenGraphemeSplitter(ide).registerAlgorithmChangeListener(debouncer.run),
+      tokenGraphemeSplitter.registerAlgorithmChangeListener(debouncer.run),
 
       debouncer,
     );
@@ -60,15 +61,13 @@ export class HatAllocator {
     // Forced graphemes won't have been normalized
     forceTokenHats = forceTokenHats?.map((tokenHat) => ({
       ...tokenHat,
-      grapheme: tokenGraphemeSplitter(this.ide).normalizeGrapheme(
-        tokenHat.grapheme,
-      ),
+      grapheme: this.tokenGraphemeSplitter.normalizeGrapheme(tokenHat.grapheme),
     }));
 
     const tokenHats = this.hats.isEnabled
       ? allocateHats({
           ide: this.ide,
-          tokenGraphemeSplitter: tokenGraphemeSplitter(this.ide),
+          tokenGraphemeSplitter: this.tokenGraphemeSplitter,
           enabledHatStyles: this.hats.enabledHatStyles,
           forceTokenHats,
           oldTokenHats: activeMap.tokenHats,

packages/cursorless-engine/src/core/HatTokenMapImpl.ts

@@ -6,6 +6,7 @@ import type {
   ReadOnlyHatMap,
   TokenHat,
 } from "@cursorless/common";
+import type { TokenGraphemeSplitter } from "../tokenGraphemeSplitter";
 import type { Debug } from "./Debug";
 import { HatAllocator } from "./HatAllocator";
 import { IndividualHatMap } from "./IndividualHatMap";
@@ -39,20 +40,30 @@ export class HatTokenMapImpl implements HatTokenMap {
 
   constructor(
     private ide: IDE,
+    tokenGraphemeSplitter: TokenGraphemeSplitter,
     rangeUpdater: RangeUpdater,
     private debug: Debug,
     hats: Hats,
     private commandServerApi: CommandServerApi,
   ) {
     ide.disposeOnExit(this);
-    this.activeMap = new IndividualHatMap(ide, rangeUpdater);
+    this.activeMap = new IndividualHatMap(
+      ide,
+      tokenGraphemeSplitter,
+      rangeUpdater,
+    );
 
     this.getActiveMap = this.getActiveMap.bind(this);
     this.allocateHats = this.allocateHats.bind(this);
 
-    this.hatAllocator = new HatAllocator(ide, hats, {
-      getActiveMap: this.getActiveMap,
-    });
+    this.hatAllocator = new HatAllocator(
+      ide,
+      tokenGraphemeSplitter,
+      hats,
+      {
+        getActiveMap: this.getActiveMap,
+      },
+    );
   }
 
   /**

packages/cursorless-engine/src/core/IndividualHatMap.ts

@@ -7,7 +7,7 @@ import type {
   TokenHat,
 } from "@cursorless/common";
 import { getKey } from "@cursorless/common";
-import tokenGraphemeSplitter from "../singletons/tokenGraphemeSplitter.singleton";
+import type { TokenGraphemeSplitter } from "../tokenGraphemeSplitter";
 import { getMatcher } from "../tokenizer";
 import type { FullRangeInfo } from "../typings/updateSelections";
 import type { RangeUpdater } from "./updateSelections/RangeUpdater";
@@ -35,6 +35,7 @@ export class IndividualHatMap implements ReadOnlyHatMap {
 
   constructor(
     private ide: IDE,
+    private tokenGraphemeSplitter: TokenGraphemeSplitter,
     private rangeUpdater: RangeUpdater,
   ) {}
 
@@ -54,7 +55,11 @@ export class IndividualHatMap implements ReadOnlyHatMap {
   }
 
   clone() {
-    const ret = new IndividualHatMap(this.ide, this.rangeUpdater);
+    const ret = new IndividualHatMap(
+      this.ide,
+      this.tokenGraphemeSplitter,
+      this.rangeUpdater,
+    );
 
     ret.setTokenHats(this._tokenHats);
 
@@ -119,10 +124,7 @@ export class IndividualHatMap implements ReadOnlyHatMap {
   getToken(hatStyle: HatStyleName, character: string): Token | undefined {
     this.checkExpired();
     return this.map[
-      getKey(
-        hatStyle,
-        tokenGraphemeSplitter(this.ide).normalizeGrapheme(character),
-      )
+      getKey(hatStyle, this.tokenGraphemeSplitter.normalizeGrapheme(character))
     ];
   }
 

packages/cursorless-engine/src/cursorlessEngine.ts

@@ -38,6 +38,7 @@ import { ScopeRangeProvider } from "./scopeProviders/ScopeRangeProvider";
 import { ScopeRangeWatcher } from "./scopeProviders/ScopeRangeWatcher";
 import { ScopeSupportChecker } from "./scopeProviders/ScopeSupportChecker";
 import { ScopeSupportWatcher } from "./scopeProviders/ScopeSupportWatcher";
+import { TokenGraphemeSplitter } from "./tokenGraphemeSplitter/tokenGraphemeSplitter";
 
 export interface EngineProps {
   ide: IDE;
@@ -62,6 +63,7 @@ export async function createCursorlessEngine({
 
   const debug = new Debug(injectedIde);
   const rangeUpdater = new RangeUpdater(injectedIde);
+  const tokenGraphemeSplitter = new TokenGraphemeSplitter(injectedIde);
 
   const storedTargets = new StoredTargetMap();
   const keyboardTargetUpdater = new KeyboardTargetUpdater(
@@ -77,6 +79,7 @@ export async function createCursorlessEngine({
     hats != null
       ? new HatTokenMapImpl(
           injectedIde,
+          tokenGraphemeSplitter,
           rangeUpdater,
           debug,
           hats,
@@ -95,6 +98,7 @@ export async function createCursorlessEngine({
 
   injectedIde.disposeOnExit(
     rangeUpdater,
+    tokenGraphemeSplitter,
     languageDefinitions,
     hatTokenMap,
     debug,