Use raw target that mark on remove action (#1270)

Fixes #1253 

## 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)
- [x] I have not broken the cheatsheet

Author: AndreasArvidsson

src/actions/Clear.ts

@@ -24,17 +24,15 @@ export default class Clear implements Action {
         }),
     );
 
-    const { thatSelections: thatMark } = await this.graph.actions.remove.run([
-      plainTargets,
-    ]);
+    const { thatTargets } = await this.graph.actions.remove.run([plainTargets]);
 
-    if (thatMark != null) {
+    if (thatTargets != null) {
       await setSelectionsAndFocusEditor(
         ide().getEditableTextEditor(editor),
-        thatMark.map(({ selection }) => selection),
+        thatTargets.map(({ contentSelection }) => contentSelection),
       );
     }
 
-    return { thatSelections: thatMark };
+    return { thatTargets };
   }
 }

src/actions/CutToClipboard.ts

@@ -59,12 +59,12 @@ export class CutToClipboard implements Action {
 
     await this.graph.actions.copyToClipboard.run([targets], options);
 
-    const { thatSelections: thatMark } = await this.graph.actions.remove.run(
+    const { thatTargets } = await this.graph.actions.remove.run(
       [targets],
       options,
     );
 
-    return { thatSelections: thatMark };
+    return { thatTargets };
   }
 }
 

src/actions/Remove.ts

@@ -1,14 +1,11 @@
-import { flatten } from "lodash";
+import { flatten, zip } from "lodash";
 import { performEditsAndUpdateRanges } from "../core/updateSelections/updateSelections";
 import { FlashStyle } from "../libs/common/ide/types/FlashDescriptor";
 import ide from "../libs/cursorless-engine/singletons/ide.singleton";
+import { RawSelectionTarget } from "../processTargets/targets";
 import { Target } from "../typings/target.types";
 import { Graph } from "../typings/Types";
-import {
-  createThatMark,
-  flashTargets,
-  runOnTargetsForEachEditor,
-} from "../util/targetUtils";
+import { flashTargets, runOnTargetsForEachEditor } from "../util/targetUtils";
 import { unifyRemovalTargets } from "../util/unifyRanges";
 import { Action, ActionReturnValue } from "./actions.types";
 
@@ -30,7 +27,7 @@ export default class Delete implements Action {
       );
     }
 
-    const thatMark = flatten(
+    const thatTargets = flatten(
       await runOnTargetsForEachEditor(targets, async (editor, targets) => {
         const edits = targets.map((target) => target.constructRemovalEdit());
         const ranges = edits.map((edit) => edit.range);
@@ -42,10 +39,17 @@ export default class Delete implements Action {
           [ranges],
         );
 
-        return createThatMark(targets, updatedRanges);
+        return zip(targets, updatedRanges).map(
+          ([target, range]) =>
+            new RawSelectionTarget({
+              editor: target!.editor,
+              isReversed: target!.isReversed,
+              contentRange: range!,
+            }),
+        );
       }),
     );
 
-    return { thatSelections: thatMark };
+    return { thatTargets };
   }
 }

src/test/suite/fixtures/recorded/actions/carveVest.yml

@@ -25,10 +25,10 @@ finalState:
     - anchor: {line: 0, character: 0}
       active: {line: 0, character: 0}
   thatMark:
-    - type: UntypedTarget
+    - type: RawSelectionTarget
       contentRange:
         start: {line: 1, character: 6}
         end: {line: 1, character: 6}
       isReversed: false
-      hasExplicitRange: false
+      hasExplicitRange: true
 fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: null}]

src/test/suite/fixtures/recorded/actions/chuckArgMadeAndAir.yml

@@ -29,10 +29,10 @@ finalState:
     - anchor: {line: 0, character: 0}
       active: {line: 0, character: 0}
   thatMark:
-    - type: UntypedTarget
+    - type: RawSelectionTarget
       contentRange:
         start: {line: 0, character: 29}
         end: {line: 0, character: 29}
       isReversed: false
-      hasExplicitRange: false
+      hasExplicitRange: true
 fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}]}]

src/test/suite/fixtures/recorded/actions/chuckArgMadeAndAirAndJustSoon.yml

@@ -35,10 +35,10 @@ finalState:
     - anchor: {line: 0, character: 0}
       active: {line: 0, character: 0}
   thatMark:
-    - type: UntypedTarget
+    - type: RawSelectionTarget
       contentRange:
         start: {line: 0, character: 22}
         end: {line: 0, character: 22}
       isReversed: false
-      hasExplicitRange: false
+      hasExplicitRange: true
 fullTargets: [{type: list, elements: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: a}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: false}, isImplicit: false}, {type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: s}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: toRawSelection}, isImplicit: false}]}]

src/test/suite/fixtures/recorded/actions/chuckEveryArgMade.yml

@@ -22,10 +22,10 @@ finalState:
     - anchor: {line: 0, character: 0}
       active: {line: 0, character: 0}
   thatMark:
-    - type: UntypedTarget
+    - type: RawSelectionTarget
       contentRange:
         start: {line: 0, character: 16}
         end: {line: 0, character: 16}
       isReversed: false
-      hasExplicitRange: false
+      hasExplicitRange: true
 fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: outside, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]

src/test/suite/fixtures/recorded/actions/chuckVest.yml

@@ -25,10 +25,10 @@ finalState:
     - anchor: {line: 0, character: 0}
       active: {line: 0, character: 0}
   thatMark:
-    - type: UntypedTarget
+    - type: RawSelectionTarget
       contentRange:
         start: {line: 1, character: 6}
         end: {line: 1, character: 6}
       isReversed: false
-      hasExplicitRange: false
+      hasExplicitRange: true
 fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: outside}]

src/test/suite/fixtures/recorded/actions/clearVest.yml

@@ -25,10 +25,10 @@ finalState:
     - anchor: {line: 1, character: 6}
       active: {line: 1, character: 6}
   thatMark:
-    - type: UntypedTarget
+    - type: RawSelectionTarget
       contentRange:
         start: {line: 1, character: 6}
         end: {line: 1, character: 6}
       isReversed: false
-      hasExplicitRange: false
+      hasExplicitRange: true
 fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: v}, selectionType: token, position: contents, modifier: {type: identity}, insideOutsideType: inside}]

src/test/suite/fixtures/recorded/actions/cutEveryArgMade.yml

@@ -22,10 +22,10 @@ finalState:
     - anchor: {line: 0, character: 0}
       active: {line: 0, character: 0}
   thatMark:
-    - type: UntypedTarget
+    - type: RawSelectionTarget
       contentRange:
         start: {line: 0, character: 16}
         end: {line: 0, character: 16}
       isReversed: false
-      hasExplicitRange: false
+      hasExplicitRange: true
 fullTargets: [{type: primitive, mark: {type: decoratedSymbol, symbolColor: default, character: m}, selectionType: token, position: contents, insideOutsideType: null, modifier: {type: containingScope, scopeType: argumentOrParameter, includeSiblings: true}, isImplicit: false}]