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

Merge pull request #19348 from akinsho/bugfix/winbar-winhighlight

Browse Source 
fix(winbar): make setting WinBar and WinBarNC in 'winhighlight' work
This commit is contained in:
zeertzjq 2022-07-15 09:56:17 +08:00 committed by GitHub
commit 73f96ce4c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/screen.c
View File

@ -5316,7 +5316,7 @@ static void win_redr_custom(win_T *wp, bool draw_winbar, bool draw_ruler)
}
fillchar = wp->w_p_fcs_chars.wbr;
attr = (wp == curwin) ? HL_ATTR(HLF_WBR) : HL_ATTR(HLF_WBRNC);
attr = (wp == curwin) ? win_hl_attr(wp, HLF_WBR) : win_hl_attr(wp, HLF_WBRNC);
maxwidth = wp->w_width_inner;
use_sandbox = was_set_insecurely(wp, "winbar", 0);

34
test/functional/ui/highlight_spec.lua
View File

@ -1848,8 +1848,7 @@ describe("'winhighlight' highlight", function()
]], unchanged=true}
end)
it('works local to the buffer', function()
it('works local to the window', function()
insert("aa")
command("split")
command("setlocal winhl=Normal:Background1")
@ -2240,4 +2239,35 @@ describe("'winhighlight' highlight", function()
|
]]}
end)
it('can override StatusLine and StatusLineNC', function()
command('set winhighlight=StatusLine:Background1,StatusLineNC:Background2')
command('split')
screen:expect([[
^ |
{0:~ }|
{0:~ }|
{1:[No Name] }|
|
{0:~ }|
{5:[No Name] }|
|
]])
end)
it('can override WinBar and WinBarNC #19345', function()
command('setlocal winbar=foobar')
command('set winhighlight=WinBar:Background1,WinBarNC:Background2')
command('split')
screen:expect([[
{1:foobar }|
^ |
{0:~ }|
{3:[No Name] }|
{5:foobar }|
|
{4:[No Name] }|
|
]])
end)
end)