fix(cursor): avoid unnecessary selections updates (#1507)

* fix(cursor): avoid unnecessary selections updates * fix: ensure complete consistency of selections
vscode-neovim · Oct 8, 2023 · bb0faed · bb0faed
1 parent 2515e46
commit bb0faed
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/cursor_manager.ts b/src/cursor_manager.ts
@@ -274,20 +274,27 @@ export class CursorManager implements Disposable, NeovimRedrawProcessable, Neovi
         }
         const active = convertVimPositionToEditorPosition(editor, bytePos);
 
-        const prev = editor.selection;
-        let selections;
-
+        let selections: Selection[];
         const mode = this.main.modeManager.currentMode;
         if (mode.isVisual) {
             selections = await this.createVisualSelection(editor, mode, active, undefined);
         } else {
             logger.debug(`Updating cursor in editor pos: [${active.line}, ${active.character}]`);
             selections = [new Selection(active, active)];
         }
-
+        const { selections: prevSelections } = editor;
+        if (
+            // Avoid unnecessary selections updates, or it will disrupt cursor movement related features in vscode
+            selections.length !== prevSelections.length ||
+            selections.some(
+                (s, idx) =>
+                    !(s.active.isEqual(prevSelections[idx].active) && s.anchor.isEqual(prevSelections[idx].anchor)),
+            )
+        ) {
+            editor.selections = selections;
+        }
         this.neovimCursorPosition.set(editor, selections[0]);
-        editor.selections = selections; // always update to clear visual selections
-        if (!selections[0].isEqual(prev)) {
+        if (!selections[0].isEqual(prevSelections[0])) {
             logger.debug(`The selection was changed, scroll view`);
             this.triggerMovementFunctions(editor, active);
         }

diff --git a/src/test/suite/vscode-integration-specific.test.ts b/src/test/suite/vscode-integration-specific.test.ts
@@ -20,6 +20,7 @@ import {
     openTextDocument,
     sendInsertKey,
     sendVSCodeCommand,
+    sendNeovimKeys,
 } from "../utils";
 
 describe("VSCode integration specific stuff", () => {
@@ -519,4 +520,15 @@ describe("VSCode integration specific stuff", () => {
             client,
         );
     });
+
+    it("cursorMove with wrappedLine should works #1498", async () => {
+        await openTextDocument({ content: "  hello\n\nworld" });
+        await wait(200);
+        await sendNeovimKeys(client, "ll", 200);
+        vscode.commands.executeCommand("cursorMove", { to: "down", by: "wrappedLine" });
+        await wait(200);
+        vscode.commands.executeCommand("cursorMove", { to: "down", by: "wrappedLine" });
+        await wait(200);
+        await assertContent({ cursor: [2, 2] }, client);
+    });
 });