Rename

cursorless-dev · Nov 20, 2024 · 5a8d208 · 5a8d208
1 parent ed7591e
commit 5a8d208
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 39 deletions.
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/ContainingScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/ContainingScopeStage.ts
@@ -34,7 +34,7 @@ export class ContainingScopeStage implements ModifierStage {
   run(target: Target): Target[] {
     const { scopeType, ancestorIndex = 0 } = this.modifier;
 
-    const scopeHandler = this.scopeHandlerFactory.create(
+    const scopeHandler = this.scopeHandlerFactory.tryCreate(
       scopeType,
       target.editor.document.languageId,
     );

diff --git a/packages/cursorless-engine/src/processTargets/modifiers/EveryScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/EveryScopeStage.ts
@@ -39,7 +39,7 @@ export class EveryScopeStage implements ModifierStage {
     const { scopeType } = this.modifier;
     const { editor, isReversed } = target;
 
-    const scopeHandler = this.scopeHandlerFactory.create(
+    const scopeHandler = this.scopeHandlerFactory.tryCreate(
       scopeType,
       editor.document.languageId,
     );
@@ -108,7 +108,7 @@ export class EveryScopeStage implements ModifierStage {
     scopeHandlerFactory: ScopeHandlerFactory,
     target: Target,
   ): Range[] {
-    const iterationScopeHandler = scopeHandlerFactory.create(
+    const iterationScopeHandler = scopeHandlerFactory.tryCreate(
       scopeHandler.iterationScopeType,
       target.editor.document.languageId,
     );

diff --git a/packages/cursorless-engine/src/processTargets/modifiers/PreferredScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/PreferredScopeStage.ts
@@ -41,7 +41,7 @@ export class PreferredScopeStage implements ModifierStage {
       }
     }
 
-    const scopeHandler = this.scopeHandlerFactory.createWithAssert(
+    const scopeHandler = this.scopeHandlerFactory.create(
       this.modifier.scopeType,
       target.editor.document.languageId,
     );

diff --git a/packages/cursorless-engine/src/processTargets/modifiers/RelativeScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/RelativeScopeStage.ts
@@ -31,7 +31,7 @@ export class RelativeScopeStage implements ModifierStage {
   ) {}
 
   run(target: Target): Target[] {
-    const scopeHandler = this.scopeHandlerFactory.create(
+    const scopeHandler = this.scopeHandlerFactory.tryCreate(
       this.modifier.scopeType,
       target.editor.document.languageId,
     );

diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/BoundedScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/BoundedScopeHandler.ts
@@ -32,18 +32,17 @@ abstract class BoundedBaseScopeHandler extends BaseScopeHandler {
   ) {
     super();
 
-    this.targetScopeHandler = this.scopeHandlerFactory.createWithAssert(
+    this.targetScopeHandler = this.scopeHandlerFactory.create(
       this.targetScopeType,
       this.languageId,
     );
-    this.surroundingPairInteriorScopeHandler =
-      this.scopeHandlerFactory.createWithAssert(
-        {
-          type: "surroundingPairInterior",
-          delimiter: "any",
-        },
-        this.languageId,
-      );
+    this.surroundingPairInteriorScopeHandler = this.scopeHandlerFactory.create(
+      {
+        type: "surroundingPairInterior",
+        delimiter: "any",
+      },
+      this.languageId,
+    );
   }
 
   get iterationScopeType(): ScopeType {

diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NestedScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NestedScopeHandler.ts
@@ -60,7 +60,7 @@ export abstract class NestedScopeHandler extends BaseScopeHandler {
 
   private get searchScopeHandler(): ScopeHandler {
     if (this._searchScopeHandler == null) {
-      this._searchScopeHandler = this.scopeHandlerFactory.createWithAssert(
+      this._searchScopeHandler = this.scopeHandlerFactory.create(
         this.searchScopeType,
         this.languageId,
       );

diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/OneOfScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/OneOfScopeHandler.ts
@@ -24,16 +24,15 @@ export class OneOfScopeHandler extends BaseScopeHandler {
     languageId: string,
   ): ScopeHandler {
     const scopeHandlers: ScopeHandler[] = scopeType.scopeTypes.map(
-      (scopeType) =>
-        scopeHandlerFactory.createWithAssert(scopeType, languageId),
+      (scopeType) => scopeHandlerFactory.create(scopeType, languageId),
     );
 
     const iterationScopeType = (): CustomScopeType => ({
       type: "custom",
       scopeHandler: new OneOfScopeHandler(
         undefined,
         scopeHandlers.map((scopeHandler) =>
-          scopeHandlerFactory.createWithAssert(
+          scopeHandlerFactory.create(
             scopeHandler.iterationScopeType,
             languageId,
           ),

diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ScopeHandlerFactory.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ScopeHandlerFactory.ts
@@ -2,12 +2,12 @@ import type { ScopeType } from "@cursorless/common";
 import type { CustomScopeType, ScopeHandler } from "./scopeHandler.types";
 
 export interface ScopeHandlerFactory {
-  create(
+  tryCreate(
     scopeType: ScopeType | CustomScopeType,
     languageId: string,
   ): ScopeHandler | undefined;
 
-  createWithAssert(
+  create(
     scopeType: ScopeType | CustomScopeType,
     languageId: string,
   ): ScopeHandler;

diff --git a/...s/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ScopeHandlerFactoryImpl.ts b/...s/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ScopeHandlerFactoryImpl.ts
@@ -45,10 +45,10 @@ import type { CustomScopeType, ScopeHandler } from "./scopeHandler.types";
  */
 export class ScopeHandlerFactoryImpl implements ScopeHandlerFactory {
   constructor(private languageDefinitions: LanguageDefinitions) {
-    this.create = this.create.bind(this);
+    this.tryCreate = this.tryCreate.bind(this);
   }
 
-  create(
+  tryCreate(
     scopeType: ScopeType | CustomScopeType,
     languageId: string,
   ): ScopeHandler | undefined {
@@ -115,11 +115,11 @@ export class ScopeHandlerFactoryImpl implements ScopeHandlerFactory {
     }
   }
 
-  createWithAssert(
+  create(
     scopeType: ScopeType | CustomScopeType,
     languageId: string,
   ): ScopeHandler {
-    const handler = this.create(scopeType, languageId);
+    const handler = this.tryCreate(scopeType, languageId);
     if (handler == null) {
       throw new Error(`Couldn't create scope handler for '${scopeType.type}'`);
     }

diff --git a/...odifiers/scopeHandlers/SurroundingPairScopeHandler/SurroundingPairInteriorScopeHandler.ts b/...odifiers/scopeHandlers/SurroundingPairScopeHandler/SurroundingPairInteriorScopeHandler.ts
@@ -17,15 +17,14 @@ export class SurroundingPairInteriorScopeHandler extends BaseScopeHandler {
   ) {
     super();
 
-    this.surroundingPairScopeHandler =
-      this.scopeHandlerFactory.createWithAssert(
-        {
-          type: "surroundingPair",
-          delimiter: this.scopeType.delimiter,
-          requireStrongContainment: true,
-        },
-        this.languageId,
-      );
+    this.surroundingPairScopeHandler = this.scopeHandlerFactory.create(
+      {
+        type: "surroundingPair",
+        delimiter: this.scopeType.delimiter,
+        requireStrongContainment: true,
+      },
+      this.languageId,
+    );
   }
 
   get iterationScopeType() {

diff --git a/packages/cursorless-engine/src/scopeProviders/ScopeRangeProvider.ts b/packages/cursorless-engine/src/scopeProviders/ScopeRangeProvider.ts
@@ -29,7 +29,7 @@ export class ScopeRangeProvider {
     editor: TextEditor,
     { scopeType, visibleOnly }: ScopeRangeConfig,
   ): ScopeRanges[] {
-    const scopeHandler = this.scopeHandlerFactory.create(
+    const scopeHandler = this.scopeHandlerFactory.tryCreate(
       scopeType,
       editor.document.languageId,
     );
@@ -50,13 +50,16 @@ export class ScopeRangeProvider {
     { scopeType, visibleOnly, includeNestedTargets }: IterationScopeRangeConfig,
   ): IterationScopeRanges[] {
     const { languageId } = editor.document;
-    const scopeHandler = this.scopeHandlerFactory.create(scopeType, languageId);
+    const scopeHandler = this.scopeHandlerFactory.tryCreate(
+      scopeType,
+      languageId,
+    );
 
     if (scopeHandler == null) {
       return [];
     }
 
-    const iterationScopeHandler = this.scopeHandlerFactory.create(
+    const iterationScopeHandler = this.scopeHandlerFactory.tryCreate(
       scopeHandler.iterationScopeType,
       languageId,
     );

diff --git a/packages/cursorless-engine/src/scopeProviders/ScopeSupportChecker.ts b/packages/cursorless-engine/src/scopeProviders/ScopeSupportChecker.ts
@@ -29,7 +29,10 @@ export class ScopeSupportChecker {
    */
   getScopeSupport(editor: TextEditor, scopeType: ScopeType): ScopeSupport {
     const { languageId } = editor.document;
-    const scopeHandler = this.scopeHandlerFactory.create(scopeType, languageId);
+    const scopeHandler = this.scopeHandlerFactory.tryCreate(
+      scopeType,
+      languageId,
+    );
 
     if (scopeHandler == null) {
       return getLegacyScopeSupport(languageId, scopeType);
@@ -53,13 +56,16 @@ export class ScopeSupportChecker {
     scopeType: ScopeType,
   ): ScopeSupport {
     const { languageId } = editor.document;
-    const scopeHandler = this.scopeHandlerFactory.create(scopeType, languageId);
+    const scopeHandler = this.scopeHandlerFactory.tryCreate(
+      scopeType,
+      languageId,
+    );
 
     if (scopeHandler == null) {
       return getLegacyScopeSupport(languageId, scopeType);
     }
 
-    const iterationScopeHandler = this.scopeHandlerFactory.create(
+    const iterationScopeHandler = this.scopeHandlerFactory.tryCreate(
       scopeHandler.iterationScopeType,
       languageId,
     );