To: vim_dev@googlegroups.com
Subject: Patch 9.0.1326
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1326
Problem:    Relative line number not updated with virtual text above.
Solution:   Adjust the row for the line number for virtual text above.
            (closes #12004)
Files:      src/drawline.c, src/testdir/test_textprop.vim,
            src/testdir/dumps/Test_prop_above_below_empty_4.dump,
            src/testdir/dumps/Test_prop_above_below_empty_5.dump


*** ../vim-9.0.1325/src/drawline.c	2023-02-19 14:15:34.272730981 +0000
--- src/drawline.c	2023-02-19 14:30:16.757565742 +0000
***************
*** 1598,1603 ****
--- 1598,1612 ----
  		}
  	}
      }
+ 
+     if (number_only)
+     {
+ 	// skip over rows only used for virtual text above
+ 	wlv.row += wlv.text_prop_above_count;
+ 	if (wlv.row > endrow)
+ 	    return wlv.row;
+ 	wlv.screen_row += wlv.text_prop_above_count;
+     }
  #endif
  
      // 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the
*** ../vim-9.0.1325/src/testdir/test_textprop.vim	2023-02-19 14:15:34.272730981 +0000
--- src/testdir/test_textprop.vim	2023-02-19 14:32:36.961607341 +0000
***************
*** 2806,2811 ****
--- 2806,2819 ----
    call term_sendkeys(buf, ":\<CR>")
    call VerifyScreenDump(buf, 'Test_prop_above_below_empty_3', {})
  
+   call term_sendkeys(buf, ":set colorcolumn=\<CR>")
+   call term_sendkeys(buf, ":set relativenumber\<CR>")
+   call term_sendkeys(buf, ":\<CR>")
+   call VerifyScreenDump(buf, 'Test_prop_above_below_empty_4', {})
+ 
+   call term_sendkeys(buf, "kk")
+   call VerifyScreenDump(buf, 'Test_prop_above_below_empty_5', {})
+ 
    call StopVimInTerminal(buf)
  endfunc
  
*** ../vim-9.0.1325/src/testdir/dumps/Test_prop_above_below_empty_4.dump	2023-02-19 14:34:03.609627562 +0000
--- src/testdir/dumps/Test_prop_above_below_empty_4.dump	2023-02-19 14:32:46.189609668 +0000
***************
*** 0 ****
--- 1,16 ----
+ | +0#af5f00255#ffffff0@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@1|4| |1+0#0000000&@7| @47
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@1|3| | +0#0000000&@55
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@1|2| |3+0#0000000&@8| @46
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@1|1| | +0#0000000&@55
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ |5+0#af5f00255&| @2>5+0#0000000&@10| @44
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ |:| @40|5|,|1|-|5|7| @7|A|l@1| 
*** ../vim-9.0.1325/src/testdir/dumps/Test_prop_above_below_empty_5.dump	2023-02-19 14:34:03.613627564 +0000
--- src/testdir/dumps/Test_prop_above_below_empty_5.dump	2023-02-19 14:32:47.345609958 +0000
***************
*** 0 ****
--- 1,16 ----
+ | +0#af5f00255#ffffff0@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@1|2| |1+0#0000000&@7| @47
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@1|1| | +0#0000000&@55
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ |3+0#af5f00255&| @2>3+0#0000000&@8| @46
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@1|1| | +0#0000000&@55
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@3|-+0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ | +0#af5f00255&@1|2| |5+0#0000000&@10| @44
+ | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52
+ |:| @40|3|,|1|-|5|7| @7|A|l@1| 
*** ../vim-9.0.1325/src/version.c	2023-02-19 14:15:34.272730981 +0000
--- src/version.c	2023-02-19 14:28:37.869528246 +0000
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1326,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
150. You find yourself counting emoticons to get to sleep.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///