Mercurial > vim

comparison src/textprop.c @ 34686:83875247fbc0 v9.1.0224

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15 Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com> Date: Thu Mar 28 12:01:14 2024 +0100 patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text 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>
author Christian Brabandt <cb@256bit.org>
date Thu, 28 Mar 2024 12:15:03 +0100
parents 9e093c96dff6
children
comparison
equal deleted inserted replaced
34685:ddbb90409b47 34686:83875247fbc0
670 for (i = 0; i < count; ++i) 670 for (i = 0; i < count; ++i)
671 { 671 {
672 mch_memmove(&prop, props + i * sizeof(prop), sizeof(prop)); 672 mch_memmove(&prop, props + i * sizeof(prop), sizeof(prop));
673 if (prop.tp_col == MAXCOL && text_prop_type_valid(buf, &prop)) 673 if (prop.tp_col == MAXCOL && text_prop_type_valid(buf, &prop))
674 { 674 {
675 if ((prop.tp_flags & TP_FLAG_ALIGN_BELOW) 675 if ((prop.tp_flags & (TP_FLAG_ALIGN_ABOVE | TP_FLAG_ALIGN_BELOW))
676 || (next_right_goes_below 676 || (next_right_goes_below
677 && (prop.tp_flags & TP_FLAG_ALIGN_RIGHT))) 677 && (prop.tp_flags & TP_FLAG_ALIGN_RIGHT)))
678 { 678 {
679 next_right_goes_below = TRUE;
680 ++result;
681 }
682 else if (prop.tp_flags & TP_FLAG_ALIGN_ABOVE)
683 {
684 next_right_goes_below = FALSE;
685 ++result; 679 ++result;
686 } 680 }
687 else if (prop.tp_flags & TP_FLAG_ALIGN_RIGHT) 681 else if (prop.tp_flags & TP_FLAG_ALIGN_RIGHT)
688 next_right_goes_below = TRUE; 682 next_right_goes_below = TRUE;
689 } 683 }