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

patch 9.1.0179: 'wincolor' highlight missing with "below" virtual text

Browse Source 
Problem:  'wincolor' highlight missing with "below" virtual text.
Solution: Subtract n_attr_skip from n_attr.  Combine 'wincolor' with
          other highlights when 'nowrap' is set. (zeertzjq)

closes: #14196

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-03-14 18:16:56 +01:00
committed by Christian Brabandt
parent 45da32964d
commit 9352c28292
11 changed files with 129 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/drawline.c
View File

@@ -812,12 +812,12 @@ text_prop_position(
*p_extra = l;
*n_extra = n_used + before + after + padding;
*n_attr = mb_charlen(*p_extra);
if (above)
*n_attr -= padding + after;
// n_attr_skip will not be decremented before draw_state is
// WL_LINE
*n_attr_skip = before + (padding > 0 ? padding : 0);
*n_attr -= *n_attr_skip;
if (above)
*n_attr -= after;
}
}
}
@@ -946,14 +946,15 @@ draw_screen_line(win_T *wp, winlinevars_T *wlv)
VCOL_HLC, &wlv->color_cols);
int attr = wlv->win_attr;
if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol)
attr = HL_ATTR(HLF_CUC);
else if (wlv->draw_color_col && VCOL_HLC == *wlv->color_cols)
attr = HL_ATTR(HLF_MC);
# ifdef LINE_ATTR
else if (wlv->line_attr != 0)
attr = wlv->line_attr;
if (wlv->line_attr != 0)
attr = hl_combine_attr(attr, wlv->line_attr);
# endif
if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol
&& wlv->lnum != wp->w_cursor.lnum)
attr = hl_combine_attr(attr, HL_ATTR(HLF_CUC));
else if (wlv->draw_color_col && VCOL_HLC == *wlv->color_cols)
attr = hl_combine_attr(attr, HL_ATTR(HLF_MC));
ScreenAttrs[wlv->off++] = attr;
if (VCOL_HLC >= rightmost_vcol

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

@@ -0,0 +1,8 @@
>s+0&#ffd7ff255|o|m|e| |t|e|x|t| |h|e|r|e| @45
@3|B+0&#5fd7ff255|E|L|O|W| +0&#ffd7ff255@51
|s|o|m|e| |m|u|c|h| |l|o|n|g|e|r| |t|e|x|t| |h|e|r|e| @33
|m|o|r|e| |t|e|x|t| |h|e|r|e| @2|A+0&#ffff4012|F|T|E|R| +0&#ffd7ff255@37
|~+0#4040ff13&| @58
|~| @58
|~| @58
|:+0#0000000#ffffff0| @40|1|,|1| @10|A|l@1|

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

@@ -0,0 +1,8 @@
>s+8&#ffd7ff255|o|m|e| |t|e|x|t| |h|e|r|e| @45
@3|B+8&#5fd7ff255|E|L|O|W| +8&#ffd7ff255@51
|s+0&&|o|m|e| |m|u|c|h| |l|o|n|g|e|r| |t|e|x|t| |h|e|r|e| @33
|m|o|r|e| |t|e|x|t| |h|e|r|e| @2|A+0&#ffff4012|F|T|E|R| +0&#ffd7ff255@37
|~+0#4040ff13&| @58
|~| @58
|~| @58
|:+0#0000000#ffffff0| @40|1|,|1| @10|A|l@1|

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

@@ -0,0 +1,8 @@
>s+8&#ffd7ff255|o|m|e| |t|e|x|t| |h|e|r|e| @14| +8&#ffd7d7255| +8&#ffd7ff255@29
@3|B+8&#5fd7ff255|E|L|O|W| +8&#ffd7ff255@51
|s+0&&|o|m|e| |m|u|c|h| |l|o|n|g|e|r| |t|e|x|t| |h|e|r|e| @2| +0&#ffd7d7255| +0&#ffd7ff255@29
|m|o|r|e| |t|e|x|t| |h|e|r|e| @2|A+0&#ffff4012|F|T|E|R| +0&#ffd7ff255@6| +0&#ffd7d7255| +0&#ffd7ff255@29
|~+0#4040ff13&| @58
|~| @58
|~| @58
|:+0#0000000#ffffff0| @40|1|,|1| @10|A|l@1|

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

@@ -0,0 +1,8 @@
>s+8&#af5f00255|o|m|e| |t|e|x|t| |h|e|r|e| @14| +8&#ffd7d7255| +8&#af5f00255@29
@3|B+8&#5fd7ff255|E|L|O|W| +8&#af5f00255@51
|s+0&#ffd7ff255|o|m|e| |m|u|c|h| |l|o|n|g|e|r| |t|e|x|t| |h|e|r|e| @2| +0&#ffd7d7255| +0&#ffd7ff255@29
|m|o|r|e| |t|e|x|t| |h|e|r|e| @2|A+0&#ffff4012|F|T|E|R| +0&#ffd7ff255@6| +0&#ffd7d7255| +0&#ffd7ff255@29
|~+0#4040ff13&| @58
|~| @58
|~| @58
|:+0#0000000#ffffff0| @40|1|,|1| @10|A|l@1|

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

@@ -0,0 +1,8 @@
|s+8&#af5f00255|o|m|e| |t|e|x|t| |h|e|r>e| @14| +8&#ffd7d7255| +8&#af5f00255@29
@3|B+8&#5fd7ff255|E|L|O|W| +8&#af5f00255@51
|s+0&#ffd7ff255|o|m|e| |m|u|c|h| |l|o|n|g+0&#e0e0e08|e+0&#ffd7ff255|r| |t|e|x|t| |h|e|r|e| @2| +0&#ffd7d7255| +0&#ffd7ff255@29
|m|o|r|e| |t|e|x|t| |h|e|r|e+0&#e0e0e08| +0&#ffd7ff255@2|A+0&#ffff4012|F|T|E|R| +0&#ffd7ff255@6| +0&#ffd7d7255| +0&#ffd7ff255@29
|~+0#4040ff13&| @58
|~| @58
|~| @58
|:+0#0000000#ffffff0| @40|1|,|1|4| @9|A|l@1|

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

@@ -0,0 +1,8 @@
|s+0&#ffd7ff255|o|m|e| |t|e|x|t| |h|e|r|e| @10| +0&#e0e0e08| +0&#ffd7ff255@2| +0&#ffd7d7255| +0&#ffd7ff255@29
@3|B+0&#5fd7ff255|E|L|O|W| +0&#ffd7ff255@51
|s+8&#af5f00255|o|m|e| |m|u|c|h| |l|o|n|g|e|r| |t|e|x|t| |h|e|r>e| @2| +8&#ffd7d7255| +8&#af5f00255@29
|m+0&#ffd7ff255|o|r|e| |t|e|x|t| |h|e|r|e| @2|A+0&#ffff4012|F|T|E|R| +0&#ffd7ff255@2| +0&#e0e0e08| +0&#ffd7ff255@2| +0&#ffd7d7255| +0&#ffd7ff255@29
|~+0#4040ff13&| @58
|~| @58
|~| @58
|:+0#0000000#ffffff0| @40|2|,|2|6| @9|A|l@1|

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

@@ -0,0 +1,8 @@
|s+0&#ffd7ff255|o|m|e| |t|e|x|t| |h|e|r|e| @11| +0&#e0e0e08| +0&#ffd7ff255@1| +0&#ffd7d7255| +0&#ffd7ff255@29
@3|B+0&#5fd7ff255|E|L|O|W| +0&#ffd7ff255@51
|s+8&#af5f00255|o|m|e| |m|u|c|h| |l|o|n|g|e|r| |t|e|x|t| |h|e|r|e> @2| +8&#ffd7d7255| +8&#af5f00255@29
|m+0&#ffd7ff255|o|r|e| |t|e|x|t| |h|e|r|e| @2|A+0&#ffff4012|F|T|E|R| +0&#ffd7ff255@3| +0&#e0e0e08| +0&#ffd7ff255@1| +0&#ffd7d7255| +0&#ffd7ff255@29
|~+0#4040ff13&| @58
|~| @58
|~| @58
|:+0#0000000#ffffff0| @40|2|,|2|7| @9|A|l@1|

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

@@ -0,0 +1,8 @@
|s+8&#af5f00255|o|m|e| |t|e|x|t| |h|e|r|e| @11> @2| +8&#ffd7d7255| +8&#af5f00255@29
@3|B+8&#5fd7ff255|E|L|O|W| +8&#af5f00255@51
|s+0&#ffd7ff255|o|m|e| |m|u|c|h| |l|o|n|g|e|r| |t|e|x|t| |h|e|r|e| +0&#e0e0e08| +0&#ffd7ff255@1| +0&#ffd7d7255| +0&#ffd7ff255@29
|m|o|r|e| |t|e|x|t| |h|e|r|e| @2|A+0&#ffff4012|F|T|E|R| +0&#ffd7ff255@3| +0&#e0e0e08| +0&#ffd7ff255@1| +0&#ffd7d7255| +0&#ffd7ff255@29
|~+0#4040ff13&| @58
|~| @58
|~| @58
|:+0#0000000#ffffff0| @40|1|,|1|5|-|2|7| @6|A|l@1|

53
src/testdir/test_textprop.vim
View File

@@ -4485,4 +4485,57 @@ func Test_textprop_backspace_fo_aw()
call prop_type_delete('test')
endfunc
func Test_textprop_with_wincolor()
CheckRunVimInTerminal
let lines =<< trim END
call setline(1, 'some text here')
call setline(2, 'some much longer text here')
call setline(3, 'more text here')
call prop_type_add('afterprop', #{highlight: 'Search'})
call prop_type_add('belowprop', #{highlight: 'DiffAdd'})
call prop_add(3, 0, #{type: 'afterprop', text: 'AFTER',
\ text_align: 'after', text_padding_left: 3})
call prop_add(1, 0, #{type: 'belowprop', text: 'BELOW',
\ text_align: 'below', text_padding_left: 3})
set wincolor=DiffChange wrap
END
call writefile(lines, 'XtextPropWincolor', 'D')
let buf = RunVimInTerminal('-S XtextPropWincolor', #{rows: 8, cols: 60})
call term_sendkeys(buf, ":\<CR>")
call VerifyScreenDump(buf, 'Test_prop_wincolor_1', {})
call term_sendkeys(buf, ":set cursorline\<CR>:\<CR>")
call VerifyScreenDump(buf, 'Test_prop_wincolor_2', {})
call term_sendkeys(buf, ":set nowrap\<CR>:\<CR>")
call VerifyScreenDump(buf, 'Test_prop_wincolor_2', {})
call term_sendkeys(buf, ":set nocursorline\<CR>:\<CR>")
call VerifyScreenDump(buf, 'Test_prop_wincolor_1', {})
call term_sendkeys(buf, ":set cursorline colorcolumn=30\<CR>:\<CR>")
call VerifyScreenDump(buf, 'Test_prop_wincolor_3', {})
call term_sendkeys(buf, ":hi CursorLine ctermbg=Brown\<CR>:\<CR>")
call VerifyScreenDump(buf, 'Test_prop_wincolor_4', {})
call term_sendkeys(buf, ":set cursorcolumn\<CR>:\<CR>")
call term_sendkeys(buf, '$')
call VerifyScreenDump(buf, 'Test_prop_wincolor_5', {})
call term_sendkeys(buf, 'j')
call VerifyScreenDump(buf, 'Test_prop_wincolor_6', {})
call term_sendkeys(buf, ":set virtualedit=all\<CR>:\<CR>")
call term_sendkeys(buf, 'l')
call VerifyScreenDump(buf, 'Test_prop_wincolor_7', {})
call term_sendkeys(buf, 'k')
call VerifyScreenDump(buf, 'Test_prop_wincolor_8', {})
call StopVimInTerminal(buf)
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

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