mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 02:46:31 +00: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
2 changed files with 31 additions and 7 deletions
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;
}
if (statuscol.draw) {
if (wlv.row == startrow + wlv.filler_lines + 1
|| wlv.row == startrow + wlv.filler_lines) {
// Re-evaluate 'statuscolumn' for the first wrapped row and non filler line
statuscol.textp = NULL;
} else if (statuscol.textp) {
if (wlv.row == startrow + wlv.filler_lines) {
statuscol.textp = NULL; // re-evaluate for first non-filler line
} else if (vim_strchr(p_cpo, CPO_NUMCOL) && wlv.row > startrow + wlv.filler_lines) {
statuscol.draw = false; // don't draw status column if "n" is in 'cpo'
} 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
statuscol.textp = statuscol.text;
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--;
virt_line_offset = -1;