summaryrefslogtreecommitdiff
path: root/src/plugins/fakevim
diff options
context:
space:
mode:
authorhluk <hluk@email.cz>2014-05-01 08:06:49 +0200
committerhjk <hjk121@nokiamail.com>2014-05-05 12:12:42 +0200
commit91d0739b976741d0a9a68cda6fa0649baf731b0d (patch)
treef4d0e3bd79c5ba817e58251a69303768cc0518bd /src/plugins/fakevim
parent4e78a95263e811d66c76d91178b94714b2439e74 (diff)
downloadqt-creator-91d0739b976741d0a9a68cda6fa0649baf731b0d.tar.gz
FakeVim: Allow to jump to the first quoted block on line
Task-number: QTCREATORBUG-12128 Change-Id: I3376a2f75307eaad1671d5b8b70ac7ba3035fdb8 Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/fakevim')
-rw-r--r--src/plugins/fakevim/fakevim_test.cpp9
-rw-r--r--src/plugins/fakevim/fakevimhandler.cpp2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/fakevim/fakevim_test.cpp b/src/plugins/fakevim/fakevim_test.cpp
index 5173884857..0aad5370fb 100644
--- a/src/plugins/fakevim/fakevim_test.cpp
+++ b/src/plugins/fakevim/fakevim_test.cpp
@@ -1339,6 +1339,15 @@ void FakeVimPlugin::test_vim_block_selection()
KEYS("u", "\"" X "abc\"\"def\"");
KEYS("<c-r>", "\"" X "\"\"def\"");
+ /* QTCREATORBUG-12128 */
+ data.setText("abc \"def\" ghi \"jkl\" mno");
+ KEYS("di\"", "abc \"" X "\" ghi \"jkl\" mno");
+ KEYS("u", "abc \"" X "def\" ghi \"jkl\" mno");
+ KEYS("3l" "di\"", "abc \"" X "\" ghi \"jkl\" mno");
+ KEYS("di\"", "abc \"" X "\" ghi \"jkl\" mno");
+ KEYS("tj" "di\"", "abc \"\" ghi \"" X "\" mno");
+ KEYS("l" "di\"", "abc \"\" ghi \"\"" X " mno");
+
NOT_IMPLEMENTED
// quoted string with escaped character
data.setText("\"abc\"");
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index aebf366fe1..fd91f273aa 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -8229,7 +8229,7 @@ bool FakeVimHandler::Private::selectQuotedStringTextObject(bool inner,
QTextCursor tc2(document());
while (tc2 <= tc) {
tc1 = document()->find(quote, tc2);
- if (tc1.isNull() || tc1.anchor() > tc.position())
+ if (tc1.isNull())
return false;
tc2 = document()->find(quote, tc1);
if (tc2.isNull())