Add interior scope to visualize sidebar

Author: AndreasArvidsson

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

@@ -215,9 +215,8 @@ const simpleScopeTypeTypesSet = new Set(simpleScopeTypeTypes);
 
 export type SimpleScopeTypeType = (typeof simpleScopeTypeTypes)[number];
 
-export const pseudoScopes = new Set<SimpleScopeTypeType>([
+export const pseudoScopeTypes = new Set<SimpleScopeTypeType>([
   "instance",
-  "interior",
   "className",
   "functionName",
 ]);
@@ -229,7 +228,7 @@ export function isSimpleScopeType(
 }
 
 export function isPseudoScope(scopeType: ScopeType): boolean {
-  return isSimpleScopeType(scopeType) && pseudoScopes.has(scopeType.type);
+  return isSimpleScopeType(scopeType) && pseudoScopeTypes.has(scopeType.type);
 }
 
 export interface SimpleScopeType {

packages/lib-engine/src/languages/TreeSitterQuery/captureNames.ts

@@ -1,10 +1,8 @@
-import { pseudoScopes, simpleScopeTypeTypes } from "@cursorless/lib-common";
+import { pseudoScopeTypes, simpleScopeTypeTypes } from "@cursorless/lib-common";
 
-const scopeCaptureNames = [
-  ...simpleScopeTypeTypes.filter((s) => !pseudoScopes.has(s)),
-  // Interior is a pseudo scope, but it's implemented with an actual internal scope
-  "interior",
-] as const;
+const scopeCaptureNames = simpleScopeTypeTypes.filter(
+  (s) => !pseudoScopeTypes.has(s),
+);
 
 export type ScopeCaptureName = (typeof scopeCaptureNames)[number];
 

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

@@ -1,23 +1,15 @@
-import type {
-  Direction,
-  Position,
-  ScopeType,
-  TextEditor,
-} from "@cursorless/lib-common";
-import { NoContainingScopeError } from "@cursorless/lib-common";
+import type { Direction, Position, TextEditor } from "@cursorless/lib-common";
 import type { LanguageDefinitions } from "../../../../languages/LanguageDefinitions";
 import type { Target } from "../../../../typings/target.types";
 import { InteriorTarget } from "../../../targets";
 import { BaseScopeHandler } from "../BaseScopeHandler";
 import type { TargetScope } from "../scope.types";
-import type {
-  ComplexScopeType,
-  ScopeIteratorRequirements,
-} from "../scopeHandler.types";
+import type { ScopeIteratorRequirements } from "../scopeHandler.types";
 import type { TreeSitterScopeHandler } from "../TreeSitterScopeHandler";
 
 export class InteriorScopeHandler extends BaseScopeHandler {
   public readonly scopeType = { type: "interior" } as const;
+  public readonly iterationScopeType = { type: "document" } as const;
   protected isHierarchical = true;
 
   static maybeCreate(
@@ -39,12 +31,6 @@ export class InteriorScopeHandler extends BaseScopeHandler {
     super();
   }
 
-  get iterationScopeType(): ScopeType | ComplexScopeType {
-    throw new NoContainingScopeError(
-      "Iteration scope for InteriorScopeHandler",
-    );
-  }
-
   *generateScopeCandidates(
     editor: TextEditor,
     position: Position,