aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-06 21:53:38 -04:00
Code

patch 9.0.1828: cursor wrong with virt text before double-width char

Browse Source 
Problem:  Wrong cursor position with virtual text before double-width
          char at window edge.
Solution: Check for double-width char before adding virtual text size.

closes: #12977

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
zeertzjq 2023-08-31 18:07:30 +02:00 committed by Christian Brabandt
parent e102e44fc6
commit ac2d8815ae
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/charset.c
View File

@ -1159,6 +1159,9 @@ win_lbr_chartabsize(
size = win_chartabsize(wp, s, vcol);
if (*s == NUL && !has_lcs_eol)
size = 0; // NUL is not displayed
# ifdef FEAT_LINEBREAK
int is_doublewidth = has_mbyte && size == 2 && MB_BYTE2LEN(*s) > 1;
# endif
# ifdef FEAT_PROP_POPUP
if (cts->cts_has_prop_with_text)
@ -1242,8 +1245,7 @@ win_lbr_chartabsize(
# endif
# ifdef FEAT_LINEBREAK
if (has_mbyte && size == 2 && MB_BYTE2LEN(*s) > 1
&& wp->w_p_wrap && in_win_border(wp, vcol))
if (is_doublewidth && wp->w_p_wrap && in_win_border(wp, vcol + size - 2))
{
++size; // Count the ">" in the last column.
mb_added = 1;

3
src/testdir/dumps/Test_prop_inserts_text_before_double_width_wrap_1.dump Normal file
View File

@ -0,0 +1,3 @@
|a+0&#ffffff0@39|b+0#e000e06&@8|>+0#4040ff13&
|口*0#0000000&|1+&|2|3|4>5| @42
@32|1|,|4|8|-|5|7| @6|A|l@1|

16
src/testdir/test_textprop.vim
View File

@ -2810,6 +2810,22 @@ func Test_prop_inserts_text_before_linebreak()
call StopVimInTerminal(buf)
endfunc
func Test_prop_inserts_text_before_double_width_wrap()
CheckRunVimInTerminal
let lines =<< trim END
call setline(1, repeat('a', 40) .. '口' .. '12345')
call prop_type_add('theprop', #{highlight: 'Special'})
call prop_add(1, 41, #{type: 'theprop', text: repeat('b', 9)})
normal! $
END
call writefile(lines, 'XscriptPropsBeforeDoubleWidthWrap', 'D')
let buf = RunVimInTerminal('-S XscriptPropsBeforeDoubleWidthWrap', #{rows: 3, cols: 50})
call VerifyScreenDump(buf, 'Test_prop_inserts_text_before_double_width_wrap_1', {})
call StopVimInTerminal(buf)
endfunc
func Test_prop_inserts_text_lcs_extends()
CheckRunVimInTerminal

2
src/version.c
View File

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