kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0938: exclusive selection not respected when re-selecting block mode (#31603)

Browse Source 
Problem:  exclusive selection not respected when re-selecting block mode
          (Matt Ellis)
Solution: advance selection by another character when using
          selection=exclusive and visual block mode

fixes: vim/vim#16202
closes: vim/vim#16219

bb95589473

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-12-17 09:03:26 +08:00 committed by GitHub
parent 137308a3c9
commit 15153c4cd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/normal.c
View File

@ -5038,6 +5038,9 @@ static void nv_visual(cmdarg_T *cap)
assert(cap->count0 >= INT_MIN && cap->count0 <= INT_MAX); assert(cap->count0 >= INT_MIN && cap->count0 <= INT_MAX);
curwin->w_curswant += resel_VIsual_vcol * cap->count0 - 1; curwin->w_curswant += resel_VIsual_vcol * cap->count0 - 1;
curwin->w_cursor.lnum = lnum; curwin->w_cursor.lnum = lnum;
if (*p_sel == 'e') {
curwin->w_curswant++;
}
coladvance(curwin, curwin->w_curswant); coladvance(curwin, curwin->w_curswant);
} else { } else {
curwin->w_set_curswant = true; curwin->w_set_curswant = true;

46
test/old/testdir/test_visual.vim
View File

@ -2718,4 +2718,50 @@ func Test_visual_block_cursor_insert_enter()
bwipe! bwipe!
endfunc endfunc
func Test_visual_block_exclusive_selection()
new
set selection=exclusive
call setline(1, ['asöd asdf', 'asdf asdf', 'as€d asdf', 'asdf asdf'])
call cursor(1, 1)
exe ":norm! \<c-v>eh3j~"
call assert_equal(['ASÖd asdf', 'ASDf asdf', 'AS€d asdf', 'ASDf asdf'], getline(1, '$'))
exe ":norm! 1v~"
call assert_equal(['asöd asdf', 'asdf asdf', 'as€d asdf', 'asdf asdf'], getline(1, '$'))
bwipe!
set selection&vim
endfunc
func Test_visual_block_exclusive_selection_adjusted()
new
" Test that the end-position of the visual selection is adjusted for exclusive selection
set selection=exclusive
call setline(1, ['asöd asdf ', 'asdf asdf ', 'as€d asdf ', 'asdf asdf '])
call cursor(1, 1)
" inclusive motion
exe ":norm! \<c-v>e3jy"
call assert_equal([0, 4, 5, 0], getpos("'>"))
" exclusive motion
exe ":norm! \<c-v>ta3jy"
call assert_equal([0, 4, 6, 0], getpos("'>"))
" another inclusive motion
exe ":norm! \<c-v>g_3jy"
call assert_equal([0, 4, 10, 0], getpos("'>"))
" Reset selection option to Vim default
set selection&vim
call cursor(1, 1)
" inclusive motion
exe ":norm! \<c-v>e3jy"
call assert_equal([0, 4, 4, 0], getpos("'>"))
" exclusive motion
exe ":norm! \<c-v>ta3jy"
call assert_equal([0, 4, 5, 0], getpos("'>"))
" another inclusive motion
exe ":norm! \<c-v>g_3jy"
call assert_equal([0, 4, 9, 0], getpos("'>"))
bwipe!
set selection&vim
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab