Mercurial > vim
changeset 28980:42e3dfd5b2d6 v8.2.5012
patch 8.2.5012: cannot select one character inside ()
Commit: https://github.com/vim/vim/commit/53737b5eeeab1f95964f78b055d6094fab559533
Author: LemonBoy <thatlemon@gmail.com>
Date: Tue May 24 11:49:31 2022 +0100
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 https://github.com/vim/vim/issues/10472,
closes #6616)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 24 May 2022 13:00:04 +0200 |
parents | b49306ac0c96 |
children | 2903e0cd8463 |
files | src/testdir/test_textobjects.vim src/textobject.c src/version.c |
diffstat | 3 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_textobjects.vim +++ b/src/testdir/test_textobjects.vim @@ -41,6 +41,24 @@ func Test_inner_block_with_cpo_M_right_b 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") @@ -49,11 +67,11 @@ func Test_quote_selection_selection_excl 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', @")
--- a/src/textobject.c +++ b/src/textobject.c @@ -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;