Use correct delimited ranges for sub token words (#1563)

Fixes #1162

## Checklist

- [x] I have added
[tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
- [ ] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [ ] I have not broken the cheatsheet

Author: AndreasArvidsson

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

@@ -1,5 +1,8 @@
 import { Range } from "@cursorless/common";
+import { Target } from "../../typings/target.types";
 import { tryConstructPlainTarget } from "../../util/tryConstructTarget";
+import { isSameType } from "../../util/typeUtils";
+import { createContinuousRange } from "../targetUtil/createContinuousRange";
 import { getDelimitedSequenceRemovalRange } from "../targetUtil/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior";
 import BaseTarget, { CommonTargetParameters } from "./BaseTarget";
 
@@ -43,6 +46,34 @@ export default class SubTokenWordTarget extends BaseTarget<SubTokenTargetParamet
     return getDelimitedSequenceRemovalRange(this);
   }
 
+  createContinuousRangeTarget(
+    isReversed: boolean,
+    endTarget: Target,
+    includeStart: boolean,
+    includeEnd: boolean,
+  ): Target {
+    if (isSameType(this, endTarget)) {
+      return new SubTokenWordTarget({
+        ...this.getCloneParameters(),
+        isReversed,
+        contentRange: createContinuousRange(
+          this,
+          endTarget,
+          includeStart,
+          includeEnd,
+        ),
+        trailingDelimiterRange: endTarget.trailingDelimiterRange_,
+      });
+    }
+
+    return super.createContinuousRangeTarget(
+      isReversed,
+      endTarget,
+      includeStart,
+      includeEnd,
+    );
+  }
+
   protected getCloneParameters(): SubTokenTargetParameters {
     return {
       ...this.state,

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFinalTwoWords.yml

@@ -0,0 +1,24 @@
+languageId: plaintext
+command:
+  version: 5
+  spokenForm: chuck final two words
+  action: {name: remove}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: {type: word}
+          start: -2
+          length: 2
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: a_b_c
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: a
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/subtoken/chuckFirstTwoWords.yml

@@ -0,0 +1,24 @@
+languageId: plaintext
+command:
+  version: 5
+  spokenForm: chuck first two words
+  action: {name: remove}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: ordinalScope
+          scopeType: {type: word}
+          start: 0
+          length: 2
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: a_b_c
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: c
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}