From 0a292b53557559010d9974d80d742e114ff91068 Mon Sep 17 00:00:00 2001
From: johnfn <johnfn@gmail.com>
Date: Thu, 9 Jun 2016 00:10:32 -0700
Subject: [PATCH] Make clicking update position.

---
 src/mode/modeHandler.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
index c9affec75c6..6b3f58ebf0f 100644
--- a/src/mode/modeHandler.ts
+++ b/src/mode/modeHandler.ts
@@ -251,6 +251,25 @@ export class ModeHandler implements vscode.Disposable {
         this._vimState.currentMode = ModeName.Normal;
 
         this.setCurrentModeByName(this._vimState);
+
+        // handle scenarios where mouse used to change current position
+        vscode.window.onDidChangeTextEditorSelection(e => {
+            let selection = e.selections[0];
+
+            if (selection) {
+                let line = selection.active.line;
+                let char = selection.active.character;
+
+                var newPosition = new Position(line, char);
+
+                if (char > newPosition.getLineEnd().character) {
+                   newPosition = new Position(newPosition.line, newPosition.getLineEnd().character);
+                }
+
+                this._vimState.cursorPosition = newPosition;
+                this._vimState.desiredColumn = newPosition.character;
+            }
+        });
     }
 
     /**