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

synIDattr(): return RRGGBB value for [fg|bg|sp]# #4851

Browse Source 
add tests for synIDattr() with [fg|bg|sp]#

add tests for synIDattr and various #RGB colors

synIDattr: test for ui_rgb_attached()

test: fix tests for synIDattr fg/bg/sp
This commit is contained in:
Rom Grk
2016-05-31 05:46:32 -04:00
committed by Justin M. Keyes
parent cbda7d85f8
commit 86b138b25d
2 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/syntax.c
View File

@@ -6952,8 +6952,23 @@ highlight_color (
else if (!(TOLOWER_ASC(what[0]) == 'b' && TOLOWER_ASC(what[1]) == 'g')) else if (!(TOLOWER_ASC(what[0]) == 'b' && TOLOWER_ASC(what[1]) == 'g'))
return NULL; return NULL;
if (modec == 'g') { if (modec == 'g') {
if (fg) if (what[2] == '#' && ui_rgb_attached()) {
if (fg) {
n = HL_TABLE()[id - 1].sg_rgb_fg;
} else if (sp) {
n = HL_TABLE()[id - 1].sg_rgb_sp;
} else {
n = HL_TABLE()[id - 1].sg_rgb_bg;
}
if (n < 0 || n > 0xffffff) {
return NULL;
}
snprintf((char *)name, sizeof(name), "#%06x", n);
return name;
}
if (fg) {
return HL_TABLE()[id - 1].sg_rgb_fg_name; return HL_TABLE()[id - 1].sg_rgb_fg_name;
}
if (sp) { if (sp) {
return HL_TABLE()[id - 1].sg_rgb_sp_name; return HL_TABLE()[id - 1].sg_rgb_sp_name;
} }

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

@@ -165,24 +165,49 @@ end)
describe('synIDattr()', function() describe('synIDattr()', function()
local screen local screen
before_each(function() before_each(function()
clear() clear()
screen = Screen.new(50, 7) screen = Screen.new(50, 7)
execute('highlight Normal ctermfg=1 guifg=#ff0000') execute('highlight Normal ctermfg=1 guifg=#ff0000 guibg=Black')
-- Salmon #fa8072 Maroon #800000
execute('highlight Keyword ctermfg=2 guifg=Salmon guisp=Maroon')
end) end)
after_each(function() after_each(function()
screen:detach() screen:detach()
end) end)
it('returns RGB number if GUI', function() it('returns gui-color if GUI', function()
eq('1', eval('synIDattr(hlID("Normal"), "fg")'))
eq('-1', eval('synIDattr(hlID("Normal"), "bg")'))
eq('2', eval('synIDattr(hlID("Keyword"), "fg")'))
eq('', eval('synIDattr(hlID("Keyword"), "sp")'))
screen:attach(true) screen:attach(true)
eq('#ff0000', eval('synIDattr(hlID("Normal"), "fg")')) eq('#ff0000', eval('synIDattr(hlID("Normal"), "fg")'))
eq('Black', eval('synIDattr(hlID("Normal"), "bg")'))
eq('Salmon', eval('synIDattr(hlID("Keyword"), "fg")'))
eq('Maroon', eval('synIDattr(hlID("Keyword"), "sp")'))
end)
it('returns #RRGGBB value for [fg|bg|sp]#', function()
eq('1', eval('synIDattr(hlID("Normal"), "fg#")'))
eq('-1', eval('synIDattr(hlID("Normal"), "bg#")'))
eq('2', eval('synIDattr(hlID("Keyword"), "fg#")'))
eq('', eval('synIDattr(hlID("Keyword"), "sp#")'))
screen:attach(true)
eq('#ff0000', eval('synIDattr(hlID("Normal"), "fg#")'))
eq('#000000', eval('synIDattr(hlID("Normal"), "bg#")'))
eq('#fa8072', eval('synIDattr(hlID("Keyword"), "fg#")'))
eq('#800000', eval('synIDattr(hlID("Keyword"), "sp#")'))
end) end)
it('returns color number if non-GUI', function() it('returns color number if non-GUI', function()
screen:attach(false) screen:attach(false)
eq('1', eval('synIDattr(hlID("Normal"), "fg")')) eq('1', eval('synIDattr(hlID("Normal"), "fg")'))
eq('2', eval('synIDattr(hlID("Keyword"), "fg")'))
end) end)
end) end)