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 #17630 from kchibisov/fix-underline-regression

Browse Source 
fix(api): highlight attribute for underline
This commit is contained in:
James McCoy 2022-03-06 18:43:02 -05:00 committed by GitHub
commit a7c999523d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval/funcs.c
View File

@ -11411,7 +11411,7 @@ static void f_synIDattr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
case 'u': { case 'u': {
const size_t len = STRLEN(what); const size_t len = STRLEN(what);
if (len <= 5 || (TOLOWER_ASC(what[5]) == 'l' && len <= 9)) { // underline if (len <= 5 || (TOLOWER_ASC(what[5]) == 'l' && len <= 9)) { // underline
p = highlight_has_attr(id, HL_UNDERCURL, modec); p = highlight_has_attr(id, HL_UNDERLINE, modec);
} else if (TOLOWER_ASC(what[5]) == 'c') { // undercurl } else if (TOLOWER_ASC(what[5]) == 'c') { // undercurl
p = highlight_has_attr(id, HL_UNDERCURL, modec); p = highlight_has_attr(id, HL_UNDERCURL, modec);
} else if (len > 9 && TOLOWER_ASC(what[9]) == 'l') { // underlineline } else if (len > 9 && TOLOWER_ASC(what[9]) == 'l') { // underlineline

15
test/functional/terminal/highlight_spec.lua
View File

@ -305,10 +305,17 @@ describe('synIDattr()', function()
eq('79', eval('synIDattr(hlID("Keyword"), "fg")')) eq('79', eval('synIDattr(hlID("Keyword"), "fg")'))
end) end)
it('returns "1" if group has "strikethrough" attribute', function() it('returns "1" if group has given highlight attribute', function()
eq('', eval('synIDattr(hlID("Normal"), "strikethrough")')) local hl_attrs = {
eq('1', eval('synIDattr(hlID("Keyword"), "strikethrough")')) 'underline', 'underlineline', 'undercurl', 'underdot', 'underdash', 'strikethrough'
eq('1', eval('synIDattr(hlID("Keyword"), "strikethrough", "gui")')) }
for _,hl_attr in ipairs(hl_attrs) do
local context = 'using ' .. hl_attr .. ' attr'
command('highlight Keyword cterm=' .. hl_attr .. ' gui=' .. hl_attr)
eq('', eval('synIDattr(hlID("Normal"), "'.. hl_attr .. '")'), context)
eq('1', eval('synIDattr(hlID("Keyword"), "' .. hl_attr .. '")'), context)
eq('1', eval('synIDattr(hlID("Keyword"), "' .. hl_attr .. '", "gui")'), context)
end
end) end)
end) end)