forked from qt-creator/qt-creator
Fixes: fakevim: disable auto-indentation
This commit is contained in:
@@ -1068,6 +1068,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
|
|||||||
m_tc.setPosition(m_jumpListRedo.takeLast());
|
m_tc.setPosition(m_jumpListRedo.takeLast());
|
||||||
}
|
}
|
||||||
} else if (key == 'j' || key == Key_Down) {
|
} else if (key == 'j' || key == Key_Down) {
|
||||||
|
//qDebug() << "DESIRED COLUMN" << m_desiredColumn;
|
||||||
int savedColumn = m_desiredColumn;
|
int savedColumn = m_desiredColumn;
|
||||||
if (m_submode == NoSubMode || m_submode == ZSubMode
|
if (m_submode == NoSubMode || m_submode == ZSubMode
|
||||||
|| m_submode == RegisterSubMode) {
|
|| m_submode == RegisterSubMode) {
|
||||||
@@ -1143,7 +1144,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
|
|||||||
moveToEndOfLine();
|
moveToEndOfLine();
|
||||||
recordInsertText("\n");
|
recordInsertText("\n");
|
||||||
moveToStartOfLine();
|
moveToStartOfLine();
|
||||||
if (m_config[ConfigAutoIndent] == ConfigOn)
|
if (0 && m_config[ConfigAutoIndent] == ConfigOn)
|
||||||
recordInsertText(QString(indentDist(), ' '));
|
recordInsertText(QString(indentDist(), ' '));
|
||||||
else
|
else
|
||||||
recordInsertText(QString(numSpaces, ' '));
|
recordInsertText(QString(numSpaces, ' '));
|
||||||
@@ -1353,7 +1354,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
|
|||||||
m_submode = NoSubMode;
|
m_submode = NoSubMode;
|
||||||
m_tc.insertBlock();
|
m_tc.insertBlock();
|
||||||
m_lastInsertion += "\n";
|
m_lastInsertion += "\n";
|
||||||
if(m_config[ConfigAutoIndent] == ConfigOn)
|
if (0 && m_config[ConfigAutoIndent] == ConfigOn)
|
||||||
indentRegion(m_tc.block(), m_tc.block().next(), '\n');
|
indentRegion(m_tc.block(), m_tc.block().next(), '\n');
|
||||||
} else if (key == Key_Backspace || key == control('h')) {
|
} else if (key == Key_Backspace || key == control('h')) {
|
||||||
m_tc.deletePreviousChar();
|
m_tc.deletePreviousChar();
|
||||||
@@ -1382,7 +1383,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
|
|||||||
m_tc.deleteChar();
|
m_tc.deleteChar();
|
||||||
}
|
}
|
||||||
m_tc.insertText(text);
|
m_tc.insertText(text);
|
||||||
if (m_config[ConfigAutoIndent] == ConfigOn
|
if (0 && m_config[ConfigAutoIndent] == ConfigOn
|
||||||
&& isElectricCharacter(text.at(0))) {
|
&& isElectricCharacter(text.at(0))) {
|
||||||
const QString leftText = m_tc.block().text()
|
const QString leftText = m_tc.block().text()
|
||||||
.left(m_tc.position() - 1 - m_tc.block().position());
|
.left(m_tc.position() - 1 - m_tc.block().position());
|
||||||
@@ -2244,9 +2245,10 @@ bool FakeVimHandler::eventFilter(QObject *ob, QEvent *ev)
|
|||||||
KEY_DEBUG("KEYPRESS" << kev->key());
|
KEY_DEBUG("KEYPRESS" << kev->key());
|
||||||
EventResult res = d->handleEvent(kev);
|
EventResult res = d->handleEvent(kev);
|
||||||
// returning false core the app see it
|
// returning false core the app see it
|
||||||
KEY_DEBUG("HANDLED CODE:" << res);
|
//KEY_DEBUG("HANDLED CODE:" << res);
|
||||||
//return res != EventPassedToCore;
|
//return res != EventPassedToCore;
|
||||||
return true;
|
//return true;
|
||||||
|
return res == EventHandled;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ev->type() == QEvent::ShortcutOverride && ob == d->editor()) {
|
if (ev->type() == QEvent::ShortcutOverride && ob == d->editor()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user