aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.2.3095: with 'virtualedit' set to "block" block selection is wrong

Browse Source 
Problem:    With 'virtualedit' set to "block" block selection is wrong after
            using "$".  (Marco Trosi)
Solution:   Compute the longest selected line. (closes #8495)
This commit is contained in:
Bram Moolenaar
2021-07-03 22:15:17 +02:00
parent c60e959cba
commit b17ab86e7b
4 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/drawscreen.c
View File

@@ -2009,14 +2009,41 @@ win_update(win_T *wp)
ve_flags = VE_ALL;
#endif
getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc);
++toc;
#if defined(FEAT_LINEBREAK)
ve_flags = save_ve_flags;
#endif
++toc;
// Highlight to the end of the line, unless 'virtualedit' has
// "block".
if (curwin->w_curswant == MAXCOL && !(ve_flags & VE_BLOCK))
if (curwin->w_curswant == MAXCOL)
{
if (ve_flags & VE_BLOCK)
{
pos_T pos;
int cursor_above =
curwin->w_cursor.lnum < VIsual.lnum;
// Need to find the longest line.
toc = 0;
pos.coladd = 0;
for (pos.lnum = curwin->w_cursor.lnum; cursor_above
? pos.lnum <= VIsual.lnum
: pos.lnum >= VIsual.lnum;
pos.lnum += cursor_above ? 1 : -1)
{
colnr_T t;
pos.col = STRLEN(ml_get_buf(wp->w_buffer,
pos.lnum, FALSE));
getvvcol(wp, &pos, NULL, NULL, &t);
if (toc < t)
toc = t;
}
++toc;
}
else
toc = MAXCOL;
}
if (fromc != wp->w_old_cursor_fcol
|| toc != wp->w_old_cursor_lcol)

8
src/testdir/dumps/Test_visual_block_with_virtualedit2.dump Normal file
View File

@@ -0,0 +1,8 @@
|a+0&#e0e0e08@5| | +0&#ffffff0@42
|b+0&#e0e0e08@3| @2| +0&#ffffff0@42
|c+0&#e0e0e08@1> +0&#ffffff0| +0&#e0e0e08@3| +0&#ffffff0@42
|~+0#4040ff13&| @48
|~| @48
|~| @48
|~| @48
|-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@3|3|x|3| @6|3|,|3| @10|A|l@1|

3
src/testdir/test_visual.vim
View File

@@ -1256,6 +1256,9 @@ func Test_visual_block_with_virtualedit()
call term_sendkeys(buf, "\<C-V>gg$")
call VerifyScreenDump(buf, 'Test_visual_block_with_virtualedit', {})
call term_sendkeys(buf, "\<Esc>gg\<C-V>G$")
call VerifyScreenDump(buf, 'Test_visual_block_with_virtualedit2', {})
" clean up
call term_sendkeys(buf, "\<Esc>")
call StopVimInTerminal(buf)

2
src/version.c
View File

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