Updated source and that mark for replace action (#1884)

Fixes #1883

## 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

---------

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

Author: AndreasArvidsson

packages/cursorless-engine/src/actions/Replace.ts

@@ -1,9 +1,14 @@
-import { FlashStyle, ReplaceWith } from "@cursorless/common";
-import { flatten, zip } from "lodash";
+import {
+  FlashStyle,
+  RangeExpansionBehavior,
+  ReplaceWith,
+} from "@cursorless/common";
+import { zip } from "lodash";
 import { RangeUpdater } from "../core/updateSelections/RangeUpdater";
-import { performEditsAndUpdateSelections } from "../core/updateSelections/updateSelections";
+import { performEditsAndUpdateSelectionsWithBehavior } from "../core/updateSelections/updateSelections";
 import { ide } from "../singletons/ide.singleton";
-import { Destination } from "../typings/target.types";
+import { SelectionWithEditor } from "../typings/Types";
+import { Destination, Target } from "../typings/target.types";
 import { flashTargets, runForEachEditor } from "../util/targetUtils";
 import { ActionReturnValue } from "./actions.types";
 
@@ -47,30 +52,49 @@ export default class Replace {
     }
 
     const edits = zip(destinations, texts).map(([destination, text]) => ({
-      edit: destination!.constructChangeEdit(text!),
       editor: destination!.editor,
+      target: destination!.target,
+      edit: destination!.constructChangeEdit(text!),
     }));
 
-    const thatMark = flatten(
-      await runForEachEditor(
-        edits,
-        (edit) => edit.editor,
-        async (editor, edits) => {
-          const [updatedSelections] = await performEditsAndUpdateSelections(
+    const sourceTargets: Target[] = [];
+    const thatSelections: SelectionWithEditor[] = [];
+
+    await runForEachEditor(
+      edits,
+      (edit) => edit.editor,
+      async (editor, edits) => {
+        const contentSelections = {
+          selections: edits.map(({ target }) => target.contentSelection),
+        };
+        const editSelections = {
+          selections: edits.map(({ edit }) => edit.range.toSelection(false)),
+          rangeBehavior: RangeExpansionBehavior.openOpen,
+        };
+
+        const [updatedContentSelections, updatedEditSelections] =
+          await performEditsAndUpdateSelectionsWithBehavior(
             this.rangeUpdater,
             ide().getEditableTextEditor(editor),
             edits.map(({ edit }) => edit),
-            [destinations.map((destination) => destination.contentSelection)],
+            [contentSelections, editSelections],
           );
 
-          return updatedSelections.map((selection) => ({
+        for (const [edit, selection] of zip(edits, updatedContentSelections)) {
+          sourceTargets.push(edit!.target.withContentRange(selection!));
+        }
+
+        for (const [edit, selection] of zip(edits, updatedEditSelections)) {
+          thatSelections.push({
             editor,
-            selection,
-          }));
-        },
-      ),
+            selection: edit!.edit
+              .updateRange(selection!)
+              .toSelection(selection!.isReversed),
+          });
+        }
+      },
     );
 
-    return { thatSelections: thatMark };
+    return { sourceTargets, thatSelections };
   }
 }

packages/cursorless-engine/src/actions/Sort.ts

@@ -35,10 +35,12 @@ abstract class SortBase implements SimpleAction {
 
     const sortedTexts = this.sortTexts(unsortedTexts);
 
-    return this.actions.replace.run(
+    const { thatSelections } = await this.actions.replace.run(
       sortedTargets.map((target) => target.toDestination("to")),
       sortedTexts,
     );
+
+    return { thatSelections };
   }
 }
 

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/placeHelloAfterAir.yml

@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  version: 6
+  spokenForm: place hello after air
+  action:
+    name: replace
+    replaceWith: [hello]
+    destination:
+      type: primitive
+      insertionMode: after
+      target:
+        type: primitive
+        mark: {type: decoratedSymbol, symbolColor: default, character: a}
+  usePrePhraseSnapshot: true
+spokenFormError: Action 'replace'
+initialState:
+  documentContents: aaa
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks:
+    default.a:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 3}
+finalState:
+  documentContents: aaa hello
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 0, character: 4}
+        end: {line: 0, character: 9}
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 0, character: 0}
+        end: {line: 0, character: 3}
+      isReversed: false
+      hasExplicitRange: false

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/actions/placeHelloToFine.yml

@@ -0,0 +1,43 @@
+languageId: plaintext
+command:
+  version: 6
+  spokenForm: place hello to fine
+  action:
+    name: replace
+    replaceWith: [hello]
+    destination:
+      type: primitive
+      insertionMode: to
+      target:
+        type: primitive
+        mark: {type: decoratedSymbol, symbolColor: default, character: f}
+  usePrePhraseSnapshot: true
+spokenFormError: Action 'replace'
+initialState:
+  documentContents: foo
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks:
+    default.f:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 3}
+finalState:
+  documentContents: hello
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 0, character: 0}
+        end: {line: 0, character: 5}
+      isReversed: false
+      hasExplicitRange: true
+  sourceMark:
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 0, character: 0}
+        end: {line: 0, character: 5}
+      isReversed: false
+      hasExplicitRange: false