IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(column): avoid drawing columns for virt_lines_leftcol

Browse Source 
Problem:    The default fold column, as well as the 'statuscolumn', were
            drawn unnecessarily/unexpectedly for virtual lines placed
            with `virt_lines_leftcol` set.
Solution:   Skip the column states if a virtual line with
            `virt_lines_leftcol` set will be drawn.
This commit is contained in:
Luuk van Baal 2023-01-16 01:24:33 +01:00
parent 85111ca0f4
commit 54470336ff
2 changed files with 72 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/nvim/drawline.c
View File

@ -21,6 +21,7 @@
#include "nvim/decoration_provider.h" #include "nvim/decoration_provider.h"
#include "nvim/diff.h" #include "nvim/diff.h"
#include "nvim/drawline.h" #include "nvim/drawline.h"
#include "nvim/eval.h"
#include "nvim/extmark_defs.h" #include "nvim/extmark_defs.h"
#include "nvim/fold.h" #include "nvim/fold.h"
#include "nvim/garray.h" #include "nvim/garray.h"
@ -413,7 +414,7 @@ static void get_statuscol_str(win_T *wp, linenr_T lnum, int row, int startrow, i
set_vim_var_nr(VV_VIRTNUM, virtnum); set_vim_var_nr(VV_VIRTNUM, virtnum);
// When called the first time for line "lnum" set num_attr // When called the first time for line "lnum" set num_attr
if (row == startrow) { if (stcp->num_attr == 0) {
stcp->num_attr = sign_num_attr ? sign_num_attr stcp->num_attr = sign_num_attr ? sign_num_attr
: get_line_number_attr(wp, lnum, row, startrow, filler_lines); : get_line_number_attr(wp, lnum, row, startrow, filler_lines);
} }
@ -1203,6 +1204,8 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
} }
int sign_idx = 0; int sign_idx = 0;
int virt_line_index;
int virt_line_offset = -1;
// Repeat for the whole displayed line. // Repeat for the whole displayed line.
for (;;) { for (;;) {
int has_match_conc = 0; ///< match wants to conceal int has_match_conc = 0; ///< match wants to conceal
@ -1229,9 +1232,22 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
} }
} }
// Skip fold, sign and number states if 'statuscolumn' is set. if (draw_state == WL_FOLD - 1 && n_extra == 0) {
if (draw_state == WL_FOLD - 1 && n_extra == 0 && statuscol.draw) { if (filler_todo > 0) {
draw_state = WL_STC - 1; int index = filler_todo - (filler_lines - n_virt_lines);
if (index > 0) {
virt_line_index = (int)kv_size(virt_lines) - index;
assert(virt_line_index >= 0);
virt_line_offset = kv_A(virt_lines, virt_line_index).left_col ? 0 : win_col_off(wp);
}
}
if (!virt_line_offset) {
// Skip the column states if there is a "virt_left_col" line.
draw_state = WL_BRI - 1;
} else if (statuscol.draw) {
// Skip fold, sign and number states if 'statuscolumn' is set.
draw_state = WL_STC - 1;
}
} }
if (draw_state == WL_FOLD - 1 && n_extra == 0) { if (draw_state == WL_FOLD - 1 && n_extra == 0) {
@ -2754,15 +2770,9 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
&& !wp->w_p_rl; // Not right-to-left. && !wp->w_p_rl; // Not right-to-left.
int draw_col = col - boguscols; int draw_col = col - boguscols;
if (filler_todo > 0) { if (virt_line_offset >= 0) {
int index = filler_todo - (filler_lines - n_virt_lines); draw_virt_text_item(buf, virt_line_offset, kv_A(virt_lines, virt_line_index).line,
if (index > 0) { kHlModeReplace, grid->cols, 0);
int i = (int)kv_size(virt_lines) - index;
assert(i >= 0);
int offset = kv_A(virt_lines, i).left_col ? 0 : win_col_offset;
draw_virt_text_item(buf, offset, kv_A(virt_lines, i).line,
kHlModeReplace, grid->cols, 0);
}
} else { } else {
draw_virt_text(wp, buf, win_col_offset, &draw_col, grid->cols, row); draw_virt_text(wp, buf, win_col_offset, &draw_col, grid->cols, row);
} }
@ -2825,13 +2835,15 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
if (row == startrow + filler_lines + 1 || row == startrow + filler_lines) { if (row == startrow + filler_lines + 1 || row == startrow + filler_lines) {
// Re-evaluate 'statuscolumn' for the first wrapped row and non filler line // Re-evaluate 'statuscolumn' for the first wrapped row and non filler line
statuscol.textp = NULL; statuscol.textp = NULL;
} else { // Otherwise just reset the text/hlrec pointers } else if (statuscol.textp) {
// Draw the already built 'statuscolumn' on the next wrapped or filler line
statuscol.textp = statuscol.text; statuscol.textp = statuscol.text;
statuscol.hlrecp = statuscol.hlrec; statuscol.hlrecp = statuscol.hlrec;
} // Fall back to default columns if the 'n' flag isn't in 'cpo' } // Fall back to default columns if the 'n' flag isn't in 'cpo'
statuscol.draw = vim_strchr(p_cpo, CPO_NUMCOL) == NULL; statuscol.draw = vim_strchr(p_cpo, CPO_NUMCOL) == NULL;
} }
filler_todo--; filler_todo--;
virt_line_offset = -1;
// When the filler lines are actually below the last line of the // When the filler lines are actually below the last line of the
// file, don't draw the line itself, break here. // file, don't draw the line itself, break here.
if (filler_todo == 0 && (wp->w_botfill || end_fill)) { if (filler_todo == 0 && (wp->w_botfill || end_fill)) {

84
test/functional/ui/statuscolumn_spec.lua
View File

@ -4,7 +4,7 @@ local clear = helpers.clear
local command = helpers.command local command = helpers.command
local eq = helpers.eq local eq = helpers.eq
local eval = helpers.eval local eval = helpers.eval
local exec = helpers.exec_lua local exec_lua = helpers.exec_lua
local meths = helpers.meths local meths = helpers.meths
local pcall_err = helpers.pcall_err local pcall_err = helpers.pcall_err
@ -16,8 +16,8 @@ describe('statuscolumn', function()
screen:attach() screen:attach()
end) end)
it('fails with invalid \'statuscolumn\'', function() it("fails with invalid 'statuscolumn'", function()
command('set stc=%{v:relnum?v:relnum:(v:lnum==5?invalid:v:lnum)}\\ ') command([[set stc=%{v:relnum?v:relnum:(v:lnum==5?invalid:v:lnum)}\ ]])
screen:expect([[ screen:expect([[
4 aaaaa | 4 aaaaa |
3 aaaaa | 3 aaaaa |
@ -39,8 +39,8 @@ describe('statuscolumn', function()
eq('', eval('&statuscolumn')) eq('', eval('&statuscolumn'))
end) end)
it('widens with irregular \'statuscolumn\' width', function() it("widens with irregular 'statuscolumn' width", function()
command('set stc=%{v:relnum?v:relnum:(v:lnum==5?\'bbbbb\':v:lnum)}') command([[set stc=%{v:relnum?v:relnum:(v:lnum==5?'bbbbb':v:lnum)}]])
command('norm 5G | redraw!') command('norm 5G | redraw!')
screen:expect([[ screen:expect([[
1 aaaaa | 1 aaaaa |
@ -60,7 +60,7 @@ describe('statuscolumn', function()
]]) ]])
end) end)
it('works with \'statuscolumn\'', function() it("works with 'statuscolumn'", function()
command([[set stc=%{&nu?v:lnum:''}%=%{&rnu?'\ '.v:relnum:''}│]]) command([[set stc=%{&nu?v:lnum:''}%=%{&rnu?'\ '.v:relnum:''}│]])
screen:expect([[ screen:expect([[
4 │aaaaa | 4 │aaaaa |
@ -123,7 +123,7 @@ describe('statuscolumn', function()
command([[set stc=%{&nu?v:lnum:''}%=%{&rnu?'\ '.v:relnum:''}│]]) command([[set stc=%{&nu?v:lnum:''}%=%{&rnu?'\ '.v:relnum:''}│]])
end) end)
it('works with highlighted \'statuscolumn\'', function() it("works with highlighted 'statuscolumn'", function()
command([[set stc=%#NonText#%{&nu?v:lnum:''}]] .. command([[set stc=%#NonText#%{&nu?v:lnum:''}]] ..
[[%=%{&rnu&&(v:lnum%2)?'\ '.v:relnum:''}]] .. [[%=%{&rnu&&(v:lnum%2)?'\ '.v:relnum:''}]] ..
[[%#LineNr#%{&rnu&&!(v:lnum%2)?'\ '.v:relnum:''}│]]) [[%#LineNr#%{&rnu&&!(v:lnum%2)?'\ '.v:relnum:''}│]])
@ -184,7 +184,7 @@ describe('statuscolumn', function()
end) end)
it('works with wrapped lines, signs and folds', function() it('works with wrapped lines, signs and folds', function()
command("set stc=%C%s%=%{v:virtnum?'':v:lnum}│\\ ") command([[set stc=%C%s%=%{v:virtnum?'':v:lnum}│\ ]])
command("call setline(1,repeat([repeat('aaaaa',10)],16))") command("call setline(1,repeat([repeat('aaaaa',10)],16))")
screen:set_default_attr_ids({ screen:set_default_attr_ids({
[0] = {bold = true, foreground = Screen.colors.Blue}, [0] = {bold = true, foreground = Screen.colors.Blue},
@ -235,7 +235,7 @@ describe('statuscolumn', function()
]]) ]])
command('norm zf$') command('norm zf$')
-- Check that alignment works properly with signs after %= -- Check that alignment works properly with signs after %=
command("set stc=%C%=%{v:virtnum?'':v:lnum}│%s\\ ") command([[set stc=%C%=%{v:virtnum?'':v:lnum}│%s\ ]])
screen:expect([[ screen:expect([[
{2: }{1: 4│>>}{2: }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa| {2: }{1: 4│>>}{2: }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
{2: }{1: │}{2: }{1: }aaaaaa | {2: }{1: │}{2: }{1: }aaaaaa |
@ -270,7 +270,7 @@ describe('statuscolumn', function()
| |
]]) ]])
-- v:lnum is the same value on wrapped lines -- v:lnum is the same value on wrapped lines
command("set stc=%C%=%{v:lnum}│%s\\ ") command([[set stc=%C%=%{v:lnum}│%s\ ]])
screen:expect([[ screen:expect([[
{2: }{1: 4│>>}{2: }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa| {2: }{1: 4│>>}{2: }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
{2: }{1: 4│}{2: }{1: }aaaaaa | {2: }{1: 4│}{2: }{1: }aaaaaa |
@ -288,7 +288,7 @@ describe('statuscolumn', function()
| |
]]) ]])
-- v:relnum is the same value on wrapped lines -- v:relnum is the same value on wrapped lines
command("set stc=%C%=\\ %{v:relnum}│%s\\ ") command([[set stc=%C%=\ %{v:relnum}│%s\ ]])
screen:expect([[ screen:expect([[
{2: }{1: 4│>>}{2: }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa| {2: }{1: 4│>>}{2: }{1: }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
{2: }{1: 4│}{2: }{1: }aaaaaa | {2: }{1: 4│}{2: }{1: }aaaaaa |
@ -348,14 +348,11 @@ describe('statuscolumn', function()
| |
]]) ]])
-- Status column is re-evaluated for virt_lines, buffer line, and wrapped line -- Status column is re-evaluated for virt_lines, buffer line, and wrapped line
exec([[ exec_lua([[
local ns = vim.api.nvim_create_namespace("ns") local ns = vim.api.nvim_create_namespace("ns")
vim.api.nvim_buf_set_extmark(0, ns, 4, 0, {
virt_lines = {{{"virt_line", ""}}, {{"virt_line", ""}}}
})
vim.api.nvim_buf_set_extmark(0, ns, 5, 0, { vim.api.nvim_buf_set_extmark(0, ns, 5, 0, {
virt_lines_above = true, virt_lines = {{{"virt_line above", ""}}, {{"virt_line above", ""}}} virt_lines_above = true, virt_lines = {{{"virt_line above", ""}}} })
}) vim.api.nvim_buf_set_extmark(0, ns, 4, 0, { virt_lines = {{{"virt_line", ""}}} })
]]) ]])
command('set foldcolumn=0 signcolumn=no') command('set foldcolumn=0 signcolumn=no')
command([[set stc=%{v:virtnum<0?'virtual':(!v:virtnum?'buffer':'wrapped')}%=%{'\ '.v:virtnum.'\ '.v:lnum}]]) command([[set stc=%{v:virtnum<0?'virtual':(!v:virtnum?'buffer':'wrapped')}%=%{'\ '.v:virtnum.'\ '.v:lnum}]])
@ -364,20 +361,20 @@ describe('statuscolumn', function()
{1:wrapped 1 4}aaaaaaaa | {1:wrapped 1 4}aaaaaaaa |
{1:buffer 0 5}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa| {1:buffer 0 5}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
{1:wrapped 1 5}aaaaaaaa | {1:wrapped 1 5}aaaaaaaa |
{1:virtual-4 5}virt_line | {1:virtual-2 5}virt_line |
{1:virtual-4 5}virt_line | {1:virtual-2 5}virt_line above |
{1:virtual-4 5}virt_line above |
{1:virtual-4 5}virt_line above |
{1:buffer 0 6}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa| {1:buffer 0 6}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
{1:wrapped 1 6}aaaaaaaa | {1:wrapped 1 6}aaaaaaaa |
{1:buffer 0 7}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa| {1:buffer 0 7}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
{1:wrapped 1 7}aaaaaaaa | {1:wrapped 1 7}aaaaaaaa |
{4:buffer 0 8}{5:^+-- 1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaa}| {4:buffer 0 8}{5:^+-- 1 line: aaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
{1:buffer 0 9}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
{1:wrapped 1 9}aaaaaaaa |
| |
]]) ]])
end) end)
it('works with \'statuscolumn\' clicks', function() it("works with 'statuscolumn' clicks", function()
command('set mousemodel=extend') command('set mousemodel=extend')
command([[ command([[
function! MyClickFunc(minwid, clicks, button, mods) function! MyClickFunc(minwid, clicks, button, mods)
@ -414,25 +411,36 @@ describe('statuscolumn', function()
eq('', eval("g:testvar")) eq('', eval("g:testvar"))
end) end)
it('fits maximum multibyte foldcolumn #21759', function() it('works with foldcolumn', function()
command('set stc=%C fdc=9 fillchars=foldsep:𒀀') -- Fits maximum multibyte foldcolumn #21759
command([[set stc=%C%=%l\ fdc=9 fillchars=foldsep:𒀀]])
for _ = 0,8 do command('norm zfjzo') end for _ = 0,8 do command('norm zfjzo') end
-- 'statuscolumn' is not drawn for `virt_lines_leftcol` lines
exec_lua([[
local ns = vim.api.nvim_create_namespace("ns")
vim.api.nvim_buf_set_extmark(0, ns, 6, 0, {
virt_lines_leftcol = true, virt_lines = {{{"virt", ""}}} })
vim.api.nvim_buf_set_extmark(0, ns, 7, 0, {
virt_lines_leftcol = true, virt_lines = {{{"virt", ""}}} })
]])
helpers.feed('lh') -- force update wcol/row
screen:expect([[ screen:expect([[
aaaaa | 4 aaaaa |
aaaaa | 5 aaaaa |
aaaaa | 6 aaaaa |
aaaaa | 7 aaaaa |
--------- ^aaaaa | virt |
𒀀𒀀𒀀𒀀𒀀𒀀𒀀𒀀𒀀 aaaaa | --------- 8 ^aaaaa |
aaaaa | virt |
aaaaa | 𒀀𒀀𒀀𒀀𒀀𒀀𒀀𒀀𒀀 9 aaaaa |
aaaaa | 10 aaaaa |
aaaaa | 11 aaaaa |
aaaaa | 12 aaaaa |
aaaaa | 13 aaaaa |
aaaaa | 14 aaaaa |
| |
]]) ]])
command('set stc=') -- also for the default sign column
screen:expect_unchanged()
end) end)
end) end)