Use interior target in document target

cursorless-dev · Jan 29, 2025 · 74ed506 · 74ed506
1 parent 3266cc7
commit 74ed506
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/packages/cursorless-engine/src/processTargets/targets/BaseTarget.ts b/packages/cursorless-engine/src/processTargets/targets/BaseTarget.ts
@@ -69,6 +69,7 @@ export abstract class BaseTarget<
   get editor() {
     return this.state.editor;
   }
+
   get isReversed() {
     return this.state.isReversed;
   }
@@ -114,6 +115,7 @@ export abstract class BaseTarget<
   getInterior(): Target[] | undefined {
     return undefined;
   }
+
   getBoundary(): Target[] | undefined {
     return undefined;
   }

diff --git a/packages/cursorless-engine/src/processTargets/targets/DocumentTarget.ts b/packages/cursorless-engine/src/processTargets/targets/DocumentTarget.ts
@@ -1,8 +1,6 @@
 import type { Range } from "@cursorless/common";
-import { shrinkRangeToFitContent } from "../../util/selectionUtils";
-import type { CommonTargetParameters } from "./BaseTarget";
-import { BaseTarget } from "./BaseTarget";
-import { PlainTarget } from "./PlainTarget";
+import { BaseTarget, type CommonTargetParameters } from "./BaseTarget";
+import { InteriorTarget } from "./InteriorTarget";
 
 export class DocumentTarget extends BaseTarget<CommonTargetParameters> {
   type = "DocumentTarget";
@@ -13,27 +11,28 @@ export class DocumentTarget extends BaseTarget<CommonTargetParameters> {
     super(parameters);
   }
 
-  getLeadingDelimiterTarget() {
-    return undefined;
-  }
-  getTrailingDelimiterTarget() {
-    return undefined;
-  }
-  getRemovalRange(): Range {
-    return this.contentRange;
-  }
-
   getInterior() {
     return [
-      // Use plain target instead of interior target since we want the same content and removal range for a document interior.
-      new PlainTarget({
+      new InteriorTarget({
         editor: this.editor,
         isReversed: this.isReversed,
-        contentRange: shrinkRangeToFitContent(this.editor, this.contentRange),
+        fullInteriorRange: this.contentRange,
       }),
     ];
   }
 
+  getRemovalRange(): Range {
+    return this.contentRange;
+  }
+
+  getLeadingDelimiterTarget() {
+    return undefined;
+  }
+
+  getTrailingDelimiterTarget() {
+    return undefined;
+  }
+
   protected getCloneParameters() {
     return this.state;
   }