commit 1aeb3eb092a384e63a407096102fd5a954aabeb8
author Bram Moolenaar <Bram@vim.org> Sun Jan 01 14:04:51 2023 +0000
committer Bram Moolenaar <Bram@vim.org> Sun Jan 01 14:04:51 2023 +0000
tree e965467de0d657c517fe5b7e4cf31a5ac622acd9
parent 6bafdd41cbf8c06bc00f19dcf4e1c8292460b4dd

patch 9.0.1124: virtual text at a column position is truncated

Problem:    Virtual text at a column position is truncated at the window edge.
            (Yegappan Lakshmanan)
Solution:   Do not truncated virtual text that is placed at a column.

src/drawline.c

diff --git a/src/drawline.c b/src/drawline.c
index d8dc303..11cfb77 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -643,7 +643,7 @@
     int	    right = (tp->tp_flags & TP_FLAG_ALIGN_RIGHT);
     int	    above = (tp->tp_flags & TP_FLAG_ALIGN_ABOVE);
     int	    below = (tp->tp_flags & TP_FLAG_ALIGN_BELOW);
-    int	    wrap = (tp->tp_flags & TP_FLAG_WRAP);
+    int	    wrap = tp->tp_col < MAXCOL || (tp->tp_flags & TP_FLAG_WRAP);
     int	    padding = tp->tp_col == MAXCOL && tp->tp_len > 1
 							  ? tp->tp_len - 1 : 0;
     int	    col_with_padding = scr_col + (below ? 0 : padding);

src/testdir/dumps/Test_prop_with_wrap_1.dump

diff --git a/src/testdir/dumps/Test_prop_with_wrap_1.dump b/src/testdir/dumps/Test_prop_with_wrap_1.dump
index c4bf866..6b6d664 100644
--- a/src/testdir/dumps/Test_prop_with_wrap_1.dump
+++ b/src/testdir/dumps/Test_prop_with_wrap_1.dump
@@ -1,6 +1,6 @@
->a+0&#ffffff0|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|s+0#e000e06&|o|m|e| |v|i|…
-|d+0#0000000&|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| @17
+|a+0&#ffffff0|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|s+0#e000e06&|o|m|e| |v|i|r
+|t|u|a|l| |t|e|x|t|d+0#0000000&|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f> @8
 |~+0#4040ff13&| @48
 |~| @48
 |~| @48
-| +0#0000000&@31|1|,|1| @10|A|l@1| 
+| +0#0000000&@31|1|,|7|5|-|9|2| @6|A|l@1| 

src/testdir/test_textprop.vim

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index a507a95..f1c7984 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -1978,6 +1978,7 @@
       setline(1, 'asdf '->repeat(15))
       prop_type_add('test', {highlight: 'Special'})
       prop_add(1, 43, {text: 'some virtual text', type: 'test'})
+      normal G$
   END
   call writefile(lines, 'XscriptPropWithWrap', 'D')
   let buf = RunVimInTerminal('-S XscriptPropWithWrap', #{rows: 6, cols: 50})

src/version.c

diff --git a/src/version.c b/src/version.c
index 531d7bc..b49d71d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1124,
+/**/
     1123,
 /**/
     1122,