diff options
| author | Dylan Thacker-Smith <dylan.ah.smith@gmail.com> | 2024-03-28 12:01:14 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-28 12:01:14 +0100 |
| commit | 515f734e687f28f7199b2a8042197624d9f3ec15 (patch) | |
| tree | b104cdc79db892bf96c7ae2f3b56eaf51f899ffb /src/textprop.c | |
| parent | 1134fdd1b369119d0d6992e3120bb5f7c788b697 (diff) | |
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt textv9.1.0224
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src/textprop.c')
| -rw-r--r-- | src/textprop.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/textprop.c b/src/textprop.c index a976570189..83c42a371c 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -672,16 +672,10 @@ prop_count_above_below(buf_T *buf, linenr_T lnum) mch_memmove(&prop, props + i * sizeof(prop), sizeof(prop)); if (prop.tp_col == MAXCOL && text_prop_type_valid(buf, &prop)) { - if ((prop.tp_flags & TP_FLAG_ALIGN_BELOW) + if ((prop.tp_flags & (TP_FLAG_ALIGN_ABOVE | 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_ABOVE) - { - next_right_goes_below = FALSE; ++result; } else if (prop.tp_flags & TP_FLAG_ALIGN_RIGHT) |