Clean up one of scope handler

Author: AndreasArvidsson

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

@@ -48,13 +48,6 @@ export class CollectionItemScopeHandler extends BaseScopeHandler {
 
       return OneOfScopeHandler.createFromScopeHandlers(
         scopeHandlerFactory,
-        {
-          type: "oneOf",
-          scopeTypes: [
-            languageScopeHandler.scopeType,
-            textualScopeHandler.scopeType,
-          ],
-        },
         [languageScopeHandler, textualScopeHandler],
         languageId,
       );

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

@@ -46,13 +46,6 @@ export class NotebookCellScopeHandler extends BaseScopeHandler {
 
       return OneOfScopeHandler.createFromScopeHandlers(
         scopeHandlerFactory,
-        {
-          type: "oneOf",
-          scopeTypes: [
-            languageScopeHandler.scopeType,
-            apiScopeHandler.scopeType,
-          ],
-        },
         [languageScopeHandler, apiScopeHandler],
         languageId,
       );

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

@@ -17,6 +17,7 @@ import type {
 
 export class OneOfScopeHandler extends BaseScopeHandler {
   protected isHierarchical = true;
+  public scopeType = undefined;
   private iterationScopeHandler: OneOfScopeHandler | undefined;
   private lastYieldedIndex: number | undefined;
 
@@ -31,21 +32,18 @@ export class OneOfScopeHandler extends BaseScopeHandler {
 
     return this.createFromScopeHandlers(
       scopeHandlerFactory,
-      scopeType,
       scopeHandlers,
       languageId,
     );
   }
 
   static createFromScopeHandlers(
     scopeHandlerFactory: ScopeHandlerFactory,
-    scopeType: OneOfScopeType,
     scopeHandlers: ScopeHandler[],
     languageId: string,
   ): ScopeHandler {
     const getIterationScopeHandler = () =>
       new OneOfScopeHandler(
-        undefined,
         scopeHandlers.map((scopeHandler) =>
           scopeHandlerFactory.create(
             scopeHandler.iterationScopeType,
@@ -57,11 +55,14 @@ export class OneOfScopeHandler extends BaseScopeHandler {
         },
       );
 
-    return new OneOfScopeHandler(
-      scopeType,
-      scopeHandlers,
-      getIterationScopeHandler,
-    );
+    return new OneOfScopeHandler(scopeHandlers, getIterationScopeHandler);
+  }
+
+  private constructor(
+    private scopeHandlers: ScopeHandler[],
+    private getIterationScopeHandler: () => OneOfScopeHandler,
+  ) {
+    super();
   }
 
   get iterationScopeType(): CustomScopeType {
@@ -74,14 +75,6 @@ export class OneOfScopeHandler extends BaseScopeHandler {
     };
   }
 
-  private constructor(
-    public readonly scopeType: OneOfScopeType | undefined,
-    private scopeHandlers: ScopeHandler[],
-    private getIterationScopeHandler: () => OneOfScopeHandler,
-  ) {
-    super();
-  }
-
   *generateScopeCandidates(
     editor: TextEditor,
     position: Position,