patch 9.0.0784: text prop "above" not right with 'number' and "n" in 'cpo'
Problem: Text prop "above" not displayed correctly with 'number' and "n" in
'cpo'.
Solution: Draw the line number column until the line text is reached.
diff --git a/src/drawline.c b/src/drawline.c
index 8824a01..e849f9d 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -343,9 +343,14 @@
int num_attr UNUSED)
{
int has_cpo_n = vim_strchr(p_cpo, CPO_NUMCOL) != NULL;
+ int lnum_row = wlv->startrow + wlv->filler_lines
+#ifdef FEAT_PROP_POPUP
+ + wlv->text_prop_above_count
+#endif
+ ;
if ((wp->w_p_nu || wp->w_p_rnu)
- && (wlv->row == wlv->startrow + wlv->filler_lines || !has_cpo_n)
+ && (wlv->row <= lnum_row || !has_cpo_n)
// there is no line number in a wrapped line when "n" is in
// 'cpoptions', but 'breakindent' assumes it anyway.
&& !((has_cpo_n
@@ -366,10 +371,7 @@
// Draw the line number (empty space after wrapping).
// When there are text properties above the line put the line number
// below them.
- if (wlv->row == wlv->startrow + wlv->filler_lines
-#ifdef FEAT_PROP_POPUP
- + wlv->text_prop_above_count
-#endif
+ if (wlv->row == lnum_row
&& (wp->w_skipcol == 0 || wlv->row > wp->w_winrow
|| (wp->w_p_nu && wp->w_p_rnu)))
{
@@ -1695,6 +1697,8 @@
{
area_highlighting = TRUE;
extra_check = TRUE;
+ // text props "above" move the line number down to where the
+ // text is.
for (int i = 0; i < text_prop_count; ++i)
if (text_props[i].tp_flags & TP_FLAG_ALIGN_ABOVE)
++wlv.text_prop_above_count;