Fix "clone" action with ScopeTypeTarget (cursorless-dev#1961)

- Fixes cursorless-dev#1691
- Fixes cursorless-dev#1959
- Also strengthens typing for clone args even more cc/ @auscompgeek

## Checklist

- [ ] 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: pokey

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

@@ -1,4 +1,8 @@
-import type { InsertionMode, TargetPlainObject } from "@cursorless/common";
+import type {
+  EnforceUndefined,
+  InsertionMode,
+  TargetPlainObject,
+} from "@cursorless/common";
 import {
   NoContainingScopeError,
   Range,
@@ -43,7 +47,7 @@ export default abstract class BaseTarget<
 > implements Target
 {
   protected abstract readonly type: string;
-  protected readonly state: CommonTargetParameters;
+  protected readonly state: EnforceUndefined<CommonTargetParameters>;
   isLine = false;
   isToken = true;
   hasExplicitScopeType = true;
@@ -123,7 +127,7 @@ export default abstract class BaseTarget<
     });
   }
 
-  protected abstract getCloneParameters(): TParameters;
+  protected abstract getCloneParameters(): EnforceUndefined<TParameters>;
 
   createContinuousRangeTarget(
     isReversed: boolean,
@@ -172,7 +176,10 @@ export default abstract class BaseTarget<
    *
    * @returns The object to be used for determining equality
    */
-  protected getEqualityParameters(): Omit<TParameters, "thatTarget"> {
+  protected getEqualityParameters(): Omit<
+    EnforceUndefined<TParameters>,
+    "thatTarget"
+  > {
     const { thatTarget, ...otherCloneParameters } = this.getCloneParameters();
 
     return {

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

@@ -145,6 +145,9 @@ export default class ScopeTypeTarget extends BaseTarget<ScopeTypeTargetParameter
   protected getCloneParameters() {
     return {
       ...this.state,
+      delimiter: this.insertionDelimiter,
+      removalRange: undefined,
+      interiorRange: undefined,
       scopeTypeType: this.scopeTypeType_,
       contentRemovalRange: this.removalRange_,
       leadingDelimiterRange: this.leadingDelimiterRange_,

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

@@ -75,7 +75,7 @@ export default class SubTokenWordTarget extends BaseTarget<SubTokenTargetParamet
     );
   }
 
-  protected getCloneParameters(): SubTokenTargetParameters {
+  protected getCloneParameters() {
     return {
       ...this.state,
       leadingDelimiterRange: this.leadingDelimiterRange_,

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

@@ -60,6 +60,7 @@ export default class UntypedTarget extends BaseTarget<UntypedTargetParameters> {
   protected getCloneParameters() {
     return {
       ...this.state,
+      isToken: this.isToken,
       hasExplicitRange: this.hasExplicitRange,
     };
   }

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/cloneTwoArgs.yml

@@ -0,0 +1,26 @@
+languageId: typescript
+command:
+  version: 6
+  spokenForm: clone two args
+  action:
+    name: insertCopyAfter
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: {type: argumentOrParameter}
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: aaa(bbb, ccc)
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
+  marks: {}
+finalState:
+  documentContents: aaa(bbb, ccc, bbb, ccc)
+  selections:
+    - anchor: {line: 0, character: 14}
+      active: {line: 0, character: 14}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/itemTextual/cloneTwoItems.yml

@@ -0,0 +1,26 @@
+languageId: plaintext
+command:
+  version: 6
+  spokenForm: clone two items
+  action:
+    name: insertCopyAfter
+    target:
+      type: primitive
+      modifiers:
+        - type: relativeScope
+          scopeType: {type: collectionItem}
+          offset: 0
+          length: 2
+          direction: forward
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (aaa, bbb)
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: (aaa, bbb, aaa, bbb)
+  selections:
+    - anchor: {line: 0, character: 11}
+      active: {line: 0, character: 11}