Skip to content

Commit

Permalink
patch 8.2.5012: cannot select one character inside ()
Browse files Browse the repository at this point in the history
Problem:    Cannot select one character inside ().
Solution:   Do not try to extend the area if it is empty. (closes #10472,
            closes #6616)
  • Loading branch information
LemonBoy authored and brammool committed May 24, 2022
1 parent 971f682 commit 53737b5
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
22 changes: 20 additions & 2 deletions src/testdir/test_textobjects.vim
Expand Up @@ -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'])
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()
new
call setline(1, "a 'bcde' f")
Expand All @@ -49,11 +67,11 @@ func Test_quote_selection_selection_exclusive()
exe "norm! fdvhi'y"
call assert_equal('bcde', @")

let @"='dummy'
let @" = 'dummy'
exe "norm! $gevi'y"
call assert_equal('bcde', @")

let @"='dummy'
let @" = 'dummy'
exe "norm! 0fbhvi'y"
call assert_equal('bcde', @")

Expand Down
2 changes: 2 additions & 0 deletions src/textobject.c
Expand Up @@ -1133,8 +1133,10 @@ current_block(
/*
* 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.
* 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)
&& !EQUAL_POS(start_pos, curwin->w_cursor)
&& VIsual_active)
{
curwin->w_cursor = old_start;
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -734,6 +734,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
5012,
/**/
5011,
/**/
Expand Down

0 comments on commit 53737b5

Please sign in to comment.