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

patch 9.0.1325: 'colorcolumn' highlight wrong with virtual text above

Browse Source 
Problem:    'colorcolumn' highlight wrong with virtual text above.
Solution:   Adjust column of 'colorcolumn' for text propertly. (closes #12004)
This commit is contained in:
Bram Moolenaar
2023-02-19 14:16:02 +00:00
parent 441a7a9448
commit f53e065bce
4 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/drawline.c
View File

@@ -96,8 +96,9 @@ typedef struct {
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
int boguscols; // nonexistent columns added to "col" to force int boguscols; // nonexistent columns added to "col" to force
// wrapping // wrapping
int vcol_off; // offset for concealed characters int vcol_off_co; // offset for concealed characters
#endif #endif
int vcol_off_tp; // offset for virtual text
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
int draw_color_col; // highlight colorcolumn int draw_color_col; // highlight colorcolumn
int *color_cols; // pointer to according columns array int *color_cols; // pointer to according columns array
@@ -839,9 +840,9 @@ draw_screen_line(win_T *wp, winlinevars_T *wlv)
// edge for 'cursorcolumn'. // edge for 'cursorcolumn'.
wlv->col -= wlv->boguscols; wlv->col -= wlv->boguscols;
wlv->boguscols = 0; wlv->boguscols = 0;
# define VCOL_HLC (wlv->vcol - wlv->vcol_off) # define VCOL_HLC (wlv->vcol - wlv->vcol_off_co - wlv->vcol_off_tp)
# else # else
# define VCOL_HLC (wlv->vcol) # define VCOL_HLC (wlv->vcol - wlv->vcol_off_tp)
# endif # endif
if (wlv->draw_color_col) if (wlv->draw_color_col)
@@ -1177,18 +1178,18 @@ win_line(
int is_concealing = FALSE; int is_concealing = FALSE;
int did_wcol = FALSE; int did_wcol = FALSE;
int old_boguscols = 0; int old_boguscols = 0;
# define VCOL_HLC (wlv.vcol - wlv.vcol_off) # define VCOL_HLC (wlv.vcol - wlv.vcol_off_co - wlv.vcol_off_tp)
# define FIX_FOR_BOGUSCOLS \ # define FIX_FOR_BOGUSCOLS \
{ \ { \
wlv.n_extra += wlv.vcol_off; \ wlv.n_extra += wlv.vcol_off_co; \
wlv.vcol -= wlv.vcol_off; \ wlv.vcol -= wlv.vcol_off_co; \
wlv.vcol_off = 0; \ wlv.vcol_off_co = 0; \
wlv.col -= wlv.boguscols; \ wlv.col -= wlv.boguscols; \
old_boguscols = wlv.boguscols; \ old_boguscols = wlv.boguscols; \
wlv.boguscols = 0; \ wlv.boguscols = 0; \
} }
#else #else
# define VCOL_HLC (wlv.vcol) # define VCOL_HLC (wlv.vcol - wlv.vcol_off_tp)
#endif #endif
if (startrow > endrow) // past the end already! if (startrow > endrow) // past the end already!
@@ -1864,7 +1865,8 @@ win_line(
// When only displaying the (relative) line number and that's done, // When only displaying the (relative) line number and that's done,
// stop here. // stop here.
if (((dollar_vcol >= 0 && wp == curwin if (((dollar_vcol >= 0 && wp == curwin
&& lnum == wp->w_cursor.lnum && wlv.vcol >= (long)wp->w_virtcol) && lnum == wp->w_cursor.lnum
&& wlv.vcol >= (long)wp->w_virtcol)
|| (number_only && wlv.draw_state > WL_NR)) || (number_only && wlv.draw_state > WL_NR))
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
&& wlv.filler_todo <= 0 && wlv.filler_todo <= 0
@@ -2123,6 +2125,9 @@ win_line(
p_extra_free2 = wlv.p_extra; p_extra_free2 = wlv.p_extra;
} }
if (above)
wlv.vcol_off_tp = wlv.n_extra;
if (lcs_eol_one < 0 if (lcs_eol_one < 0
&& wp->w_p_wrap && wp->w_p_wrap
&& wlv.col && wlv.col
@@ -2991,9 +2996,9 @@ win_line(
int saved_nextra = wlv.n_extra; int saved_nextra = wlv.n_extra;
# ifdef FEAT_CONCEAL # ifdef FEAT_CONCEAL
if (wlv.vcol_off > 0) if (wlv.vcol_off_co > 0)
// there are characters to conceal // there are characters to conceal
tab_len += wlv.vcol_off; tab_len += wlv.vcol_off_co;
// boguscols before FIX_FOR_BOGUSCOLS macro from above // boguscols before FIX_FOR_BOGUSCOLS macro from above
if (wp->w_p_list && wp->w_lcs_chars.tab1 if (wp->w_p_list && wp->w_lcs_chars.tab1
@@ -3047,8 +3052,8 @@ win_line(
// n_extra will be increased by // n_extra will be increased by
// FIX_FOX_BOGUSCOLS macro below, so need to // FIX_FOX_BOGUSCOLS macro below, so need to
// adjust for that here // adjust for that here
if (wlv.vcol_off > 0) if (wlv.vcol_off_co > 0)
wlv.n_extra -= wlv.vcol_off; wlv.n_extra -= wlv.vcol_off_co;
# endif # endif
} }
} }
@@ -3056,12 +3061,12 @@ win_line(
#endif #endif
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
{ {
int vc_saved = wlv.vcol_off; int vc_saved = wlv.vcol_off_co;
// Tab alignment should be identical regardless of // Tab alignment should be identical regardless of
// 'conceallevel' value. So tab compensates of all // 'conceallevel' value. So tab compensates of all
// previous concealed characters, and thus resets // previous concealed characters, and thus resets
// vcol_off and boguscols accumulated so far in the // vcol_off_co and boguscols accumulated so far in the
// line. Note that the tab can be longer than // line. Note that the tab can be longer than
// 'tabstop' when there are concealed characters. // 'tabstop' when there are concealed characters.
FIX_FOR_BOGUSCOLS; FIX_FOR_BOGUSCOLS;
@@ -3326,7 +3331,7 @@ win_line(
prev_syntax_id = syntax_seqnr; prev_syntax_id = syntax_seqnr;
if (wlv.n_extra > 0) if (wlv.n_extra > 0)
wlv.vcol_off += wlv.n_extra; wlv.vcol_off_co += wlv.n_extra;
wlv.vcol += wlv.n_extra; wlv.vcol += wlv.n_extra;
if (wp->w_p_wrap && wlv.n_extra > 0) if (wp->w_p_wrap && wlv.n_extra > 0)
{ {
@@ -3800,9 +3805,9 @@ win_line(
else if (wp->w_p_cole > 0 && is_concealing) else if (wp->w_p_cole > 0 && is_concealing)
{ {
--n_skip; --n_skip;
++wlv.vcol_off; ++wlv.vcol_off_co;
if (wlv.n_extra > 0) if (wlv.n_extra > 0)
wlv.vcol_off += wlv.n_extra; wlv.vcol_off_co += wlv.n_extra;
if (wp->w_p_wrap) if (wp->w_p_wrap)
{ {
// Special voodoo required if 'wrap' is on. // Special voodoo required if 'wrap' is on.
@@ -3895,7 +3900,7 @@ win_line(
wlv.char_attr = vcol_save_attr; wlv.char_attr = vcol_save_attr;
#endif #endif
// restore attributes after "predeces" in 'listchars' // restore attributes after "precedes" in 'listchars'
if (wlv.draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) if (wlv.draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0)
wlv.char_attr = saved_attr3; wlv.char_attr = saved_attr3;
@@ -3932,7 +3937,7 @@ win_line(
wlv_screen_line(wp, &wlv, FALSE); wlv_screen_line(wp, &wlv, FALSE);
wlv.col += wlv.boguscols; wlv.col += wlv.boguscols;
wlv.boguscols = 0; wlv.boguscols = 0;
wlv.vcol_off = 0; wlv.vcol_off_co = 0;
#else #else
wlv_screen_line(wp, &wlv, FALSE); wlv_screen_line(wp, &wlv, FALSE);
#endif #endif

16
src/testdir/dumps/Test_prop_above_below_empty_3.dump Normal file
View File

@@ -0,0 +1,16 @@
| +0#af5f00255#ffffff0@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
| +0#af5f00255&@1|1| |1+0#0000000&@7| | +0&#ffd7d7255| +0&#ffffff0@45
| +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
| +0#af5f00255&@1|2| | +0#0000000&@8| +0&#ffd7d7255| +0&#ffffff0@45
| +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
| +0#af5f00255&@1|3| |3+0#0000000&@8| +0&#ffd7d7255| +0&#ffffff0@45
| +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
| +0#af5f00255&@1|4| | +0#0000000&@8| +0&#ffd7d7255| +0&#ffffff0@45
| +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
| +0#af5f00255&@1|5| >5+0#0000000&@8|5+0&#ffd7d7255|5+0&#ffffff0| @44
| +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
|:| @40|5|,|1|-|5|7| @7|A|l@1|

5
src/testdir/test_textprop.vim
View File

@@ -2801,6 +2801,11 @@ func Test_prop_with_text_above_below_empty()
call term_sendkeys(buf, ":set list\<CR>") call term_sendkeys(buf, ":set list\<CR>")
call VerifyScreenDump(buf, 'Test_prop_above_below_empty_2', {}) call VerifyScreenDump(buf, 'Test_prop_above_below_empty_2', {})
call term_sendkeys(buf, ":set nolist\<CR>")
call term_sendkeys(buf, ":set colorcolumn=10\<CR>")
call term_sendkeys(buf, ":\<CR>")
call VerifyScreenDump(buf, 'Test_prop_above_below_empty_3', {})
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc

2
src/version.c
View File

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