Improved update selections

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,6 @@ class BringMoveSwap implements Action {
           editor: destination.selection.editor,
           originalSelection: destination,
           isSource: false,
-          extendOnEqualEmptyRange: true,
         },
       ];
 
@@ -134,7 +137,6 @@ class BringMoveSwap implements Action {
           editor: source.selection.editor,
           originalSelection: source,
           isSource: true,
-          extendOnEqualEmptyRange: true,
         });
       }
 
@@ -156,10 +158,21 @@ class BringMoveSwap implements Action {
               ? edits
               : edits.filter(({ isSource }) => !isSource);
 
+          const selectionInfos = edits.map(({ originalSelection }) =>
+            getSelectionInfo(
+              editor.document,
+              originalSelection.selection.selection,
+              DecorationRangeBehavior.OpenOpen
+            )
+          );
+
           const [updatedSelections]: Selection[][] =
-            await performEditsAndUpdateSelections(editor, filteredEdits, [
-              edits.map((edit) => edit.originalSelection.selection.selection),
-            ]);
+            await performEditsAndUpdateFullSelectionInfos(
+              this.graph.selectionUpdater,
+              editor,
+              filteredEdits,
+              [selectionInfos]
+            );
 
           return edits.map((edit, index) => {
             const selection = updatedSelections[index];

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.selectionUpdater,
               () => 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.selectionUpdater,
+            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.selectionUpdater,
           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.selectionUpdater,
+            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.selectionUpdater,
             editor,
             edits,
             [targets.map((target) => target.selection.selection)]

src/actions/Wrap.ts

@@ -1,17 +1,21 @@
-import { Selection } from "vscode";
+import { DecorationRangeBehavior, Selection } from "vscode";
 import { flatten } from "lodash";
 import {
   Action,
   ActionPreferences,
   ActionReturnValue,
+  Edit,
   Graph,
   SelectionWithEditor,
   TypedSelection,
 } from "../typings/Types";
 import { runOnTargetsForEachEditor } from "../util/targetUtils";
 import { decorationSleep } from "../util/editDisplayUtils";
-import { performEditsAndUpdateSelections } from "../util/updateSelections";
-import { selectionWithEditorFromPositions } from "../util/selectionUtils";
+import { FullSelectionInfo } from "../typings/updateSelections";
+import {
+  getSelectionInfo,
+  performEditsAndUpdateFullSelectionInfos,
+} from "../core/updateSelections/updateSelections";
 
 export default class Wrap implements Action {
   getTargetPreferences: () => ActionPreferences[] = () => [
@@ -31,62 +35,88 @@ export default class Wrap implements Action {
       await runOnTargetsForEachEditor<SelectionWithEditor[]>(
         targets,
         async (editor, targets) => {
-          const edits = targets.flatMap((target) => [
+          const { document } = editor;
+          const boundaries = targets.map((target) => ({
+            start: new Selection(
+              target.selection.selection.start,
+              target.selection.selection.start
+            ),
+            end: new Selection(
+              target.selection.selection.end,
+              target.selection.selection.end
+            ),
+          }));
+
+          const edits: Edit[] = boundaries.flatMap(({ start, end }) => [
             {
               text: left,
-              range: new Selection(
-                target.selection.selection.start,
-                target.selection.selection.start
-              ),
+              range: start,
             },
             {
               text: right,
-              dontMoveOnEqualStart: true,
-              range: new Selection(
-                target.selection.selection.end,
-                target.selection.selection.end
-              ),
+              range: end,
+              isReplace: true,
             },
           ]);
 
-          const [updatedOriginalSelections, updatedTargetsSelections] =
-            await performEditsAndUpdateSelections(editor, edits, [
-              editor.selections,
-              targets.map((target) => target.selection.selection),
-            ]);
+          const delimiterSelectionInfos: FullSelectionInfo[] =
+            boundaries.flatMap(({ start, end }) => {
+              return [
+                getSelectionInfo(
+                  document,
+                  start,
+                  DecorationRangeBehavior.OpenClosed
+                ),
+                getSelectionInfo(
+                  document,
+                  end,
+                  DecorationRangeBehavior.ClosedOpen
+                ),
+              ];
+            });
 
-          editor.selections = updatedOriginalSelections;
+          const cursorSelectionInfos = editor.selections.map((selection) =>
+            getSelectionInfo(
+              document,
+              selection,
+              DecorationRangeBehavior.ClosedClosed
+            )
+          );
 
-          const updatedSelections = updatedTargetsSelections.flatMap(
-            ({ start, end }) => [
-              new Selection(
-                start.translate({ characterDelta: -left.length }),
-                start
-              ),
-              new Selection(
-                end,
-                end.translate({ characterDelta: right.length })
-              ),
-            ]
+          const thatMarkSelectionInfos = targets.map(
+            ({ selection: { selection } }) =>
+              getSelectionInfo(
+                document,
+                selection,
+                DecorationRangeBehavior.OpenOpen
+              )
           );
 
+          const [delimiterSelections, cursorSelections, thatMarkSelections] =
+            await performEditsAndUpdateFullSelectionInfos(
+              this.graph.selectionUpdater,
+              editor,
+              edits,
+              [
+                delimiterSelectionInfos,
+                cursorSelectionInfos,
+                thatMarkSelectionInfos,
+              ]
+            );
+
+          editor.selections = cursorSelections;
+
           editor.setDecorations(
             this.graph.editStyles.justAdded.token,
-            updatedSelections
+            delimiterSelections
           );
           await decorationSleep();
-
           editor.setDecorations(this.graph.editStyles.justAdded.token, []);
 
-          return targets.map((target, index) => {
-            const start = updatedSelections[index * 2].start;
-            const end = updatedSelections[index * 2 + 1].end;
-            return selectionWithEditorFromPositions(
-              target.selection,
-              start,
-              end
-            );
-          });
+          return thatMarkSelections.map((selection) => ({
+            editor,
+            selection,
+          }));
         }
       )
     );

src/actions/WrapWithSnippet.ts

@@ -1,4 +1,5 @@
 import { commands } from "vscode";
+import { callFunctionAndUpdateSelections } from "../core/updateSelections/updateSelections";
 import { SnippetDefinition } from "../typings/snippet";
 import {
   Action,
@@ -9,7 +10,6 @@ import {
 } from "../typings/Types";
 import displayPendingEditDecorations from "../util/editDisplayUtils";
 import { ensureSingleEditor } from "../util/targetUtils";
-import { callFunctionAndUpdateSelections } from "../util/updateSelections";
 import {
   Placeholder,
   SnippetParser,
@@ -98,11 +98,12 @@ export default class WrapWithSnippet implements Action {
     // NB: We used the command "editor.action.insertSnippet" instead of calling editor.insertSnippet
     // because the latter doesn't support special variables like CLIPBOARD
     const [updatedTargetSelections] = await callFunctionAndUpdateSelections(
+      this.graph.selectionUpdater,
       () =>
         commands.executeCommand("editor.action.insertSnippet", {
           snippet: snippetString,
         }),
-      editor,
+      editor.document,
       [targetSelections]
     );