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

fakevim: Selection command for strings

Browse Source 
Selection commands for strings (blocks enclosed in double or single
quotes or backtick characters). E.g. "di'", "ca`" etc.

Change-Id: Ic83a5230eab317c9e730a1ddb421f2df432cb8e6
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Lukas Holecek
2012-07-19 21:12:13 +02:00
committed by hjk
parent f393ad1640
commit ead1ea2471
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -887,7 +887,7 @@ public:
void selectParagraphTextObject(bool inner); void selectParagraphTextObject(bool inner);
void selectBlockTextObject(bool inner, char left, char right); void selectBlockTextObject(bool inner, char left, char right);
void changeNumberTextObject(bool doIncrement); void changeNumberTextObject(bool doIncrement);
void selectQuotedStringTextObject(bool inner, int type); void selectQuotedStringTextObject(bool inner, const QString &quote);
Q_SLOT void importSelection(); Q_SLOT void importSelection();
void exportSelection(); void exportSelection();
@@ -1841,7 +1841,7 @@ EventResult FakeVimHandler::Private::handleCommandSubSubMode(const Input &input)
else if (input.is('{') || input.is('}') || input.is('B')) else if (input.is('{') || input.is('}') || input.is('B'))
selectBlockTextObject(m_subsubdata.is('i'), '{', '}'); selectBlockTextObject(m_subsubdata.is('i'), '{', '}');
else if (input.is('"') || input.is('\'') || input.is('`')) else if (input.is('"') || input.is('\'') || input.is('`'))
selectQuotedStringTextObject(m_subsubdata.is('i'), input.key()); selectQuotedStringTextObject(m_subsubdata.is('i'), input.asChar());
m_subsubmode = NoSubSubMode; m_subsubmode = NoSubSubMode;
finishMovement(QString("%1%2%3") finishMovement(QString("%1%2%3")
.arg(count()) .arg(count())
@@ -5201,10 +5201,36 @@ void FakeVimHandler::Private::changeNumberTextObject(bool doIncrement)
moveLeft(); moveLeft();
} }
void FakeVimHandler::Private::selectQuotedStringTextObject(bool inner, int type) void FakeVimHandler::Private::selectQuotedStringTextObject(bool inner,
const QString &quote)
{ {
Q_UNUSED(inner); QTextCursor tc = cursor();
Q_UNUSED(type); int sz = quote.size();
QTextCursor tc1;
QTextCursor tc2(document());
while (tc2 <= tc) {
tc1 = document()->find(quote, tc2);
if (tc1.isNull() || tc1.anchor() > tc.position())
return;
tc2 = document()->find(quote, tc1);
if (tc2.isNull())
return;
}
int p1 = tc1.position();
int p2 = tc2.position();
if (inner) {
p2 -= sz + 1;
if (document()->characterAt(p1) == ParagraphSeparator)
++p1;
} else {
p1 -= sz;
p2 -= sz;
}
setAnchorAndPosition(p1, p2);
m_movetype = MoveInclusive;
} }
int FakeVimHandler::Private::mark(int code) const int FakeVimHandler::Private::mark(int code) const