Merge #3005 'synIDattr(): true color awareness'

2 files changed, 27 insertions, 0 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 21f21a4c80..9957643c8d 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -14699,6 +14699,8 @@ static void f_synIDattr(typval_T *argvars, typval_T *rettv)
     modec = TOLOWER_ASC(mode[0]);
     if (modec != 'c' && modec != 'g')
       modec = 0;        /* replace invalid with current */
+  } else if (ui_rgb_attached()) {
+    modec = 'g';
   } else {
     modec = 'c';
   }
diff --git a/test/functional/terminal/highlight_spec.lua b/test/functional/terminal/highlight_spec.lua
index b72527e7b6..1a96cb4dba 100644
--- a/test/functional/terminal/highlight_spec.lua
+++ b/test/functional/terminal/highlight_spec.lua
@@ -3,6 +3,7 @@ local Screen = require('test.functional.ui.screen')
 local thelpers = require('test.functional.terminal.helpers')
 local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
 local nvim_dir, execute = helpers.nvim_dir, helpers.execute
+local eq, eval = helpers.eq, helpers.eval
 
 
 describe('terminal window highlighting', function()
@@ -161,3 +162,27 @@ describe('terminal window highlighting with custom palette', function()
     ]])
   end)
 end)
+
+describe('synIDattr()', function()
+  local screen
+
+  before_each(function()
+    clear()
+    screen = Screen.new(50, 7)
+    execute('highlight Normal ctermfg=1 guifg=#ff0000')
+  end)
+
+  after_each(function()
+    screen:detach()
+  end)
+
+  it('returns RGB number if GUI', function()
+    screen:attach(true)
+    eq('#ff0000', eval('synIDattr(hlID("Normal"), "fg")'))
+  end)
+
+  it('returns color number if non-GUI', function()
+    screen:attach(false)
+    eq('1', eval('synIDattr(hlID("Normal"), "fg")'))
+  end)
+end)