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

FakeVim: Fixes for insert/change in visual mode

Browse Source 
Always limit position of marks to current document (mainly position of
'<' and '>' marks for last selection).

Command '$' selects end of selected lines in visual block mode. This
will require editor support since visual representation of such
selection isn't always rectangle.

Command 'c' works the same as 's' in visual block mode.

Corrected positions for 'I', 'A', 's' and 'c' commands in visual block
mode after '<ESC>'.

Task-number: QTCREATORBUG-11378
Change-Id: I86582b634eb782829db48fd1b914713f87ac409f
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hluk
2014-02-03 20:47:47 +01:00
committed by hjk
parent 33345045bc
commit d90d6f40b3
3 changed files with 270 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -644,19 +644,6 @@ void FakeVimPlugin::test_vim_insert()
KEYS("i<bs>XY", "aXY" X "c" N "def");
KEYS("j.", "aXYc" N "dX" X "Yf");
// insert in visual block mode
data.setText("abc" N "d" X "ef" N "jkl" N "mno" N "pqr");
KEYS("<c-v>2j" "2I" "XYZ<esc>", "abc" N "d" X "XYZXYZef" N "jXYZXYZkl" N "mXYZXYZno" N "pqr");
INTEGRITY(false);
data.setText("abc" N "d" X "ef" N "jkl" N "mno" N "pqr");
KEYS("<c-v>2j" "2A" "XYZ<esc>", "abc" N "d" X "eXYZXYZf" N "jkXYZXYZl" N "mnXYZXYZo" N "pqr");
INTEGRITY(false);
data.setText("abc" N "de" X "f" N "" N "jkl" N "mno");
KEYS("<c-v>2jh" "2I" "XYZ<esc>", "abc" N "d" X "XYZXYZef" N "" N "jXYZXYZkl" N "mno");
INTEGRITY(false);
// insert in visual mode
data.setText(" a" X "bcde" N " fghij" N " klmno");
KEYS("v2l" "2Ixyz<esc>", "xyzxy" X "z abcde" N " fghij" N " klmno");
@@ -1199,12 +1186,36 @@ void FakeVimPlugin::test_vim_change_replace()
INTEGRITY(false);
// insert in visual block mode
data.setText("abc" N "d" X "ef" N "jkl" N "mno" N "pqr");
KEYS("<c-v>2j" "2s" "XYZ<esc>", "abc" N "d" X "XYZf" N "jXYZl" N "mXYZo" N "pqr");
data.setText(
"abc" N
"d" X "ef" N
"" N
"jkl" N
"mno" N
);
KEYS("<c-v>2j2sXYZ<esc>",
"abc" N
"dXY" X "Zf" N
"" N
"jXYZl" N
"mno" N
);
INTEGRITY(false);
data.setText("abc" N "de" X "f" N "" N "jkl" N "mno");
KEYS("<c-v>2jh" "2s" "XYZ<esc>", "abc" N "d" X "XYZ" N "" N "jXYZ" N "mno");
data.setText(
"abc" N
"de" X "f" N
"" N
"jkl" N
"mno" N
);
KEYS("<c-v>2jh2sXYZ<esc>",
"abc" N
"dXY" X "Z" N
"" N
"jXYZ" N
"mno" N
);
INTEGRITY(false);
// change with copy to a register
@@ -1322,6 +1333,76 @@ void FakeVimPlugin::test_vim_block_selection()
KEYS("u", "\"abc\"\"" X "def\"");
}
void FakeVimPlugin::test_vim_block_selection_insert()
{
TestData data;
setup(&data);
// insert in visual block mode
data.setText("abc" N "d" X "ef" N "jkl" N "mno" N "pqr");
KEYS("<c-v>2j" "2I" "XYZ<esc>", "abc" N "d" X "XYZXYZef" N "jXYZXYZkl" N "mXYZXYZno" N "pqr");
INTEGRITY(false);
data.setText("abc" N "d" X "ef" N "jkl" N "mno" N "pqr");
KEYS("<c-v>2j" "2A" "XYZ<esc>", "abc" N "d" X "eXYZXYZf" N "jkXYZXYZl" N "mnXYZXYZo" N "pqr");
INTEGRITY(false);
data.setText("abc" N "de" X "f" N "" N "jkl" N "mno");
KEYS("<c-v>2jh" "2I" "XYZ<esc>", "abc" N "d" X "XYZXYZef" N "" N "jXYZXYZkl" N "mno");
INTEGRITY(false);
/* QTCREATORBUG-11378 */
data.setText(
" abcd" N
" efgh" N
" ijkl" N
" mnop" N
"");
KEYS("<C-V>3j$AXYZ<ESC>",
X " abcdXYZ" N
" efghXYZ" N
" ijklXYZ" N
" mnopXYZ" N
"");
data.setText(
" abcd" N
" ef" N
" ghijk" N
" lm" N
"");
KEYS("<C-V>3j$AXYZ<ESC>",
X " abcdXYZ" N
" efXYZ" N
" ghijkXYZ" N
" lmXYZ" N
"");
data.setText(
"a" N
"" N
"b" N
"" N
);
KEYS("j<C-V>$jAXYZ<ESC>",
"a" N
"|XYZ" N
"bXYZ" N
"" N
);
data.setText(
"abc" N
"" N
"def" N
);
KEYS("l<c-v>2jAXYZ<ESC>",
"a" X "bXYZc" N
" XYZ" N
"deXYZf" N
);
}
void FakeVimPlugin::test_vim_repeat()
{
TestData data;