thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0200: cursor wrong if 'nowrap' and two right aligned text props

Browse Source 
Problem:    cursor in a wrong positoin if 'wrap' is off and using two right
            aligned text props in one line.
Solution:   Count an extra line for a right aligned text property after a
            below or right aligned text property. (issue #10909)
This commit is contained in:
Bram Moolenaar
2022-08-13 19:35:05 +01:00
parent f0ccfa474a
commit 8f369fb1ab
6 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/textprop.c
View File

@@ -590,6 +590,8 @@ get_text_props(buf_T *buf, linenr_T lnum, char_u **props, int will_change)
/*
* Return the number of text properties with "below" alignment in line "lnum".
* A "right" aligned property also goes below after a "below" or other "right"
* aligned property.
*/
int
prop_count_below(buf_T *buf, linenr_T lnum)
@@ -599,14 +601,25 @@ prop_count_below(buf_T *buf, linenr_T lnum)
int result = 0;
textprop_T prop;
int i;
int next_right_goes_below = FALSE;
if (count == 0)
return 0;
for (i = 0; i < count; ++i)
{
mch_memmove(&prop, props + i * sizeof(prop), sizeof(prop));
if (prop.tp_col == MAXCOL && (prop.tp_flags & TP_FLAG_ALIGN_BELOW))
++result;
if (prop.tp_col == MAXCOL)
{
if ((prop.tp_flags & TP_FLAG_ALIGN_BELOW)
|| (next_right_goes_below
&& (prop.tp_flags & TP_FLAG_ALIGN_RIGHT)))
{
next_right_goes_below = TRUE;
++result;
}
else if (prop.tp_flags & TP_FLAG_ALIGN_RIGHT)
next_right_goes_below = TRUE;
}
}
return result;
}