patch 9.0.1305: cursor in wrong line with virtual text above

Problem:    Cursor in wrong line with virtual text above.
Solution:   Count extra line for text property above/below. (closes #11959)

diff --git a/src/charset.c b/src/charset.c
index ebec2cf40175b25a7a266c30eface7873f7c28e1..3ce95c7f417ed24775cffdba517d9d81415616af 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -813,6 +813,11 @@ win_linetabsize_cts(chartabsize_T *cts, colnr_T len)
     {
        (void)win_lbr_chartabsize(cts, NULL);
        cts->cts_vcol += cts->cts_cur_text_width;
+
+       // when properties are above or below the empty line must also be
+       // counted
+       if (cts->cts_prop_lines > 0)
+           ++cts->cts_vcol;
     }
 #endif
 }
@@ -1217,6 +1222,10 @@ win_lbr_chartabsize(
                        tab_size = win_chartabsize(wp, s, vcol + size);
                        size += tab_size;
                    }
+                   if (tp->tp_col == MAXCOL && (tp->tp_flags
+                               & (TP_FLAG_ALIGN_ABOVE | TP_FLAG_ALIGN_BELOW)))
+                       // count extra line for property above/below
+                       ++cts->cts_prop_lines;
                }
            }
            if (tp->tp_col != MAXCOL && tp->tp_col - 1 > col)

diff --git a/src/structs.h b/src/structs.h
index 1c7a5278842a725377771fa23b414badf7a25874..a320d7069d427d2679e51d38b5c42462274acf15 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -4781,6 +4781,7 @@ typedef struct {
     textprop_T *cts_text_props;        // text props (allocated)
     char       cts_has_prop_with_text; // TRUE if if a property inserts text
     int                cts_cur_text_width;     // width of current inserted text
+    int                cts_prop_lines;         // nr of properties above or below
     int                cts_first_char;         // width text props above the line
     int                cts_with_trailing;      // include size of trailing props with
                                        // last character

diff --git a/src/testdir/dumps/Test_prop_above_empty_1.dump b/src/testdir/dumps/Test_prop_above_empty_1.dump
new file mode 100644 (file)
index 0000000..721d0c3
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_above_empty_1.dump
@@ -0,0 +1,16 @@
+| +0#af5f00255#ffffff0@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+| +0#af5f00255&@1|1| |1+0#0000000&@7| @47
+| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+| +0#af5f00255&@1|2| | +0#0000000&@55
+| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+| +0#af5f00255&@1|3| |3+0#0000000&@8| @46
+| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+| +0#af5f00255&@1|4| | +0#0000000&@55
+| +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+| +0#af5f00255&@1|5| >5+0#0000000&@10| @44
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|5|,|1|-|5|7| @7|A|l@1| 

diff --git a/src/version.c b/src/version.c
index 26e8ab57c5aea8b10f67506b6d08bec4c42280d3..a26fd5d2ab8158c3fe4d111def18c88eaff2e0c1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1305,
 /**/
     1304,
 /**/