Merge pull request #2036 from westim/visual-multicursor

Fix for issue #1860, visual multicursor movement.
VSCodeVim · Sep 27, 2017 · ad19462 · ad19462
2 parents 1ef93e9 + d5b3d9b
commit ad19462
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -651,9 +651,15 @@ export class ModeHandler implements vscode.Disposable {
     ) {
       // Number of selections changed, make sure we know about all of them still
       this.vimState.allCursors = e.textEditor.selections.map(
-        x => new Range(Position.FromVSCodePosition(x.start), Position.FromVSCodePosition(x.end))
+        sel =>
+          new Range(
+            // Adjust the cursor positions because cursors & selections don't match exactly
+            sel.anchor.compareTo(sel.active) > 0
+              ? Position.FromVSCodePosition(sel.anchor).getLeft()
+              : Position.FromVSCodePosition(sel.anchor),
+            Position.FromVSCodePosition(sel.active)
+          )
       );
-
       await this.updateView(this.vimState);
 
       return;