1
0
forked from aniani/vim

patch 8.2.5012: cannot select one character inside ()

Problem:    Cannot select one character inside ().
Solution:   Do not try to extend the area if it is empty. (closes #10472,
            closes #6616)
This commit is contained in:
LemonBoy
2022-05-24 11:49:31 +01:00
committed by Bram Moolenaar
parent 971f6825ee
commit 53737b5eee
3 changed files with 24 additions and 2 deletions

View File

@@ -41,6 +41,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")
@@ -49,11 +67,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', @")

View File

@@ -1133,8 +1133,10 @@ current_block(
/* /*
* 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_POS(start_pos, old_start) && !LT_POS(old_end, curwin->w_cursor) if (!LT_POS(start_pos, old_start) && !LT_POS(old_end, curwin->w_cursor)
&& !EQUAL_POS(start_pos, curwin->w_cursor)
&& VIsual_active) && VIsual_active)
{ {
curwin->w_cursor = old_start; curwin->w_cursor = old_start;

View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5012,
/**/ /**/
5011, 5011,
/**/ /**/