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

fakevim: start with work on Ctrl-N/Ctrl-P

Browse Source
This commit is contained in:
hjk
2010-12-21 11:36:42 +01:00
parent 91a3e02ba5
commit 6159e5b860
3 changed files with 120 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2094,10 +2094,12 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
} else if (input.is('b') || input.isShift(Key_Left)) {
m_movetype = MoveExclusive;
moveToWordBoundary(false, false);
setTargetColumn();
finishMovement();
} else if (input.is('B')) {
m_movetype = MoveExclusive;
moveToWordBoundary(true, false);
setTargetColumn();
finishMovement();
} else if (input.is('c') && isNoVisualMode()) {
if (atEndOfLine())
@@ -2193,10 +2195,12 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
} else if (input.is('e') || input.isShift(Key_Right)) {
m_movetype = MoveInclusive;
moveToWordBoundary(false, true);
setTargetColumn();
finishMovement("%1e", count());
} else if (input.is('E')) {
m_movetype = MoveInclusive;
moveToWordBoundary(true, true);
setTargetColumn();
finishMovement("%1E", count());
} else if (input.isControl('e')) {
// FIXME: this should use the "scroll" option, and "count"
@@ -2470,6 +2474,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
// character of a word: only the current word will be changed
if (m_submode == ChangeSubMode) {
moveToWordBoundary(false, true, true);
setTargetColumn();
m_movetype = MoveInclusive;
} else {
moveToNextWord(false, m_submode == DeleteSubMode);
@@ -2479,6 +2484,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
} else if (input.is('W')) {
if (m_submode == ChangeSubMode) {
moveToWordBoundary(true, true, true);
setTargetColumn();
m_movetype = MoveInclusive;
} else {
moveToNextWord(true, m_submode == DeleteSubMode);
@@ -2705,6 +2711,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
} else if (input.isControl('w')) {
int endPos = position();
moveToWordBoundary(false, false, false);
setTargetColumn();
int beginPos = position();
Range range(beginPos, endPos, RangeCharMode);
removeText(range);
@@ -2825,6 +2832,12 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
removeText(Range(pos, pos+i));
//} else if (key >= control('a') && key <= control('z')) {
// // ignore these
} else if (input.isControl('p') || input.isControl('n')) {
QTextCursor tc = EDITOR(textCursor());
moveToWordBoundary(false, false);
QString str = selectText(Range(position(), tc.position()));
EDITOR(setTextCursor(tc));
emit q->simpleCompletionRequested(str, input.isControl('n'));
} else if (!input.text().isEmpty()) {
insertInInsertMode(input.text());
} else {
@@ -3960,7 +3973,6 @@ void FakeVimHandler::Private::moveToWordBoundary(bool simple, bool forward, bool
if (repeat == -1)
break;
}
setTargetColumn();
}
bool FakeVimHandler::Private::handleFfTt(QString key)
@@ -4690,6 +4702,7 @@ void FakeVimHandler::Private::selectWordTextObject(bool inner)
//if (isVisualMode())
// setMark('<', cursor().position());
moveToWordBoundary(false, true, true);
setTargetColumn();
m_movetype = MoveInclusive;
}
@@ -4703,6 +4716,7 @@ void FakeVimHandler::Private::selectWORDTextObject(bool inner)
//if (isVisualMode())
// setMark('<', cursor().position());
moveToWordBoundary(true, true, true);
setTargetColumn();
m_movetype = MoveInclusive;
}