commit 6b9c2025496e415856ad70b819de83a48267c582
author zeertzjq <zeertzjq@outlook.com> Mon Sep 11 20:01:17 2023 +0200
committer Christian Brabandt <cb@256bit.org> Mon Sep 11 20:01:17 2023 +0200
tree a4084c6fad75666ce787adb24511f9eac9aa6fa4
parent 4d00b835c49ffc5c416b65ca466d6ad695cbd3d2

patch 9.0.1896: "below" virtual text doesn't work with 'rightleft'

Problem:  "below" virtual text doesn't work with 'rightleft'.
Solution: Use column from right border with 'rightleft'.

closes: #13071

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>

src/drawline.c

diff --git a/src/drawline.c b/src/drawline.c
index 04e7ed8..6f90446 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -2011,10 +2011,8 @@
 
 		if (wlv.n_extra == 0 ||
 			(!wlv.extra_for_textprop
-#ifdef FEAT_PROP_POPUP
 			 && !(text_prop_type != NULL &&
 			     text_prop_flags & PT_FLAG_OVERRIDE)
-#endif
 		    ))
 		{
 		    text_prop_attr = 0;
@@ -2134,7 +2132,7 @@
 			    if (*ptr == NUL)
 				// don't combine char attr after EOL
 				text_prop_flags &= ~PT_FLAG_COMBINE;
-#ifdef FEAT_LINEBREAK
+# ifdef FEAT_LINEBREAK
 			    if (above || below || right || !wrap)
 			    {
 				// no 'showbreak' before "below" text property
@@ -2142,7 +2140,7 @@
 				wlv.need_showbreak = FALSE;
 				wlv.dont_use_showbreak = TRUE;
 			    }
-#endif
+# endif
 			    if ((right || above || below || !wrap
 					    || padding > 0) && wp->w_width > 2)
 			    {
@@ -2155,6 +2153,11 @@
 				// exactly the same.
 				start_line = text_prop_position(wp, tp,
 						    wlv.vcol,
+# ifdef FEAT_RIGHTLEFT
+						    wp->w_p_rl
+						    ? wp->w_width - wlv.col - 1
+						    :
+# endif
 						    wlv.col,
 						    &wlv.n_extra, &wlv.p_extra,
 						    &n_attr, &wlv.n_attr_skip,

src/testdir/dumps/Test_prop_below_rightleft_1.dump

diff --git a/src/testdir/dumps/Test_prop_below_rightleft_1.dump b/src/testdir/dumps/Test_prop_below_rightleft_1.dump
new file mode 100644
index 0000000..8718b46
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_below_rightleft_1.dump
@@ -0,0 +1,6 @@
+| +0&#ffffff0@50|e|d|c|b>a| +0#af5f00255&|1| @1
+| +0#0000000&@50|5+0#e000e06&|4|3|2|1| +0#af5f00255&@3
+| +0#4040ff13&@58|~
+| @58|~
+| @58|~
+| +0#0000000&@41|1|,|1| @10|A|l@1| 

src/testdir/test_textprop.vim

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 106e2e5..086d12c 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -3087,6 +3087,23 @@
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_prop_with_text_below_rightleft()
+  CheckRunVimInTerminal
+  CheckFeature rightleft
+
+  let lines =<< trim END
+    setlocal number rightleft
+    call setline(1, 'abcde')
+    call prop_type_add('theprop', #{highlight: 'Special'})
+    call prop_add(1, 0, #{type: 'theprop', text: '12345', text_align: 'below'})
+  END
+  call writefile(lines, 'XscriptPropBelowRightleft', 'D')
+  let buf = RunVimInTerminal('-S XscriptPropBelowRightleft', #{rows: 6, cols: 60})
+  call VerifyScreenDump(buf, 'Test_prop_below_rightleft_1', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
 func Test_prop_with_text_above_empty()
   CheckRunVimInTerminal
 

src/version.c

diff --git a/src/version.c b/src/version.c
index c56ef4c..937f8b8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1896,
+/**/
     1895,
 /**/
     1894,