mirror of
https://github.com/neovim/neovim.git
synced 2024-12-23 20:55:18 -07:00
vim-patch:9.1.0012: regression with empty inner blocks introduced
Problem: regression with empty inner blocks introduced
(after v9.1.0007)
Solution: Set correct cursor position, Check for visual mode
being active (Maxim Kim)
relates: vim/vim#13514
closes: vim/vim#13819
3779516988
Co-authored-by: Maxim Kim <habamax@gmail.com>
This commit is contained in:
parent
f38f86b1ad
commit
14918118e8
@ -955,9 +955,10 @@ int current_block(oparg_T *oap, int count, bool include, int what, int other)
|
||||
}
|
||||
}
|
||||
|
||||
if (equalpos(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 (equalpos(start_pos, *end_pos) && VIsual_active) {
|
||||
curwin->w_cursor = old_pos;
|
||||
return FAIL;
|
||||
}
|
||||
|
||||
|
@ -645,7 +645,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)
|
||||
@ -667,12 +667,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)
|
||||
@ -694,12 +700,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)
|
||||
@ -721,6 +733,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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user