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): cmdwin cursor is offset with 'statuscolumn' (#22445)

Browse Source
This commit is contained in:
luukvbaal 2023-02-28 03:19:58 +01:00 committed by GitHub
parent f113cba3ec
commit 9a271f6afd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/drawline.c
View File

@ -1199,7 +1199,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
statuscol.draw = true; statuscol.draw = true;
statuscol.sattrs = sattrs; statuscol.sattrs = sattrs;
statuscol.foldinfo = foldinfo; statuscol.foldinfo = foldinfo;
statuscol.width = win_col_off(wp); statuscol.width = win_col_off(wp) - (cmdwin_type != 0 && wp == curwin);
statuscol.use_cul = use_cursor_line_sign(wp, lnum); statuscol.use_cul = use_cursor_line_sign(wp, lnum);
statuscol.sign_cul_attr = statuscol.use_cul ? sign_cul_attr : 0; statuscol.sign_cul_attr = statuscol.use_cul ? sign_cul_attr : 0;
statuscol.num_attr = sign_num_attr ? sign_num_attr statuscol.num_attr = sign_num_attr ? sign_num_attr

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

@ -478,4 +478,24 @@ describe('statuscolumn', function()
| |
]]) ]])
end) end)
it('works with cmdwin', function()
feed(':set stc=%l<CR>q:k$')
screen:expect([[
7 aaaaa |
8 aaaaa |
9 aaaaa |
10aaaaa |
[No Name] [+] |
:1set stc=%^l |
:2 |
~ |
~ |
~ |
~ |
~ |
[Command Line] |
: |
]])
end)
end) end)