aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-23 08:44:20 -04:00
Code Activity

patch 9.1.1796: Wrong cursor position with wrapped "after" virtual text and 'sbr'

Browse Source 
Problem:  Wrong cursor position with wrapped "after" virtual text and
          'showbreak' (Ben Jackson)
Solution: Count size of 'showbreak' in wrapped "after" virtual text in
          line size (zeertzjq).

fixes: #18398
closes: #18400

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2025-09-26 17:00:10 +00:00
committed by Christian Brabandt
parent 4aa4a56909
commit 3fc1f2a00e
17 changed files with 197 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/drawline.c
View File

@@ -829,6 +829,23 @@ text_prop_position(
return cells;
return (below && col_with_padding > win_col_off(wp) && !wp->w_p_wrap);
}
# if defined(FEAT_LINEBREAK) || defined(PROTO)
/*
* no 'showbreak' before "below" text property
* or after "above" or "right" text property
*/
int
text_prop_no_showbreak(textprop_T *tp)
{
int right = (tp->tp_flags & TP_FLAG_ALIGN_RIGHT);
int above = (tp->tp_flags & TP_FLAG_ALIGN_ABOVE);
int below = (tp->tp_flags & TP_FLAG_ALIGN_BELOW);
int wrap = tp->tp_col < MAXCOL || (tp->tp_flags & TP_FLAG_WRAP);
return (right || above || below || !wrap);
}
# endif
#endif
/*
@@ -2258,10 +2275,8 @@ win_line(
// don't combine char attr after EOL
text_prop_flags &= ~PT_FLAG_COMBINE;
# ifdef FEAT_LINEBREAK
if (above || below || right || !wrap)
if (text_prop_no_showbreak(tp))
{
// no 'showbreak' before "below" text property
// or after "above" or "right" text property
wlv.need_showbreak = FALSE;
wlv.dont_use_showbreak = TRUE;
}