From 2a8a411b214a42a17b188d032865dc722e10eb99 Mon Sep 17 00:00:00 2001
From: hluk <hluk@email.cz>
Date: Tue, 23 Apr 2013 20:07:25 +0200
Subject: [PATCH] FakeVim: Fixes and more tests for visual block mode

Task-number: QTCREATORBUG-9190
Change-Id: I4cc3ef675f65edafc1d68ae9dd1521656b5bfdb7
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 src/plugins/fakevim/fakevim_test.cpp   | 35 ++++++++++++++++++++++++++
 src/plugins/fakevim/fakevimhandler.cpp |  7 +++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/plugins/fakevim/fakevim_test.cpp b/src/plugins/fakevim/fakevim_test.cpp
index 94fff499b33..1415e29bf37 100644
--- a/src/plugins/fakevim/fakevim_test.cpp
+++ b/src/plugins/fakevim/fakevim_test.cpp
@@ -1082,6 +1082,41 @@ void FakeVimPlugin::test_vim_block_selection()
     data.setText("\"abc" X "\"\"def\"");
     KEYS("vi\"d", "\"" X "\"\"def\"");
 
+    /* QTCREATORBUG-9190 */
+    data.setText(" abcd" N " efgh" N " ijkl" N " mnop" N "");
+    data.doKeys("2lj" "<C-V>" "jl");
+    data.doKeys("x");
+    COMMAND("", " abcd" N " e" X "h" N " il" N " mnop" N "");
+    COMMAND(":undo", " abcd" N " e" X "fgh" N " ijkl" N " mnop" N "");
+    data.doKeys("<C-V>");
+    data.doKeys("j");
+    data.doKeys("l");
+    data.doKeys("x");
+    COMMAND("", " abcd" N " e" X "h" N " il" N " mnop" N "");
+    COMMAND(":undo", " abcd" N " e" X "fgh" N " ijkl" N " mnop" N "");
+    data.doKeys("gv");
+    data.doKeys("j");
+    data.doKeys("h");
+    data.doKeys("x");
+    COMMAND("", " abcd" N " e" X "gh" N " ikl" N " mop" N "");
+    COMMAND(":undo", " abcd" N " e" X "fgh" N " ijkl" N " mnop" N "");
+    data.doCommand("set passkeys");
+    data.doKeys("gv");
+    data.doKeys("k");
+    data.doKeys("l");
+    data.doKeys("r-");
+    COMMAND("", " abcd" N " e" X "--h" N " i--l" N " mnop" N "");
+    COMMAND(":undo", " abcd" N " e" X "fgh" N " ijkl" N " mnop" N "");
+    data.doKeys("gv");
+    data.doKeys("j");
+    data.doKeys("o");
+    data.doKeys("k");
+    data.doKeys("h");
+    data.doKeys("r9");
+    COMMAND("", " " X "999d" N " 999h" N " 999l" N " 999p" N "");
+    COMMAND(":undo", " " X "abcd" N " efgh" N " ijkl" N " mnop" N "");
+    data.doCommand("set nopasskeys");
+
     // repeat change inner
     data.setText("(abc)" N "def" N "(ghi)");
     KEYS("ci(xyz<esc>", "(xy" X "z)" N "def" N "(ghi)");
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 64c24d7de90..10afe6c9bb8 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -2236,6 +2236,7 @@ void FakeVimHandler::Private::exportSelection()
             setAnchorAndPosition(anc, pos + 1);
 
         if (m_visualMode == VisualBlockMode) {
+            commitCursor();
             emit q->requestSetBlockSelection(false);
             emit q->requestSetBlockSelection(true);
         } else if (m_visualMode == VisualLineMode) {
@@ -3934,6 +3935,7 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input)
             setCursorPosition(m_lastVisualModeInverted ? to : from);
             setAnchor();
             setCursorPosition(m_lastVisualModeInverted ? from : to);
+            setTargetColumn();
         }
     } else if (input.is('v')) {
         toggleVisualMode(VisualCharMode);
@@ -6534,7 +6536,7 @@ void FakeVimHandler::Private::insertText(QTextCursor &tc, const QString &text)
           passEventToEditor(event);
       }
 
-      updateCursorShape();
+      tc = m_cursor;
       m_cursor = oldTc;
   } else {
       tc.insertText(text);
@@ -6794,8 +6796,11 @@ bool FakeVimHandler::Private::passEventToEditor(QEvent &event)
     removeEventFilter();
 
     commitCursor();
+
     EDITOR(setOverwriteMode(false));
+    emit q->requestSetBlockSelection(false);
     bool accepted = QApplication::sendEvent(editor(), &event);
+    updateCursorShape();
 
     installEventFilter();