mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:8.2.5012: cannot select one character inside () (#18731)
Problem: Cannot select one character inside ().
Solution: Do not try to extend the area if it is empty. (closes vim/vim#10472,
closes vim/vim#6616)
53737b5eee
This commit is contained in:
parent
2f974736ac
commit
af2899aee0
@ -3453,11 +3453,11 @@ int current_block(oparg_T *oap, long count, int include, int what, int other)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// In Visual mode, when the resulting area is not bigger than what we
|
||||||
* In Visual mode, when the resulting area is not bigger than what we
|
// started with, extend it to the next block, and then exclude again.
|
||||||
* started with, extend it to the next block, and then exclude again.
|
// Don't try to expand the area if the area is empty.
|
||||||
*/
|
|
||||||
if (!lt(start_pos, old_start) && !lt(old_end, curwin->w_cursor)
|
if (!lt(start_pos, old_start) && !lt(old_end, curwin->w_cursor)
|
||||||
|
&& !equalpos(start_pos, curwin->w_cursor)
|
||||||
&& VIsual_active) {
|
&& VIsual_active) {
|
||||||
curwin->w_cursor = old_start;
|
curwin->w_cursor = old_start;
|
||||||
decl(&curwin->w_cursor);
|
decl(&curwin->w_cursor);
|
||||||
|
@ -42,6 +42,24 @@ func Test_inner_block_with_cpo_M_right_backslash()
|
|||||||
call CpoM('(red (blue\) green)', 1, ['red (blue\) green', 'blue\', 'red (blue\) green'])
|
call CpoM('(red (blue\) green)', 1, ['red (blue\) green', 'blue\', 'red (blue\) green'])
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_inner_block_single_char()
|
||||||
|
new
|
||||||
|
call setline(1, "(a)")
|
||||||
|
|
||||||
|
set selection=inclusive
|
||||||
|
let @" = ''
|
||||||
|
call assert_nobeep('norm! 0faviby')
|
||||||
|
call assert_equal('a', @")
|
||||||
|
|
||||||
|
set selection=exclusive
|
||||||
|
let @" = ''
|
||||||
|
call assert_nobeep('norm! 0faviby')
|
||||||
|
call assert_equal('a', @")
|
||||||
|
|
||||||
|
set selection&
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_quote_selection_selection_exclusive()
|
func Test_quote_selection_selection_exclusive()
|
||||||
new
|
new
|
||||||
call setline(1, "a 'bcde' f")
|
call setline(1, "a 'bcde' f")
|
||||||
@ -50,11 +68,11 @@ func Test_quote_selection_selection_exclusive()
|
|||||||
exe "norm! fdvhi'y"
|
exe "norm! fdvhi'y"
|
||||||
call assert_equal('bcde', @")
|
call assert_equal('bcde', @")
|
||||||
|
|
||||||
let @"='dummy'
|
let @" = 'dummy'
|
||||||
exe "norm! $gevi'y"
|
exe "norm! $gevi'y"
|
||||||
call assert_equal('bcde', @")
|
call assert_equal('bcde', @")
|
||||||
|
|
||||||
let @"='dummy'
|
let @" = 'dummy'
|
||||||
exe "norm! 0fbhvi'y"
|
exe "norm! 0fbhvi'y"
|
||||||
call assert_equal('bcde', @")
|
call assert_equal('bcde', @")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user