Fixes

Author: AndreasArvidsson

packages/common/src/types/command/PartialTargetDescriptor.types.ts

@@ -155,6 +155,7 @@ export const simpleScopeTypeTypes = [
   "ifStatement",
   "instance",
   "interior",
+  "interiorTreeOnly",
   "list",
   "map",
   "name",

packages/cursorless-engine/src/processTargets/modifiers/InteriorStage.ts

@@ -22,7 +22,9 @@ export class InteriorOnlyStage implements ModifierStage {
 
     const containingInteriorStage = this.modifierStageFactory.create({
       type: "containingScope",
-      scopeType: { type: "interior" },
+      scopeType: {
+        type: target.hasExplicitScopeType ? "interiorTreeOnly" : "interior",
+      },
     });
 
     return containingInteriorStage.run(target);

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

@@ -121,6 +121,7 @@ export class ScopeHandlerFactoryImpl implements ScopeHandlerFactory {
           languageId,
         );
       case "interior":
+      case "interiorTreeOnly":
         return new InteriorScopeHandler(
           this,
           this.languageDefinitions,

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

@@ -1,9 +1,10 @@
-import type {
-  Direction,
-  Position,
-  ScopeType,
-  SimpleScopeType,
-  TextEditor,
+import {
+  NoContainingScopeError,
+  type Direction,
+  type Position,
+  type ScopeType,
+  type SimpleScopeType,
+  type TextEditor,
 } from "@cursorless/common";
 import type { LanguageDefinitions } from "../../../../languages/LanguageDefinitions";
 import { BaseScopeHandler } from "../BaseScopeHandler";
@@ -28,12 +29,23 @@ export class InteriorScopeHandler extends BaseScopeHandler {
   constructor(
     scopeHandlerFactory: ScopeHandlerFactory,
     languageDefinitions: LanguageDefinitions,
-    _scopeType: SimpleScopeType,
+    scopeType: SimpleScopeType,
     languageId: string,
   ) {
     super();
 
     this.scopeHandler = (() => {
+      const languageScopeHandler = languageDefinitions
+        .get(languageId)
+        ?.getScopeHandler(this.scopeType);
+
+      if (scopeType.type === "interiorTreeOnly") {
+        if (languageScopeHandler == null) {
+          throw new NoContainingScopeError(this.scopeType.type);
+        }
+        return languageScopeHandler;
+      }
+
       const pairInteriorScopeHandler = scopeHandlerFactory.create(
         {
           type: "surroundingPairInterior",
@@ -43,10 +55,6 @@ export class InteriorScopeHandler extends BaseScopeHandler {
         languageId,
       );
 
-      const languageScopeHandler = languageDefinitions
-        .get(languageId)
-        ?.getScopeHandler(this.scopeType);
-
       if (languageScopeHandler == null) {
         return pairInteriorScopeHandler;
       }

packages/cursorless-engine/src/scopeProviders/ScopeInfoProvider.ts

@@ -127,6 +127,7 @@ function isLanguageSpecific(scopeType: ScopeType): boolean {
     case "ifStatement":
     case "instance":
     case "interior":
+    case "interiorTreeOnly":
     case "list":
     case "map":
     case "name":

packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts

@@ -105,6 +105,7 @@ export const defaultSpokenFormMapCore: DefaultSpokenFormMapDefinition = {
     disqualifyDelimiter: isPrivate("disqualify delimiter"),
     pairDelimiter: isPrivate("pair delimiter"),
     interior: isPrivate("inside"),
+    interiorTreeOnly: isPrivate("inside tree only"),
     ["private.fieldAccess"]: isPrivate("access"),
     ["private.switchStatementSubject"]: isPrivate("subject"),
   },