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

FakeVim: Check first character on line with 'F' and 'T' commands

Browse Source 
Change-Id: Icd5c3ca62da0fbff35e2281e04b1fa37a304f64c
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hluk
2013-08-11 07:46:26 +02:00
committed by hjk
parent 75ce70a862
commit 1843d5ab67
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/fakevim/fakevim_test.cpp
View File

@@ -693,6 +693,17 @@ void FakeVimPlugin::test_vim_fFtT()
KEYS("2F(", "123()456" N "a(b" X "(c)d)e"); KEYS("2F(", "123()456" N "a(b" X "(c)d)e");
KEYS("l2F(", "123()456" N "a" X "(b(c)d)e"); KEYS("l2F(", "123()456" N "a" X "(b(c)d)e");
KEYS("F(", "123()456" N "a" X "(b(c)d)e"); KEYS("F(", "123()456" N "a" X "(b(c)d)e");
data.setText("abc def" N "ghi " X "jkl");
KEYS("vFgx", "abc def" N X "kl");
KEYS("u", "abc def" N X "ghi jkl");
KEYS("tk", "abc def" N "ghi " X "jkl");
KEYS("dTg", "abc def" N "g" X "jkl");
INTEGRITY(false);
KEYS("u", "abc def" N "g" X "hi jkl");
KEYS("f .", "abc def" N "g" X " jkl");
KEYS("u", "abc def" N "g" X "hi jkl");
KEYS("rg$;", "abc def" N "gg" X "i jkl");
} }
void FakeVimPlugin::test_vim_transform_numbers() void FakeVimPlugin::test_vim_transform_numbers()

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

@@ -6262,42 +6262,34 @@ void FakeVimHandler::Private::moveToWordEnd(int count, bool simple, bool forward
bool FakeVimHandler::Private::handleFfTt(QString key) bool FakeVimHandler::Private::handleFfTt(QString key)
{ {
int key0 = key.size() == 1 ? key.at(0).unicode() : 0; int key0 = key.size() == 1 ? key.at(0).unicode() : 0;
int oldPos = position();
// g.subsubmode \in { 'f', 'F', 't', 'T' } // g.subsubmode \in { 'f', 'F', 't', 'T' }
bool forward = g.subsubdata.is('f') || g.subsubdata.is('t'); bool forward = g.subsubdata.is('f') || g.subsubdata.is('t');
bool exclusive = g.subsubdata.is('t') || g.subsubdata.is('T');
int repeat = count(); int repeat = count();
int n = block().position() + (forward ? block().length() : - 1);
QTextDocument *doc = document(); QTextDocument *doc = document();
int n = block().position();
if (forward) for (int d = forward ? 1 : -1, pos = position() + d; pos != n; pos += d) {
n += block().length();
int pos = position();
while (pos != n) {
pos += forward ? 1 : -1;
if (pos == n)
break;
int uc = doc->characterAt(pos).unicode(); int uc = doc->characterAt(pos).unicode();
if (uc == ParagraphSeparator) if (uc == ParagraphSeparator)
break; break;
if (uc == key0) if (uc == key0) {
--repeat; --repeat;
if (repeat == 0) { if (repeat == 0) {
if (g.subsubdata.is('t')) if (exclusive)
--pos; pos -= d;
else if (g.subsubdata.is('T'))
++pos;
if (forward) if (forward)
moveRight(pos - position()); moveRight(pos - position());
else else
moveLeft(position() - pos); moveLeft(position() - pos);
break;
}
}
if (repeat == 0) {
setTargetColumn(); setTargetColumn();
return true; return true;
} }
setPosition(oldPos); }
}
return false; return false;
} }