From 6fea8bf7dc708b203c4e8125dd5a23d4882027e1 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Sat, 2 Dec 2017 21:31:54 +0800
Subject: [PATCH] vim-mode: fix cursor position after changing from Insert to
 Normal mode

---
 src/utils/vvim.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/utils/vvim.cpp b/src/utils/vvim.cpp
index fc421c53..4df274a6 100644
--- a/src/utils/vvim.cpp
+++ b/src/utils/vvim.cpp
@@ -2241,11 +2241,18 @@ void VVim::setMode(VimMode p_mode, bool p_clearSelection, int p_position)
     if (m_mode != p_mode) {
         QTextCursor cursor = m_editor->textCursorW();
         int position = p_position;
-        if (position == -1
-            && m_mode == VimMode::Visual
-            && p_mode == VimMode::Normal
-            && cursor.position() > cursor.anchor()) {
-            position = cursor.position() - 1;
+        if (position == -1) {
+            if (m_mode == VimMode::Visual
+                && p_mode == VimMode::Normal
+                && cursor.position() > cursor.anchor()) {
+                position = cursor.position() - 1;
+            } else if (m_mode == VimMode::Insert
+                       && p_mode == VimMode::Normal) {
+                position = cursor.position() - 1;
+                if (position < 0) {
+                    position = 0;
+                }
+            }
         }
 
         if (p_clearSelection) {