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): 'statuscolumn' not drawn after virt_lines with "n" in 'cpo' (#22967)

Browse Source 
Problem:    The 'statuscolumn' is not drawn and the line itself is drawn
            at an offset to the rest of the buffer after virt_lines if
            'cpoptions' includes "n".
Solution:   Make sure 'statuscolumn' is drawn.
This commit is contained in:
luukvbaal 2023-04-10 02:39:27 +02:00 committed by GitHub
parent d52cc668c7
commit 3c724fe1f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/drawline.c
View File

@ -2967,16 +2967,17 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
wlv.need_showbreak = true; wlv.need_showbreak = true;
} }
if (statuscol.draw) { if (statuscol.draw) {
if (wlv.row == startrow + wlv.filler_lines + 1 if (wlv.row == startrow + wlv.filler_lines) {
|| wlv.row == startrow + wlv.filler_lines) { statuscol.textp = NULL; // re-evaluate for first non-filler line
// Re-evaluate 'statuscolumn' for the first wrapped row and non filler line } else if (vim_strchr(p_cpo, CPO_NUMCOL) && wlv.row > startrow + wlv.filler_lines) {
statuscol.textp = NULL; statuscol.draw = false; // don't draw status column if "n" is in 'cpo'
} else if (statuscol.textp) { } else if (wlv.row == startrow + wlv.filler_lines + 1) {
statuscol.textp = NULL; // re-evaluate for first wrapped line
} else {
// Draw the already built 'statuscolumn' on the next wrapped or filler line // 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' }
statuscol.draw = vim_strchr(p_cpo, CPO_NUMCOL) == NULL;
} }
wlv.filler_todo--; wlv.filler_todo--;
virt_line_offset = -1; virt_line_offset = -1;

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

@ -397,6 +397,29 @@ describe('statuscolumn', function()
{0:~ }| {0:~ }|
| |
]]) ]])
-- Also test virt_lines when 'cpoptions' includes "n"
exec_lua([[
vim.opt.cpoptions:append("n")
local ns = vim.api.nvim_create_namespace("ns")
vim.api.nvim_buf_set_extmark(0, ns, 14, 0, { virt_lines = {{{"virt_line1", ""}}} })
vim.api.nvim_buf_set_extmark(0, ns, 14, 0, { virt_lines = {{{"virt_line2", ""}}} })
]])
screen:expect([[
{1:buffer 0 13}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
aaaaaaaaa |
{1:buffer 0 14}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
aaaaaaaaa |
{1:buffer 0 15}aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
aaaaaaaaa |
{1:virtual-2 15}virt_line1 |
{1:virtual-2 15}virt_line2 |
{1:buffer 0 16}{5:^aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}|
{5:aaaaaaaaa }|
{1:virtual-1 16}END |
{0:~ }|
{0:~ }|
|
]])
end) end)
it("works with 'statuscolumn' clicks", function() it("works with 'statuscolumn' clicks", function()