Improved update selections

docs/test-case-recorder.md

@@ -10,9 +10,15 @@ command run, and the final state, all in the form of a yaml document. See
 
 ## Initial setup
 
-1. Add a voice command for recording to your personal talon files:
-   - `cursorless record: user.vscode("cursorless.recordTestCase")`
-   - We don't want to commit this so add it to your own repository.
+1.  Add a voice command for recording to your personal talon files:
+    - `cursorless record: user.vscode("cursorless.recordTestCase")`
+    - We don't want to commit this so add it to your own repository.
+1.  If you'd like to be able to do tests which check the navigation map, you should also add the following to your personal talon files:
+
+         cursorless record navigation:
+             user.vscode_with_plugin("cursorless.recordTestCase", 1)
+
+    It is quite unlikely you'll need this second step. Most tests don't check the navigation map.
 
 ## Recording new tests
 
@@ -39,6 +45,10 @@ command run, and the final state, all in the form of a yaml document. See
    - `Stopped recording test cases` is shown
    - You can also just stop the debugger or close the debug window
 
+### Navigation map tests
+
+If you want to check how the navigation map gets updated in response to changes, you can instead say "cursorless record navigation", and then you need to issue two commands in one phrase each time. The second command should be of the form "take air" (or another decorated mark), and will tell the test case recorder which decorated mark we're checking.
+
 ## Run recorded tests
 
 Recorded tests will automatically be picked up and run with the normal tests,

src/actions/BringMoveSwap.ts

@@ -11,9 +11,13 @@ import update from "immutability-helper";
 import displayPendingEditDecorations from "../util/editDisplayUtils";
 import { performOutsideAdjustment } from "../util/performInsideOutsideAdjustment";
 import { flatten, zip } from "lodash";
-import { Selection, TextEditor, Range } from "vscode";
-import { performEditsAndUpdateSelections } from "../util/updateSelections";
+import { Selection, TextEditor, Range, DecorationRangeBehavior } from "vscode";
+
 import { getTextWithPossibleDelimiter } from "../util/getTextWithPossibleDelimiter";
+import {
+  getSelectionInfo,
+  performEditsAndUpdateFullSelectionInfos,
+} from "../core/updateSelections/updateSelections";
 
 type ActionType = "bring" | "move" | "swap";
 
@@ -104,7 +108,7 @@ class BringMoveSwap implements Action {
           editor: destination.selection.editor,
           originalSelection: destination,
           isSource: false,
-          extendOnEqualEmptyRange: true,
+          isReplace: destination.position === "after",
         },
       ];
 
@@ -134,7 +138,7 @@ class BringMoveSwap implements Action {
           editor: source.selection.editor,
           originalSelection: source,
           isSource: true,
-          extendOnEqualEmptyRange: true,
+          isReplace: false,
         });
       }
 
@@ -156,13 +160,34 @@ class BringMoveSwap implements Action {
               ? edits
               : edits.filter(({ isSource }) => !isSource);
 
-          const [updatedSelections]: Selection[][] =
-            await performEditsAndUpdateSelections(editor, filteredEdits, [
-              edits.map((edit) => edit.originalSelection.selection.selection),
-            ]);
+          const editSelectionInfos = edits.map(({ originalSelection }) =>
+            getSelectionInfo(
+              editor.document,
+              originalSelection.selection.selection,
+              DecorationRangeBehavior.OpenOpen
+            )
+          );
+
+          const cursorSelectionInfos = editor.selections.map((selection) =>
+            getSelectionInfo(
+              editor.document,
+              selection,
+              DecorationRangeBehavior.ClosedClosed
+            )
+          );
+
+          const [updatedEditSelections, cursorSelections]: Selection[][] =
+            await performEditsAndUpdateFullSelectionInfos(
+              this.graph.rangeUpdater,
+              editor,
+              filteredEdits,
+              [editSelectionInfos, cursorSelectionInfos]
+            );
+
+          editor.selections = cursorSelections;
 
           return edits.map((edit, index) => {
-            const selection = updatedSelections[index];
+            const selection = updatedEditSelections[index];
             return {
               editor,
               selection,

src/actions/CommandAction.ts

@@ -14,11 +14,14 @@ import {
   setSelectionsAndFocusEditor,
 } from "../util/setSelectionsAndFocusEditor";
 import { flatten } from "lodash";
-import { callFunctionAndUpdateSelections } from "../util/updateSelections";
+
 import { ensureSingleEditor } from "../util/targetUtils";
+import { callFunctionAndUpdateSelections } from "../core/updateSelections/updateSelections";
 
 export default class CommandAction implements Action {
-  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [
+    { insideOutsideType: "inside" },
+  ];
   private ensureSingleEditor: boolean;
 
   constructor(
@@ -46,8 +49,9 @@ export default class CommandAction implements Action {
 
           const [updatedOriginalSelections, updatedTargetSelections] =
             await callFunctionAndUpdateSelections(
+              this.graph.rangeUpdater,
               () => commands.executeCommand(this.command),
-              editor,
+              editor.document,
               [originalSelections, targetSelections]
             );
 

src/actions/CopyLines.ts

@@ -6,15 +6,17 @@ import {
   TypedSelection,
 } from "../typings/Types";
 import { Range, Selection, TextEditor } from "vscode";
-import { performEditsAndUpdateSelections } from "../util/updateSelections";
 import { displayPendingEditDecorationsForSelection } from "../util/editDisplayUtils";
 import { runOnTargetsForEachEditor } from "../util/targetUtils";
 import { flatten } from "lodash";
 import unifyRanges from "../util/unifyRanges";
 import expandToContainingLine from "../util/expandToContainingLine";
+import { performEditsAndUpdateSelections } from "../core/updateSelections/updateSelections";
 
 class CopyLines implements Action {
-  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [
+    { insideOutsideType: "inside" },
+  ];
 
   constructor(private graph: Graph, private isUp: boolean) {
     this.run = this.run.bind(this);
@@ -63,10 +65,15 @@ class CopyLines implements Action {
         const edits = this.getEdits(editor, ranges);
 
         const [updatedSelections, copySelections] =
-          await performEditsAndUpdateSelections(editor, edits, [
-            targets.map((target) => target.selection.selection),
-            ranges.map(({ range }) => new Selection(range.start, range.end)),
-          ]);
+          await performEditsAndUpdateSelections(
+            this.graph.rangeUpdater,
+            editor,
+            edits,
+            [
+              targets.map((target) => target.selection.selection),
+              ranges.map(({ range }) => new Selection(range.start, range.end)),
+            ]
+          );
 
         editor.revealRange(updatedSelections[0]);
 

src/actions/Delete.ts

@@ -8,10 +8,12 @@ import {
 import { runOnTargetsForEachEditor } from "../util/targetUtils";
 import displayPendingEditDecorations from "../util/editDisplayUtils";
 import { flatten } from "lodash";
-import { performEditsAndUpdateSelections } from "../util/updateSelections";
+import { performEditsAndUpdateSelections } from "../core/updateSelections/updateSelections";
 
 export default class Delete implements Action {
-  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "outside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [
+    { insideOutsideType: "outside" },
+  ];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);
@@ -36,6 +38,7 @@ export default class Delete implements Action {
         }));
 
         const [updatedSelections] = await performEditsAndUpdateSelections(
+          this.graph.rangeUpdater,
           editor,
           edits,
           [targets.map((target) => target.selection.selection)]

src/actions/InsertEmptyLines.ts

@@ -8,11 +8,13 @@ import {
 import { Selection, Range } from "vscode";
 import { displayPendingEditDecorationsForSelection } from "../util/editDisplayUtils";
 import { runOnTargetsForEachEditor } from "../util/targetUtils";
-import { performEditsAndUpdateSelections } from "../util/updateSelections";
 import { flatten } from "lodash";
+import { performEditsAndUpdateSelections } from "../core/updateSelections/updateSelections";
 
 class InsertEmptyLines implements Action {
-  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [
+    { insideOutsideType: "inside" },
+  ];
 
   constructor(
     private graph: Graph,
@@ -53,11 +55,16 @@ class InsertEmptyLines implements Action {
         const edits = this.getEdits(ranges);
 
         const [updatedSelections, lineSelections, updatedOriginalSelections] =
-          await performEditsAndUpdateSelections(editor, edits, [
-            targets.map((target) => target.selection.selection),
-            ranges.map((range) => new Selection(range.start, range.end)),
-            editor.selections,
-          ]);
+          await performEditsAndUpdateSelections(
+            this.graph.rangeUpdater,
+            editor,
+            edits,
+            [
+              targets.map((target) => target.selection.selection),
+              ranges.map((range) => new Selection(range.start, range.end)),
+              editor.selections,
+            ]
+          );
 
         editor.selections = updatedOriginalSelections;
 

src/actions/Replace.ts

@@ -9,12 +9,14 @@ import displayPendingEditDecorations from "../util/editDisplayUtils";
 import { runForEachEditor } from "../util/targetUtils";
 import { flatten, zip } from "lodash";
 import { maybeAddDelimiter } from "../util/getTextWithPossibleDelimiter";
-import { performEditsAndUpdateSelections } from "../util/updateSelections";
+import { performEditsAndUpdateSelections } from "../core/updateSelections/updateSelections";
 
 type RangeGenerator = { start: number };
 
 export default class implements Action {
-  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: null }];
+  getTargetPreferences: () => ActionPreferences[] = () => [
+    { insideOutsideType: null },
+  ];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);
@@ -65,6 +67,7 @@ export default class implements Action {
         (edit) => edit.editor,
         async (editor, edits) => {
           const [updatedSelections] = await performEditsAndUpdateSelections(
+            this.graph.rangeUpdater,
             editor,
             edits,
             [targets.map((target) => target.selection.selection)]