aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.1326: relative line number not updated with virtual text above

Browse Source 
Problem:    Relative line number not updated with virtual text above.
Solution:   Adjust the row for the line number for virtual text above.
            (closes #12004)
This commit is contained in:
Bram Moolenaar
2023-02-19 14:34:37 +00:00
parent f53e065bce
commit a572b936ce
5 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/drawline.c
View File

@@ -1598,6 +1598,15 @@ win_line(
} }
} }
} }
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 #endif
// 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the // 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the

16
src/testdir/dumps/Test_prop_above_below_empty_4.dump Normal file
View File

@@ -0,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|

16
src/testdir/dumps/Test_prop_above_below_empty_5.dump Normal file
View File

@@ -0,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|

8
src/testdir/test_textprop.vim
View File

@@ -2806,6 +2806,14 @@ func Test_prop_with_text_above_below_empty()
call term_sendkeys(buf, ":\<CR>") call term_sendkeys(buf, ":\<CR>")
call VerifyScreenDump(buf, 'Test_prop_above_below_empty_3', {}) 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) call StopVimInTerminal(buf)
endfunc endfunc

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1326,
/**/ /**/
1325, 1325,
/**/ /**/