aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00
Code

patch 9.0.0518: virtual text highlight starts too early with 'nowrap'

Browse Source 
Problem:    Virtual text highlight starts too early with 'nowrap' and 'number'
            set.
Solution:   Add the offset to the attribute skip count. (issue #11138)
This commit is contained in:
Bram Moolenaar 2022-09-20 17:57:53 +01:00
parent 320d910064
commit b84d565c62
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/drawline.c
View File

@ -335,7 +335,6 @@ text_prop_position(
int padding = tp->tp_col == MAXCOL && tp->tp_len > 1
? tp->tp_len - 1 : 0;
int col_with_padding = vcol + (below ? 0 : padding);
int col_off = 0;
int room = wp->w_width - col_with_padding;
int before = room; // spaces before the text
int after = 0; // spaces after the text
@ -347,6 +346,9 @@ text_prop_position(
if (wrap || right || above || below || padding > 0 || n_used < *n_extra)
{
int col_off = win_col_off(wp) + win_col_off2(wp);
int skip_add = 0;
if (above)
{
before = 0;
@ -366,19 +368,19 @@ text_prop_position(
if (right && (wrap || room < PROP_TEXT_MIN_CELLS))
{
// right-align on next line instead of wrapping if possible
col_off = win_col_off(wp) + win_col_off2(wp);
before = wp->w_width - col_off - strsize + room;
if (before < 0)
before = 0;
else
n_used = *n_extra;
skip_add = col_off;
}
else
before = 0;
}
else if (below && before > 0)
// include 'number' column et al.
col_off = win_col_off(wp) + win_col_off2(wp);
skip_add = col_off;
}
// With 'nowrap' add one to show the "extends" character if needed (it
@ -388,6 +390,8 @@ text_prop_position(
&& wp->w_lcs_chars.ext != NUL
&& wp->w_p_list)
++n_used;
if (!wp->w_p_wrap && below && padding > 0)
skip_add = col_off;
// add 1 for NUL, 2 for when '…' is used
if (n_attr != NULL)
@ -441,7 +445,7 @@ text_prop_position(
*n_attr = mb_charlen(*p_extra);
if (above)
*n_attr -= padding + after;
*n_attr_skip = before + padding + col_off;
*n_attr_skip = before + padding + skip_add;
}
}
}

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

@ -0,0 +1,8 @@
| +0#af5f00255#ffffff0@1|1| |o+0#0000000&|n|e| |o|n|e| |o|n|e| @59
| +0#af5f00255&@1|2| |t+0#0000000&|w|o| |t|w|o| |t|w|o| @59
| +0#af5f00255&@3| +0#0000000&@2|└+0&#ffff4012|─| |V|i|r|t|u|a|l| |t|e|x|t| |b|e|l|o|w| |t|h|e| |2|n|d| |l|i|n|e| +0&#ffffff0@33
| +0#af5f00255&@1|3| |x+0#0000000&>x| @68
| +0#af5f00255&@1|4| |t+0#0000000&|h|r|e@1| |t|h|r|e@1| |t|h|r|e@1| @53
|~+0#4040ff13&| @73
|~| @73
|:+0#0000000&|s|e|t| |n|o|w|r|a|p| @45|3|,|2| @10|A|l@1|

3
src/testdir/test_textprop.vim
View File

@ -2925,6 +2925,9 @@ func Test_prop_below_split_line()
call term_sendkeys(buf, "\<Esc>:set number\<CR>")
call VerifyScreenDump(buf, 'Test_prop_below_split_line_2', {})
call term_sendkeys(buf, ":set nowrap\<CR>")
call VerifyScreenDump(buf, 'Test_prop_below_split_line_3', {})
call StopVimInTerminal(buf)
endfunc

2
src/version.c
View File

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