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 #19897 from bfredl/statushl

Browse Source 
fix(highlight): set the window namespace when redrawing statusline
This commit is contained in:
bfredl 2022-08-30 10:59:58 +02:00 committed by GitHub
commit f9c183c0ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/drawscreen.c
View File

@ -748,6 +748,8 @@ void show_cursor_info(bool always)
if (!always && !redrawing()) { if (!always && !redrawing()) {
return; return;
} }
win_check_ns_hl(curwin);
if ((*p_stl != NUL || *curwin->w_p_stl != NUL) if ((*p_stl != NUL || *curwin->w_p_stl != NUL)
&& (curwin->w_status_height || global_stl_height())) { && (curwin->w_status_height || global_stl_height())) {
redraw_custom_statusline(curwin); redraw_custom_statusline(curwin);
@ -764,6 +766,7 @@ void show_cursor_info(bool always)
maketitle(); maketitle();
} }
win_check_ns_hl(NULL);
// Redraw the tab pages line if needed. // Redraw the tab pages line if needed.
if (redraw_tabline) { if (redraw_tabline) {
draw_tabline(); draw_tabline();
@ -2119,10 +2122,13 @@ void redraw_statuslines(void)
{ {
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (wp->w_redr_status) { if (wp->w_redr_status) {
win_check_ns_hl(wp);
win_redr_winbar(wp); win_redr_winbar(wp);
win_redr_status(wp); win_redr_status(wp);
} }
} }
win_check_ns_hl(NULL);
if (redraw_tabline) { if (redraw_tabline) {
draw_tabline(); draw_tabline();
} }

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

@ -2333,6 +2333,51 @@ describe("'winhighlight' highlight", function()
helpers.assert_alive() helpers.assert_alive()
end) end)
it('can redraw statusline on cursor movement', function()
screen:try_resize(40, 8)
exec [[
set statusline=%f%=%#Background1#%l,%c%V\ %P
split
]]
insert [[
some text
more text]]
screen:expect{grid=[[
some text |
more tex^t |
{0:~ }|
{3:[No Name] }{1:2,9 All}|
some text |
more text |
{4:[No Name] }{1:1,1 All}|
|
]]}
command 'set winhl=Background1:Background2'
screen:expect{grid=[[
some text |
more tex^t |
{0:~ }|
{3:[No Name] }{5:2,9 All}|
some text |
more text |
{4:[No Name] }{1:1,1 All}|
|
]]}
feed 'k'
screen:expect{grid=[[
some tex^t |
more text |
{0:~ }|
{3:[No Name] }{5:1,9 All}|
some text |
more text |
{4:[No Name] }{1:1,1 All}|
|
]]}
end)
end) end)
describe('highlight namespaces', function() describe('highlight namespaces', function()