mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-04 13:42:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4800 'syntax: foo=NONE should clear hi group'

Browse Source
This commit is contained in:
Justin M. Keyes
2016-05-21 01:25:15 -04:00
parent 8e20ba9fbd 582fb03f51
commit 34957f7ab9
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/syntax.c
View File

@@ -6972,6 +6972,9 @@ set_hl_attr (
|| at_en.rgb_sp_color != -1 || at_en.cterm_ae_attr != 0 || at_en.rgb_sp_color != -1 || at_en.cterm_ae_attr != 0
|| at_en.rgb_ae_attr != 0) { || at_en.rgb_ae_attr != 0) {
sgp->sg_attr = get_attr_entry(&at_en); sgp->sg_attr = get_attr_entry(&at_en);
} else {
// If all the fields are cleared, clear the attr field back to default value
sgp->sg_attr = 0;
} }
} }

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

@@ -302,6 +302,47 @@ describe('Default highlight groups', function()
{1:-- INSERT --} | {1:-- INSERT --} |
]], {[1] = {foreground = Screen.colors.Red, background = Screen.colors.Green}}) ]], {[1] = {foreground = Screen.colors.Red, background = Screen.colors.Green}})
end) end)
it('can be cleared by assigning NONE', function()
execute('syn keyword TmpKeyword neovim')
execute('hi link TmpKeyword ErrorMsg')
insert('neovim')
screen:expect([[
{1:neovi^m} |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
|
]], {
[1] = {foreground = Screen.colors.White, background = Screen.colors.Red}
})
execute("hi ErrorMsg term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE"
.. " gui=NONE guifg=NONE guibg=NONE guisp=NONE")
screen:expect([[
neovi^m |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
~ |
|
]], {})
end)
end) end)
describe('guisp (special/undercurl)', function() describe('guisp (special/undercurl)', function()