mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-15 22:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19828 from bfredl/nullhl

Browse Source 
fix(winhl): do not crash when unsetting winhl in just opened window
This commit is contained in:
bfredl
2022-08-18 11:12:50 +02:00
committed by GitHub
parent fbcce2b2ca 21b2906c9c
commit 7a2be8cc17
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/highlight.c
View File

@@ -319,7 +319,7 @@ void update_window_hl(win_T *wp, bool invalid)
int ns_id = wp->w_ns_hl; int ns_id = wp->w_ns_hl;
update_ns_hl(ns_id); update_ns_hl(ns_id);
if (ns_id != wp->w_ns_hl_active) { if (ns_id != wp->w_ns_hl_active || wp->w_ns_hl_attr == NULL) {
wp->w_ns_hl_active = ns_id; wp->w_ns_hl_active = ns_id;
wp->w_ns_hl_attr = *(NSHlAttr *)pmap_get(handle_T)(&ns_hl_attr, ns_id); wp->w_ns_hl_attr = *(NSHlAttr *)pmap_get(handle_T)(&ns_hl_attr, ns_id);

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

@@ -2317,6 +2317,22 @@ describe("'winhighlight' highlight", function()
| |
]]} ]]}
end) end)
it('can be disabled in newly opened window #19823', function()
command('split | set winhl=Normal:ErrorMsg | set winhl=')
screen:expect{grid=[[
^ |
{0:~ }|
{0:~ }|
{3:[No Name] }|
|
{0:~ }|
{4:[No Name] }|
|
]]}
helpers.assert_alive()
end)
end) end)
describe('highlight namespaces', function() describe('highlight namespaces', function()