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

fakevim: let the "IncSearch" option toggle between using the Creator

Browse Source 
core Find dialog and the "old" minibuffer based search.

A hot fix for the recent regression that 'n' and 'N' do not work and
the positioning of the cursor after the search is wrong.
This commit is contained in:
hjk
2009-06-02 11:56:58 +02:00
parent 4350baeea1
commit 6c85e5ec31
5 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/fakevim/fakevimhandler.cpp
View File

@@ -1018,7 +1018,19 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_commandHistoryIndex = m_commandHistory.size() - 1;
updateMiniBuffer();
} else if (key == '/' || key == '?') {
emit q->findRequested(key == '?');
if (hasConfig(ConfigIncSearch)) {
// re-use the core dialog.
emit q->findRequested(key == '?');
} else {
// FIXME: make core find dialog sufficiently flexible to
// produce the "default vi" behaviour too. For now, roll our own.
enterExMode(); // to get the cursor disabled
m_mode = (key == '/') ? SearchForwardMode : SearchBackwardMode;
m_commandBuffer.clear();
m_searchHistory.append(QString());
m_searchHistoryIndex = m_searchHistory.size() - 1;
updateMiniBuffer();
}
} else if (key == '`') {
m_subsubmode = BackTickSubSubMode;
} else if (key == '#' || key == '*') {
@@ -1290,11 +1302,17 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
m_tc = EDITOR(cursorForPosition(QPoint(0, EDITOR(height()) / 2)));
handleStartOfLine();
finishMovement();
} else if (key == 'n') {
emit q->findNextRequested(false);
} else if (key == 'n') { // FIXME: see comment for '/'
if (hasConfig(ConfigIncSearch))
emit q->findNextRequested(false);
else
search(lastSearchString(), m_lastSearchForward);
recordJump();
} else if (key == 'N') {
emit q->findNextRequested(true);
if (hasConfig(ConfigIncSearch))
emit q->findNextRequested(true);
else
search(lastSearchString(), !m_lastSearchForward);
recordJump();
} else if (key == 'o' || key == 'O') {
setDotCommand("%1o", count());