feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fix recently introduced backward/forward mess for searching

Browse Source
This commit is contained in:
hjk
2008-12-26 00:29:51 +01:00
committed by Roberto Raggi
parent 84af25f689
commit 8b663b35b2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/fakevim/handler.cpp
View File

@@ -153,7 +153,7 @@ public:
int m_commandCode; // ?, /, : ... int m_commandCode; // ?, /, : ...
QString m_commandBuffer; QString m_commandBuffer;
bool m_lastSearchBackward; bool m_lastSearchForward;
QString m_lastSearchString; QString m_lastSearchString;
}; };
@@ -165,7 +165,7 @@ FakeVimHandler::Private::Private(FakeVimHandler *parent)
m_subsubmode = NoSubSubMode; m_subsubmode = NoSubSubMode;
m_commandCode = 0; m_commandCode = 0;
m_fakeEnd = false; m_fakeEnd = false;
m_lastSearchBackward = false; m_lastSearchForward = true;
m_register = '"'; m_register = '"';
} }
@@ -386,9 +386,9 @@ void FakeVimHandler::Private::handleCommandMode(int key, const QString &text)
moveToFirstNonBlankOnLine(); moveToFirstNonBlankOnLine();
finishMovement(); finishMovement();
} else if (key == 'n') { } else if (key == 'n') {
search(m_lastSearchString, m_lastSearchBackward); search(m_lastSearchString, m_lastSearchForward);
} else if (key == 'N') { } else if (key == 'N') {
search(m_lastSearchString, !m_lastSearchBackward); search(m_lastSearchString, !m_lastSearchForward);
} else if (key == 'p') { } else if (key == 'p') {
QString text = m_registers[m_register]; QString text = m_registers[m_register];
int n = text.count(QChar(ParagraphSeparator)); int n = text.count(QChar(ParagraphSeparator));
@@ -511,9 +511,9 @@ void FakeVimHandler::Private::handleExMode(int key, const QString &text)
m_mode = CommandMode; m_mode = CommandMode;
} else if (key == Key_Return } else if (key == Key_Return
&& (m_commandCode == '/' || m_commandCode == '?')) { && (m_commandCode == '/' || m_commandCode == '?')) {
m_lastSearchBackward = (m_commandCode == '?'); m_lastSearchForward = (m_commandCode == '/');
m_lastSearchString = m_commandBuffer; m_lastSearchString = m_commandBuffer;
search(m_lastSearchString, m_lastSearchBackward); search(m_lastSearchString, m_lastSearchForward);
m_commandBuffer.clear(); m_commandBuffer.clear();
m_commandCode = 0; m_commandCode = 0;
m_mode = CommandMode; m_mode = CommandMode;