Merge branch 'main' into interiorScope

Author: AndreasArvidsson

.github/workflows/test.yml

@@ -49,13 +49,13 @@ jobs:
       - run: pnpm --color test
         if: runner.os != 'Linux'
       - run: xvfb-run -a pnpm -F @cursorless/test-harness test:talonJs
-        if: runner.os == 'Linux' && matrix.vscode_version == 'stable'
+        if: runner.os == 'Linux' && matrix.app_version == 'stable'
       - run: pnpm -F @cursorless/test-harness test:talonJs
-        if: runner.os != 'Linux' && matrix.vscode_version == 'stable'
+        if: runner.os != 'Linux' && matrix.app_version == 'stable'
       - run: xvfb-run -a pnpm -F @cursorless/cursorless-everywhere-talon-e2e test:quickjs
-        if: runner.os == 'Linux' && matrix.vscode_version == 'stable'
+        if: runner.os == 'Linux' && matrix.app_version == 'stable'
       - run: pnpm -F @cursorless/cursorless-everywhere-talon-e2e test:quickjs
-        if: runner.os != 'Linux' && matrix.vscode_version == 'stable'
+        if: runner.os != 'Linux' && matrix.app_version == 'stable'
       - run: bash -x scripts/install-neovim-dependencies.sh
       - uses: rhysd/action-setup-vim@v1
         id: vim

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;
   }

packages/cursorless-engine/src/processTargets/targets/DocumentTarget.ts

@@ -1,7 +1,6 @@
 import type { Range } from "@cursorless/common";
 import { shrinkRangeToFitContent } from "../../util/selectionUtils";
-import type { CommonTargetParameters } from "./BaseTarget";
-import { BaseTarget } from "./BaseTarget";
+import { BaseTarget, type CommonTargetParameters } from "./BaseTarget";
 import { PlainTarget } from "./PlainTarget";
 
 export class DocumentTarget extends BaseTarget<CommonTargetParameters> {
@@ -13,16 +12,6 @@ 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.
@@ -34,6 +23,18 @@ export class DocumentTarget extends BaseTarget<CommonTargetParameters> {
     ];
   }
 
+  getRemovalRange(): Range {
+    return this.contentRange;
+  }
+
+  getLeadingDelimiterTarget() {
+    return undefined;
+  }
+
+  getTrailingDelimiterTarget() {
+    return undefined;
+  }
+
   protected getCloneParameters() {
     return this.state;
   }