More cleanup

Author: AndreasArvidsson

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

@@ -24,23 +24,11 @@ export class FallbackScopeHandler extends BaseScopeHandler {
     );
   }
 
-  static create(
-    scopeHandlerFactory: ScopeHandlerFactory,
-    scopeType: FallbackScopeType,
-    languageId: string,
-  ): ScopeHandler {
-    const scopeHandlers: ScopeHandler[] = scopeType.scopeTypes.map(
-      (scopeType) => scopeHandlerFactory.create(scopeType, languageId),
-    );
-
-    return this.createFromScopeHandlers(scopeHandlers);
-  }
-
-  static createFromScopeHandlers(scopeHandlers: ScopeHandler[]): ScopeHandler {
-    return new FallbackScopeHandler(scopeHandlers);
-  }
-
-  private constructor(private scopeHandlers: ScopeHandler[]) {
+  constructor(
+    public scopeHandlerFactory: ScopeHandlerFactory,
+    private fallbackScopeType: FallbackScopeType,
+    private languageId: string,
+  ) {
     super();
   }
 
@@ -50,7 +38,12 @@ export class FallbackScopeHandler extends BaseScopeHandler {
     direction: Direction,
     hints: ScopeIteratorRequirements,
   ): Iterable<TargetScope> {
-    for (const scopeHandler of this.scopeHandlers) {
+    const scopeHandlers: ScopeHandler[] = this.fallbackScopeType.scopeTypes.map(
+      (scopeType) =>
+        this.scopeHandlerFactory.create(scopeType, this.languageId),
+    );
+
+    for (const scopeHandler of scopeHandlers) {
       yield* scopeHandler.generateScopes(editor, position, direction, hints);
     }
   }

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

@@ -132,7 +132,7 @@ export class ScopeHandlerFactoryImpl implements ScopeHandlerFactory {
       case "oneOf":
         return OneOfScopeHandler.create(this, scopeType, languageId);
       case "fallback":
-        return FallbackScopeHandler.create(this, scopeType, languageId);
+        return new FallbackScopeHandler(this, scopeType, languageId);
       case "conditional":
         return new ConditionalScopeHandler(this, scopeType, languageId);
       case "instance":

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

@@ -1,4 +1,5 @@
 import {
+  NoContainingScopeError,
   Range,
   type Direction,
   type InteriorScopeType,
@@ -8,7 +9,6 @@ import {
 } from "@cursorless/common";
 import type { LanguageDefinitions } from "../../../../languages/LanguageDefinitions";
 import { BaseScopeHandler } from "../BaseScopeHandler";
-import { FallbackScopeHandler } from "../FallbackScopeHandler";
 import { OneOfScopeHandler } from "../OneOfScopeHandler";
 import type { TargetScope } from "../scope.types";
 import type {
@@ -20,10 +20,10 @@ import type { ScopeHandlerFactory } from "../ScopeHandlerFactory";
 
 export class InteriorScopeHandler extends BaseScopeHandler {
   protected isHierarchical = true;
-  private scopeHandler: ScopeHandler;
+  private scopeHandler: ScopeHandler | undefined;
 
   get iterationScopeType(): ScopeType | ComplexScopeType {
-    return this.scopeHandler.iterationScopeType;
+    throw new NoContainingScopeError("Iteration scope for interior");
   }
 
   constructor(
@@ -45,7 +45,7 @@ export class InteriorScopeHandler extends BaseScopeHandler {
       // yield the interior of the `<div>` pair.
       if (scopeType.explicitScopeType) {
         if (languageScopeHandler == null) {
-          return FallbackScopeHandler.createFromScopeHandlers([]);
+          return undefined;
         }
         return languageScopeHandler;
       }
@@ -84,6 +84,10 @@ export class InteriorScopeHandler extends BaseScopeHandler {
     direction: Direction,
     hints: ScopeIteratorRequirements,
   ): Iterable<TargetScope> {
+    if (this.scopeHandler == null) {
+      return;
+    }
+
     const scopes = this.scopeHandler.generateScopes(
       editor,
       position,