diff options
| -rw-r--r-- | src/testdir/test_textobjects.vim | 24 | ||||
| -rw-r--r-- | src/textobject.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 31 insertions, 6 deletions
diff --git a/src/testdir/test_textobjects.vim b/src/testdir/test_textobjects.vim index 89e741c715..d5e772db50 100644 --- a/src/testdir/test_textobjects.vim +++ b/src/testdir/test_textobjects.vim @@ -643,7 +643,7 @@ endfunc func Test_inner_block_empty_paren() new - call setline(1, ["(text)()", "", "(text)(", ")", "", "()()"]) + call setline(1, ["(text)()", "", "(text)(", ")", "", "()()", "", "text()"]) " Example 1 call cursor(1, 1) @@ -665,12 +665,18 @@ func Test_inner_block_empty_paren() call assert_beeps('call feedkeys("0f(viby", "xt")') call assert_equal(3, getpos('.')[2]) call assert_equal('(', @") + + " Change empty inner block + call cursor(8, 1) + call feedkeys("0cibtext", "xt") + call assert_equal("text(text)", getline('.')) + bwipe! endfunc func Test_inner_block_empty_bracket() new - call setline(1, ["[text][]", "", "[text][", "]", "", "[][]"]) + call setline(1, ["[text][]", "", "[text][", "]", "", "[][]", "", "text[]"]) " Example 1 call cursor(1, 1) @@ -692,12 +698,18 @@ func Test_inner_block_empty_bracket() call assert_beeps('call feedkeys("0f[viby", "xt")') call assert_equal(3, getpos('.')[2]) call assert_equal('[', @") + + " Change empty inner block + call cursor(8, 1) + call feedkeys("0ci[text", "xt") + call assert_equal("text[text]", getline('.')) + bwipe! endfunc func Test_inner_block_empty_brace() new - call setline(1, ["{text}{}", "", "{text}{", "}", "", "{}{}"]) + call setline(1, ["{text}{}", "", "{text}{", "}", "", "{}{}", "", "text{}"]) " Example 1 call cursor(1, 1) @@ -719,6 +731,12 @@ func Test_inner_block_empty_brace() call assert_beeps('call feedkeys("0f{viby", "xt")') call assert_equal(3, getpos('.')[2]) call assert_equal('{', @") + + " Change empty inner block + call cursor(8, 1) + call feedkeys("0ciBtext", "xt") + call assert_equal("text{text}", getline('.')) + bwipe! endfunc diff --git a/src/textobject.c b/src/textobject.c index af94d06bc8..015b33bbf5 100644 --- a/src/textobject.c +++ b/src/textobject.c @@ -1131,10 +1131,15 @@ current_block( break; } - if (EQUAL_POS(start_pos, *end_pos)) - // empty block like this: () - // there is no inner block to select, abort + /* + * In Visual mode, when resulting area is empty + * i.e. there is no inner block to select, abort. + */ + if (EQUAL_POS(start_pos, *end_pos) && VIsual_active) + { + curwin->w_cursor = old_pos; return FAIL; + } /* * In Visual mode, when the resulting area is not bigger than what we diff --git a/src/version.c b/src/version.c index d45181d9d7..35865d696f 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 12, +/**/ 11, /**/ 10, |