Merge #4851

1 files changed, 32 insertions, 7 deletions

diff --git a/test/functional/terminal/highlight_spec.lua b/test/functional/terminal/highlight_spec.lua
index 8876c68673..8d7c7451d3 100644
--- a/test/functional/terminal/highlight_spec.lua
+++ b/test/functional/terminal/highlight_spec.lua
@@ -165,24 +165,49 @@ end)
 
 describe('synIDattr()', function()
   local screen
-
   before_each(function()
     clear()
     screen = Screen.new(50, 7)
-    execute('highlight Normal ctermfg=1 guifg=#ff0000')
+    execute('highlight Normal ctermfg=252 guifg=#ff0000 guibg=Black')
+    -- Salmon #fa8072 Maroon #800000
+    execute('highlight Keyword ctermfg=79 guifg=Salmon guisp=Maroon')
+  end)
+
+  it('returns cterm-color if RGB-capable UI is _not_ attached', function()
+    eq('252', eval('synIDattr(hlID("Normal"),  "fg")'))
+    eq('252', eval('synIDattr(hlID("Normal"),  "fg#")'))
+    eq('-1',  eval('synIDattr(hlID("Normal"),  "bg")'))
+    eq('-1',  eval('synIDattr(hlID("Normal"),  "bg#")'))
+    eq('79',  eval('synIDattr(hlID("Keyword"), "fg")'))
+    eq('79',  eval('synIDattr(hlID("Keyword"), "fg#")'))
+    eq('',    eval('synIDattr(hlID("Keyword"), "sp")'))
+    eq('',    eval('synIDattr(hlID("Keyword"), "sp#")'))
   end)
 
-  after_each(function()
-    screen:detach()
+  it('returns gui-color if "gui" arg is passed', function()
+    eq('Black',  eval('synIDattr(hlID("Normal"),  "bg", "gui")'))
+    eq('Maroon', eval('synIDattr(hlID("Keyword"), "sp", "gui")'))
+  end)
+
+  it('returns gui-color if RGB-capable UI is attached', function()
+    screen:attach(true)
+    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 RGB number if GUI', function()
+  it('returns #RRGGBB value for fg#/bg#/sp#', function()
     screen:attach(true)
-    eq('#ff0000', eval('synIDattr(hlID("Normal"), "fg")'))
+    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)
 
   it('returns color number if non-GUI', function()
     screen:attach(false)
-    eq('1', eval('synIDattr(hlID("Normal"), "fg")'))
+    eq('252', eval('synIDattr(hlID("Normal"), "fg")'))
+    eq('79', eval('synIDattr(hlID("Keyword"), "fg")'))
   end)
 end)