enforce new selection for "remove" action (#2285)

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

From debugging the vscode cursorless extension, it seems the selection
is automatically updated by vscode itself when dealing with the "remove"
action while calling editBuilder.delete() (TextEditorEdit).

However it is not the case for neovim so it was using the old selection.

I fixed it so cursorless always enforce selection for that "remove"
action. Tested on neovim and vscode.

---------

Co-authored-by: Cedric Halbronn <[email protected]>

Author: saidelike

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

@@ -72,7 +72,7 @@ class InsertCopy implements SimpleAction {
     const editableEditor = ide().getEditableTextEditor(editor);
 
     const [
-      updatedEditorSelections,
+      updatedCursorSelections,
       updatedContentSelections,
       updatedEditSelections,
     ]: Selection[][] = await performEditsAndUpdateSelectionsWithBehavior(
@@ -86,7 +86,7 @@ class InsertCopy implements SimpleAction {
       ([edit, selection]) => edit!.updateRange(selection!),
     );
 
-    setSelectionsWithoutFocusingEditor(editableEditor, updatedEditorSelections);
+    setSelectionsWithoutFocusingEditor(editableEditor, updatedCursorSelections);
     const primarySelection = editor.selections[0];
 
     if (

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

@@ -1,17 +1,19 @@
-import { FlashStyle } from "@cursorless/common";
+import { FlashStyle, Selection, TextEditor } from "@cursorless/common";
 import { flatten, zip } from "lodash";
 import { RangeUpdater } from "../core/updateSelections/RangeUpdater";
-import { performEditsAndUpdateRanges } from "../core/updateSelections/updateSelections";
+import { performEditsAndUpdateSelections } from "../core/updateSelections/updateSelections";
 import { RawSelectionTarget } from "../processTargets/targets";
 import { ide } from "../singletons/ide.singleton";
 import { Target } from "../typings/target.types";
 import { flashTargets, runOnTargetsForEachEditor } from "../util/targetUtils";
 import { unifyRemovalTargets } from "../util/unifyRanges";
 import { SimpleAction, ActionReturnValue } from "./actions.types";
+import { setSelectionsWithoutFocusingEditor } from "../util/setSelectionsAndFocusEditor";
 
 export default class Delete implements SimpleAction {
   constructor(private rangeUpdater: RangeUpdater) {
     this.run = this.run.bind(this);
+    this.runForEditor = this.runForEditor.bind(this);
   }
 
   async run(
@@ -28,28 +30,39 @@ export default class Delete implements SimpleAction {
     }
 
     const thatTargets = flatten(
-      await runOnTargetsForEachEditor(targets, async (editor, targets) => {
-        const edits = targets.map((target) => target.constructRemovalEdit());
-        const ranges = edits.map((edit) => edit.range);
-
-        const [updatedRanges] = await performEditsAndUpdateRanges(
-          this.rangeUpdater,
-          ide().getEditableTextEditor(editor),
-          edits,
-          [ranges],
-        );
-
-        return zip(targets, updatedRanges).map(
-          ([target, range]) =>
-            new RawSelectionTarget({
-              editor: target!.editor,
-              isReversed: target!.isReversed,
-              contentRange: range!,
-            }),
-        );
-      }),
+      await runOnTargetsForEachEditor(targets, this.runForEditor),
     );
 
     return { thatTargets };
   }
+
+  private async runForEditor(editor: TextEditor, targets: Target[]) {
+    const edits = targets.map((target) => target.constructRemovalEdit());
+
+    const cursorSelections = editor.selections;
+    const editSelections = edits.map(({ range }) => range.toSelection(false));
+    const editableEditor = ide().getEditableTextEditor(editor);
+
+    const [updatedCursorSelections, updatedEditSelections]: Selection[][] =
+      await performEditsAndUpdateSelections(
+        this.rangeUpdater,
+        editableEditor,
+        edits,
+        [cursorSelections, editSelections],
+      );
+
+    await setSelectionsWithoutFocusingEditor(
+      editableEditor,
+      updatedCursorSelections,
+    );
+
+    return zip(targets, updatedEditSelections).map(
+      ([target, range]) =>
+        new RawSelectionTarget({
+          editor: target!.editor,
+          isReversed: target!.isReversed,
+          contentRange: range!,
+        }),
+    );
+  }
 }