fakevim: make Ctrl-V <Tab> and Ctrl-V <Return> work in Insert and Ex mode

(cherry picked from commit cbdd9202d2)

src/plugins/fakevim/fakevimhandler.cpp

@@ -422,6 +422,15 @@ public:
 
     int key() const { return m_key; }
 
+    QChar raw() const
+    {
+        if (m_key == Key_Tab)
+            return '\t';
+        if (m_key == Key_Return)
+            return '\n';
+        return m_key;
+    }
+
     QDebug dump(QDebug ts) const
     {
         return ts << m_key << '-' << m_modifiers << '-'
@@ -709,6 +718,7 @@ public:
     void selectQuotedStringTextObject(bool inner, int type);
 
     Q_SLOT void importSelection();
+    void insertInInsertMode(const QString &text);
 
 public:
     QTextEdit *m_textedit;
@@ -862,6 +872,7 @@ public:
     void setupCharClass();
     int charClass(QChar c, bool simple) const;
     signed char m_charClass[256];
+    bool m_ctrlVActive;
 
     static struct GlobalData
     {
@@ -925,6 +936,7 @@ void FakeVimHandler::Private::init()
     m_cursorWidth = EDITOR(cursorWidth());
     m_justAutoIndented = 0;
     m_rangemode = RangeCharMode;
+    m_ctrlVActive = false;
 
     setupCharClass();
 }
@@ -2551,6 +2563,11 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
         g.dotCommand += QChar(27);
         enterCommandMode();
         m_submode = NoSubMode;
+        m_ctrlVActive = false;
+    } else if (m_ctrlVActive) {
+        insertInInsertMode(input.raw());
+    } else if (input.isControl('v')) {
+        m_ctrlVActive = true;
     } else if (input.isKey(Key_Insert)) {
         if (m_mode == ReplaceMode)
             m_mode = InsertMode;
@@ -2656,9 +2673,18 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
     //} else if (key >= control('a') && key <= control('z')) {
     //    // ignore these
     } else if (!input.text().isEmpty()) {
+        insertInInsertMode(input.text());
+    } else {
+        return EventUnhandled;
+    }
+    updateMiniBuffer();
+    return EventHandled;
+}
+
+void FakeVimHandler::Private::insertInInsertMode(const QString &text)
+{
     joinPreviousEditBlock();
     m_justAutoIndented = 0;
-        const QString text = input.text();
     m_lastInsertion.append(text);
     insertText(text);
     if (hasConfig(ConfigSmartIndent) && isElectricCharacter(text.at(0))) {
@@ -2674,11 +2700,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
         emit q->completionRequested();
     setTargetColumn();
     endEditBlock();
-    } else {
-        return EventUnhandled;
-    }
-    updateMiniBuffer();
-    return EventHandled;
+    m_ctrlVActive = false;
 }
 
 EventResult FakeVimHandler::Private::handleExMode(const Input &input)
@@ -2687,6 +2709,12 @@ EventResult FakeVimHandler::Private::handleExMode(const Input &input)
         m_commandBuffer.clear();
         enterCommandMode();
         updateMiniBuffer();
+        m_ctrlVActive = false;
+    } else if (m_ctrlVActive) {
+        m_commandBuffer += input.raw();
+        m_ctrlVActive = false;
+    } else if (input.isControl('v')) {
+        m_ctrlVActive = true;
     } else if (input.isBackspace()) {
         if (m_commandBuffer.isEmpty()) {
             m_commandPrefix.clear();
@@ -2717,9 +2745,6 @@ EventResult FakeVimHandler::Private::handleExMode(const Input &input)
         g.commandHistory.down();
         m_commandBuffer = g.commandHistory.current();
         updateMiniBuffer();
-    } else if (input.isKey(Key_Tab)) {
-        m_commandBuffer += QChar(9);
-        updateMiniBuffer();
     } else if (!input.text().isEmpty()) {
         m_commandBuffer += input.text();
         updateMiniBuffer();