Rename OneOfScopeHandler to PreferredScopeHandler

Author: AndreasArvidsson

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/CollectionItemScopeHandler.ts

@@ -6,7 +6,7 @@ import type {
 } from "@cursorless/common";
 import type { LanguageDefinitions } from "../../../../languages/LanguageDefinitions";
 import { BaseScopeHandler } from "../BaseScopeHandler";
-import { OneOfScopeHandler } from "../OneOfScopeHandler";
+import { PreferredScopeHandler } from "../PreferredScopeHandler";
 import type { TargetScope } from "../scope.types";
 import type {
   ComplexScopeType,
@@ -46,7 +46,7 @@ export class CollectionItemScopeHandler extends BaseScopeHandler {
         return textualScopeHandler;
       }
 
-      return OneOfScopeHandler.createFromScopeHandlers(
+      return PreferredScopeHandler.createFromScopeHandlers(
         scopeHandlerFactory,
         languageId,
         [languageScopeHandler, textualScopeHandler],

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NotebookCellScopeHandler.ts

@@ -7,7 +7,7 @@ import {
 import type { LanguageDefinitions } from "../../../languages/LanguageDefinitions";
 import { BaseScopeHandler } from "./BaseScopeHandler";
 import { NotebookCellApiScopeHandler } from "./NotebookCellApiScopeHandler";
-import { OneOfScopeHandler } from "./OneOfScopeHandler";
+import { PreferredScopeHandler } from "./PreferredScopeHandler";
 import type { TargetScope } from "./scope.types";
 import type {
   ComplexScopeType,
@@ -44,7 +44,7 @@ export class NotebookCellScopeHandler extends BaseScopeHandler {
         return apiScopeHandler;
       }
 
-      return OneOfScopeHandler.createFromScopeHandlers(
+      return PreferredScopeHandler.createFromScopeHandlers(
         scopeHandlerFactory,
         languageId,
         [languageScopeHandler, apiScopeHandler],

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/OneOfScopeHandler.ts renamed to packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/PreferredScopeHandler.ts

@@ -15,10 +15,10 @@ import type {
   ScopeIteratorRequirements,
 } from "./scopeHandler.types";
 
-export class OneOfScopeHandler extends BaseScopeHandler {
+export class PreferredScopeHandler extends BaseScopeHandler {
   protected isHierarchical = true;
   public scopeType = undefined;
-  private iterationScopeHandler: OneOfScopeHandler | undefined;
+  private iterationScopeHandler: PreferredScopeHandler | undefined;
   private lastYieldedIndex: number | undefined;
 
   static create(
@@ -43,7 +43,7 @@ export class OneOfScopeHandler extends BaseScopeHandler {
     scopeHandlers: ScopeHandler[],
   ): ScopeHandler {
     const getIterationScopeHandler = () =>
-      new OneOfScopeHandler(
+      new PreferredScopeHandler(
         scopeHandlers.map((scopeHandler) =>
           scopeHandlerFactory.create(
             scopeHandler.iterationScopeType,
@@ -55,12 +55,12 @@ export class OneOfScopeHandler extends BaseScopeHandler {
         },
       );
 
-    return new OneOfScopeHandler(scopeHandlers, getIterationScopeHandler);
+    return new PreferredScopeHandler(scopeHandlers, getIterationScopeHandler);
   }
 
   private constructor(
     private scopeHandlers: ScopeHandler[],
-    private getIterationScopeHandler: () => OneOfScopeHandler,
+    private getIterationScopeHandler: () => PreferredScopeHandler,
   ) {
     super();
   }

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ScopeHandlerFactoryImpl.ts

@@ -12,7 +12,7 @@ import { FallbackScopeHandler } from "./FallbackScopeHandler";
 import { IdentifierScopeHandler } from "./IdentifierScopeHandler";
 import { LineScopeHandler } from "./LineScopeHandler";
 import { NotebookCellScopeHandler } from "./NotebookCellScopeHandler";
-import { OneOfScopeHandler } from "./OneOfScopeHandler";
+import { PreferredScopeHandler } from "./PreferredScopeHandler";
 import { ParagraphScopeHandler } from "./ParagraphScopeHandler";
 import {
   CustomRegexScopeHandler,
@@ -130,7 +130,7 @@ export class ScopeHandlerFactoryImpl implements ScopeHandlerFactory {
       case "custom":
         return scopeType.scopeHandler;
       case "oneOf":
-        return OneOfScopeHandler.create(this, scopeType, languageId);
+        return PreferredScopeHandler.create(this, scopeType, languageId);
       case "fallback":
         return FallbackScopeHandler.create(this, scopeType, languageId);
       case "conditional":

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/InteriorScopeHandler.ts

@@ -12,7 +12,7 @@ import type { Target } from "../../../../typings/target.types";
 import { InteriorTarget } from "../../../targets";
 import { BaseScopeHandler } from "../BaseScopeHandler";
 import { FallbackScopeHandler } from "../FallbackScopeHandler";
-import { OneOfScopeHandler } from "../OneOfScopeHandler";
+import { PreferredScopeHandler } from "../PreferredScopeHandler";
 import type { TargetScope } from "../scope.types";
 import type {
   ComplexScopeType,
@@ -98,7 +98,7 @@ export class InteriorScopeHandler extends BaseScopeHandler {
       return pairScopeHandler;
     }
 
-    return OneOfScopeHandler.createFromScopeHandlers(
+    return PreferredScopeHandler.createFromScopeHandlers(
       this.scopeHandlerFactory,
       this.languageId,
       [languageScopeHandler, pairScopeHandler],

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/index.ts

@@ -6,7 +6,7 @@ export * from "./WordScopeHandler/WordScopeHandler";
 export * from "./TokenScopeHandler";
 export * from "./DocumentScopeHandler";
 export * from "./TreeSitterScopeHandler";
-export * from "./OneOfScopeHandler";
+export * from "./PreferredScopeHandler";
 export * from "./ParagraphScopeHandler";
 export * from "./SentenceScopeHandler/SentenceScopeHandler";
 export * from "./RegexScopeHandler";