patch 9.0.0178: cursor position wrong with virtual text before Tab

Problem:    Cursor position wrong with virtual text before Tab.
Solution:   Use the byte length, not the cell with, to compare the column.
            Correct tab size after text prop. (closes #10866)

diff --git a/src/charset.c b/src/charset.c
index 7a18a97d410694ca6e0d828df67bba74c1bea3d8..c345f7e2a98b6c9606b32c1b2875e298efbb6c1a 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1130,7 +1130,8 @@ win_lbr_chartabsize(
 # ifdef FEAT_PROP_POPUP
     if (cts->cts_has_prop_with_text && *line != NUL)
     {
-       int         normal_size = size;
+       int         tab_size = size;
+       int         charlen = mb_ptr2len(s);
        int         i;
        int         col = (int)(s - line);
        garray_T    *gap = &wp->w_buffer->b_textprop_text;
@@ -1143,7 +1144,7 @@ win_lbr_chartabsize(
            // copy, the text prop may actually have been removed from the line.
            if (tp->tp_id < 0
                    && ((tp->tp_col - 1 >= col
-                                        && tp->tp_col - 1 < col + normal_size)
+                                            && tp->tp_col - 1 < col + charlen)
                       || (tp->tp_col == MAXCOL && (s[0] == NUL || s[1] == NUL)
                                                   && cts->cts_with_trailing))
                    && -tp->tp_id - 1 < gap->ga_len)
@@ -1179,6 +1180,13 @@ win_lbr_chartabsize(
                    }
                    cts->cts_cur_text_width += cells;
                    size += cells;
+                   if (*s == TAB)
+                   {
+                       // tab size changes because of the inserted text
+                       size -= tab_size;
+                       tab_size = win_chartabsize(wp, s, vcol + size);
+                       size += tab_size;
+                   }
                }
            }
            if (tp->tp_col != MAXCOL && tp->tp_col - 1 > col)
@@ -1525,11 +1533,6 @@ getvcol(
        *end = vcol + incr - 1;
     if (cursor != NULL)
     {
-#ifdef FEAT_PROP_POPUP
-       if ((State & MODE_INSERT) == 0)
-           // cursor is after inserted text
-           vcol += cts.cts_cur_text_width;
-#endif
        if (*ptr == TAB
                && (State & MODE_NORMAL)
                && !wp->w_p_list
@@ -1539,7 +1542,14 @@ getvcol(
                )
            *cursor = vcol + incr - 1;      // cursor at end
        else
+       {
+#ifdef FEAT_PROP_POPUP
+           if ((State & MODE_INSERT) == 0)
+               // cursor is after inserted text
+               vcol += cts.cts_cur_text_width;
+#endif
            *cursor = vcol + head;          // cursor at start
+       }
     }
 }
 

diff --git a/src/testdir/dumps/Test_prop_before_tab_01.dump b/src/testdir/dumps/Test_prop_before_tab_01.dump
new file mode 100644 (file)
index 0000000..a0c264e
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_01.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@3> |x| @65
+|1+0&#ffff4012|2|3|4|5|6|7| +0&#ffffff0|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@7|x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@6|x| @57
+@8|A+0&#ffff4012|B|C|x+0&#ffffff0| @62
+@8|x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|1|,|1|-|8| @8|A|l@1| 

diff --git a/src/testdir/dumps/Test_prop_before_tab_02.dump b/src/testdir/dumps/Test_prop_before_tab_02.dump
new file mode 100644 (file)
index 0000000..4aab872
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_02.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@4>x| @65
+|1+0&#ffff4012|2|3|4|5|6|7| +0&#ffffff0|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@7|x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@6|x| @57
+@8|A+0&#ffff4012|B|C|x+0&#ffffff0| @62
+@8|x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|1|,|2|-|9| @8|A|l@1| 

diff --git a/src/testdir/dumps/Test_prop_before_tab_03.dump b/src/testdir/dumps/Test_prop_before_tab_03.dump
new file mode 100644 (file)
index 0000000..f89f0b9
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_03.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@4|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7> +0&#ffffff0|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@7|x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@6|x| @57
+@8|A+0&#ffff4012|B|C|x+0&#ffffff0| @62
+@8|x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|2|,|1|-|8| @8|A|l@1| 

diff --git a/src/testdir/dumps/Test_prop_before_tab_04.dump b/src/testdir/dumps/Test_prop_before_tab_04.dump
new file mode 100644 (file)
index 0000000..a820a41
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_04.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@4|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7| +0&#ffffff0>x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@7|x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@6|x| @57
+@8|A+0&#ffff4012|B|C|x+0&#ffffff0| @62
+@8|x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|2|,|2|-|9| @8|A|l@1| 

diff --git a/src/testdir/dumps/Test_prop_before_tab_05.dump b/src/testdir/dumps/Test_prop_before_tab_05.dump
new file mode 100644 (file)
index 0000000..1524851
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_05.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@4|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7| +0&#ffffff0|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@6> |x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@6|x| @57
+@8|A+0&#ffff4012|B|C|x+0&#ffffff0| @62
+@8|x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|3|,|1|-|1|6| @7|A|l@1| 

diff --git a/src/testdir/dumps/Test_prop_before_tab_06.dump b/src/testdir/dumps/Test_prop_before_tab_06.dump
new file mode 100644 (file)
index 0000000..54a06cd
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_06.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@4|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7| +0&#ffffff0|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@7>x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@6|x| @57
+@8|A+0&#ffff4012|B|C|x+0&#ffffff0| @62
+@8|x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|3|,|2|-|1|7| @7|A|l@1| 

diff --git a/src/testdir/dumps/Test_prop_before_tab_07.dump b/src/testdir/dumps/Test_prop_before_tab_07.dump
new file mode 100644 (file)
index 0000000..3b07ac6
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_07.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@4|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7| +0&#ffffff0|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@7|x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@5> |x| @57
+@8|A+0&#ffff4012|B|C|x+0&#ffffff0| @62
+@8|x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|4|,|1|-|1|6| @7|A|l@1| 

diff --git a/src/testdir/dumps/Test_prop_before_tab_08.dump b/src/testdir/dumps/Test_prop_before_tab_08.dump
new file mode 100644 (file)
index 0000000..07eb40b
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_08.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@4|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7| +0&#ffffff0|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@7|x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@6>x| @57
+@8|A+0&#ffff4012|B|C|x+0&#ffffff0| @62
+@8|x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|4|,|2|-|1|7| @7|A|l@1| 

diff --git a/src/testdir/dumps/Test_prop_before_tab_09.dump b/src/testdir/dumps/Test_prop_before_tab_09.dump
new file mode 100644 (file)
index 0000000..ed30b9e
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_09.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@4|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7| +0&#ffffff0|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@7|x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@6|x| @57
+@8|A+0&#ffff4012|B|C>x+0&#ffffff0| @62
+@8|x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|5|,|2|-|1|2| @7|A|l@1| 

diff --git a/src/testdir/dumps/Test_prop_before_tab_10.dump b/src/testdir/dumps/Test_prop_before_tab_10.dump
new file mode 100644 (file)
index 0000000..9957336
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_before_tab_10.dump
@@ -0,0 +1,8 @@
+|1+0&#ffff4012|2|3| +0&#ffffff0@4|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7| +0&#ffffff0|x| @65
+|1+0&#ffff4012|2|3|4|5|6|7|8| +0&#ffffff0@7|x| @57
+|1+0&#ffff4012|2|3|4|5|6|7|8|9| +0&#ffffff0@6|x| @57
+@8|A+0&#ffff4012|B|C|x+0&#ffffff0| @62
+@8>x|A+0&#ffff4012|B|C| +0&#ffffff0@62
+|~+0#4040ff13&| @73
+| +0#0000000&@56|6|,|2|-|9| @8|A|l@1| 

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index fdee30f3dc7a476877205d898e1aa813915b9be5..caf933d25f8f9ddefdf8dff9349085a9f9c804da 100644 (file)
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -974,10 +974,12 @@ func Test_prop_line2byte()
   call assert_equal(1489, line2byte(400))
   bwipe!
 
+call ch_logfile('logfile', 'w')
   " Add many lines so that the data block is split.
   " With and without props should give the same result.
   call Run_test_with_line2byte(0)
   call Run_test_with_line2byte(1)
+call ch_logfile('', 'w')
 
   call prop_type_delete('comment')
 endfunc
@@ -1893,6 +1895,46 @@ func Test_prop_after_tab()
   call delete('XscriptPropAfterTab')
 endfunc
 
+func Test_prop_before_tab()
+  CheckRunVimInTerminal
+
+  let lines =<< trim END
+      call setline(1, ["\tx"]->repeat(6))
+      call prop_type_add('test', #{highlight: 'Search'})
+      call prop_add(1, 1, #{type: 'test', text: '123'})
+      call prop_add(2, 1, #{type: 'test', text: '1234567'})
+      call prop_add(3, 1, #{type: 'test', text: '12345678'})
+      call prop_add(4, 1, #{type: 'test', text: '123456789'})
+      call prop_add(5, 2, #{type: 'test', text: 'ABC'})
+      call prop_add(6, 3, #{type: 'test', text: 'ABC'})
+      normal gg0
+  END
+  call writefile(lines, 'XscriptPropBeforeTab')
+  let buf = RunVimInTerminal('-S XscriptPropBeforeTab', #{rows: 8})
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_01', {})
+  call term_sendkeys(buf, "$")
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_02', {})
+  call term_sendkeys(buf, "j0")
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_03', {})
+  call term_sendkeys(buf, "$")
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_04', {})
+  call term_sendkeys(buf, "j0")
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_05', {})
+  call term_sendkeys(buf, "$")
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_06', {})
+  call term_sendkeys(buf, "j0")
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_07', {})
+  call term_sendkeys(buf, "$")
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_08', {})
+  call term_sendkeys(buf, "j")
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_09', {})
+  call term_sendkeys(buf, "j")
+  call VerifyScreenDump(buf, 'Test_prop_before_tab_10', {})
+
+  call StopVimInTerminal(buf)
+  call delete('XscriptPropBeforeTab')
+endfunc
+
 func Test_prop_after_linebreak()
   CheckRunVimInTerminal
 

diff --git a/src/version.c b/src/version.c
index 739a2f4071fe30bd6f7b196c5179e4a8436c8ca0..f105ab797fb0820e1839991d19a66cf0056df8cb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    178,
 /**/
     177,
 /**/