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

patch 9.1.0174: 'cursorline' and 'wincolor' hl missing with conceal and wrap

Browse Source 
Problem:  'cursorline' and 'wincolor' highlight missing with concealed and
          wrapped lines.
Solution: Apply 'cursorline' and 'wincolor' highlight to boguscols.
          (zeertzjq)

Since 'cursorline' and 'wincolor' highlight apply after the end of the
line, it is more consistent to have them also apply to boguscols.

Assigning MAXCOL to values in ScreenCols[] make mouse click behave the
same with 'cursorline' and 'nocursorline', but such behavior may be
incorrect, as it puts the cursor on the next screen line.  That may be
fixed in a future PR.

closes: #14192

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-03-13 20:06:34 +01:00
committed by Christian Brabandt
parent 760f664213
commit 21b0a3df8c
9 changed files with 118 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/drawline.c
View File

@@ -4121,6 +4121,47 @@ win_line(
{
#ifdef FEAT_CONCEAL
wlv.col -= wlv.boguscols;
// Apply 'cursorline' and 'wincolor' highlight.
if (wlv.boguscols != 0 && (
# ifdef LINE_ATTR
wlv.line_attr != 0 ||
# endif
wlv.win_attr != 0
)
)
{
int attr = wlv.win_attr;
# ifdef LINE_ATTR
if (wlv.line_attr != 0)
attr = hl_combine_attr(attr, wlv.line_attr);
# endif
while ((
# ifdef FEAT_RIGHTLEFT
wp->w_p_rl ? wlv.col >= 0 :
# endif
wlv.col < wp->w_width))
{
ScreenLines[wlv.off] = ' ';
if (enc_utf8)
ScreenLinesUC[wlv.off] = 0;
ScreenAttrs[wlv.off] = attr;
ScreenCols[wlv.off] = MAXCOL; // TODO: this is wrong
# ifdef FEAT_RIGHTLEFT
if (wp->w_p_rl)
{
wlv.off--;
wlv.col--;
wlv.boguscols++;
}
else
# endif
{
wlv.off++;
wlv.col++;
wlv.boguscols--;
}
}
}
wlv_screen_line(wp, &wlv, FALSE);
wlv.col += wlv.boguscols;
wlv.boguscols = 0;