mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(column): missing redraw with virt_lines_leftcol (#34650)

Browse Source 
Problem:  Missing number column redraw with virt_lines_leftcol.
Solution: Set virt_line_index to -1 when skipping a virtual line.
This commit is contained in:
zeertzjq
2025-06-26 13:16:19 +08:00
parent 203d4f916d
commit 0613faf596
2 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/drawline.c
View File

@@ -1688,6 +1688,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, b
break; break;
} }
wlv.filler_todo--; wlv.filler_todo--;
virt_line_index = -1;
if (wlv.filler_todo == 0 && (wp->w_botfill || !draw_text)) { if (wlv.filler_todo == 0 && (wp->w_botfill || !draw_text)) {
break; break;
} }

61
test/functional/ui/decorations_spec.lua
View File

@@ -5458,7 +5458,7 @@ if (h->n_buckets < new_n_buckets) { // expand
insert(example_text2) insert(example_text2)
feed 'gg' feed 'gg'
command 'set number signcolumn=yes' command 'set number signcolumn=yes'
screen:expect{grid=[[ screen:expect([[
{7: }{8: 1 }^if (h->n_buckets < new_n_buckets) { // expan| {7: }{8: 1 }^if (h->n_buckets < new_n_buckets) { // expan|
{7: }{8: }d | {7: }{8: }d |
{7: }{8: 2 } khkey_t *new_keys = (khkey_t *)krealloc((v| {7: }{8: 2 } khkey_t *new_keys = (khkey_t *)krealloc((v|
@@ -5471,16 +5471,16 @@ if (h->n_buckets < new_n_buckets) { // expand
{7: }{8: 6 } h->vals_buf = new_vals; | {7: }{8: 6 } h->vals_buf = new_vals; |
{7: }{8: 7 } } | {7: }{8: 7 } } |
| |
]]} ]])
local markid = api.nvim_buf_set_extmark(0, ns, 2, 0, { local markid = api.nvim_buf_set_extmark(0, ns, 2, 0, {
virt_lines = { virt_lines = {
{{"Some special", "Special"}}; { { 'Some special', 'Special' } },
{{"remark about codes", "Comment"}}; { { 'remark about codes', 'Comment' } },
}; },
}) })
screen:expect{grid=[[ screen:expect([[
{7: }{8: 1 }^if (h->n_buckets < new_n_buckets) { // expan| {7: }{8: 1 }^if (h->n_buckets < new_n_buckets) { // expan|
{7: }{8: }d | {7: }{8: }d |
{7: }{8: 2 } khkey_t *new_keys = (khkey_t *)krealloc((v| {7: }{8: 2 } khkey_t *new_keys = (khkey_t *)krealloc((v|
@@ -5493,17 +5493,17 @@ if (h->n_buckets < new_n_buckets) { // expand
{7: }{8: 5 } char *new_vals = krealloc( h->vals_buf, | {7: }{8: 5 } char *new_vals = krealloc( h->vals_buf, |
{7: }{8: }new_n_buckets * val_size); | {7: }{8: }new_n_buckets * val_size); |
| |
]]} ]])
api.nvim_buf_set_extmark(0, ns, 2, 0, { api.nvim_buf_set_extmark(0, ns, 2, 0, {
virt_lines = { virt_lines = {
{{"Some special", "Special"}}; { { 'Some special', 'Special' } },
{{"remark about codes", "Comment"}}; { { 'remark about codes', 'Comment' } },
}; },
virt_lines_leftcol=true; virt_lines_leftcol = true,
id=markid; id = markid,
}) })
screen:expect{grid=[[ screen:expect([[
{7: }{8: 1 }^if (h->n_buckets < new_n_buckets) { // expan| {7: }{8: 1 }^if (h->n_buckets < new_n_buckets) { // expan|
{7: }{8: }d | {7: }{8: }d |
{7: }{8: 2 } khkey_t *new_keys = (khkey_t *)krealloc((v| {7: }{8: 2 } khkey_t *new_keys = (khkey_t *)krealloc((v|
@@ -5516,7 +5516,40 @@ if (h->n_buckets < new_n_buckets) { // expand
{7: }{8: 5 } char *new_vals = krealloc( h->vals_buf, | {7: }{8: 5 } char *new_vals = krealloc( h->vals_buf, |
{7: }{8: }new_n_buckets * val_size); | {7: }{8: }new_n_buckets * val_size); |
| |
]]} ]])
command('set nonumber relativenumber')
screen:expect([[
{7: }{8: 0 }^if (h->n_buckets < new_n_buckets) { // expan|
{7: }{8: }d |
{7: }{8: 1 } khkey_t *new_keys = (khkey_t *)krealloc((v|
{7: }{8: }oid *)h->keys, new_n_buckets * sizeof(khkey_|
{7: }{8: }t)); |
{7: }{8: 2 } h->keys = new_keys; |
{16:Some special} |
{18:remark about codes} |
{7: }{8: 3 } if (kh_is_map && val_size) { |
{7: }{8: 4 } char *new_vals = krealloc( h->vals_buf, |
{7: }{8: }new_n_buckets * val_size); |
|
]])
-- 'relativenumber' is redrawn with virt_lines_leftcol #34649
feed('j')
screen:expect([[
{7: }{8: 1 }if (h->n_buckets < new_n_buckets) { // expan|
{7: }{8: }d |
{7: }{8: 0 }^ khkey_t *new_keys = (khkey_t *)krealloc((v|
{7: }{8: }oid *)h->keys, new_n_buckets * sizeof(khkey_|
{7: }{8: }t)); |
{7: }{8: 1 } h->keys = new_keys; |
{16:Some special} |
{18:remark about codes} |
{7: }{8: 2 } if (kh_is_map && val_size) { |
{7: }{8: 3 } char *new_vals = krealloc( h->vals_buf, |
{7: }{8: }new_n_buckets * val_size); |
|
]])
end) end)
it('works with hard TABs', function() it('works with hard TABs', function()