From 7a118792de5a9cc9d21f56f9fe926263e47b8d84 Mon Sep 17 00:00:00 2001
From: tiagovla <tiagovla@gmail.com>
Date: Fri, 31 Dec 2021 03:02:37 -0300
Subject: [PATCH] fix: pmenu highlights #10

Normal is shared among all highlight namespaces.
It only works correctly if set using vim.cmd while the api does not
support the global 0 namespace.
---
 lua/tokyodark/highlights.lua | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/lua/tokyodark/highlights.lua b/lua/tokyodark/highlights.lua
index 0d0d147..e7a2daf 100644
--- a/lua/tokyodark/highlights.lua
+++ b/lua/tokyodark/highlights.lua
@@ -15,6 +15,16 @@ local function load_highlights(highlights)
     end
 end
 
+local function load_highlights_legacy(highlights)
+    local bg, fg, hl_cmd
+    for group_name, group_settings in pairs(highlights) do
+        bg = group_settings.bg and "guibg=" .. group_settings.bg or "guibg=NONE"
+        fg = group_settings.fg and "guifg=" .. group_settings.fg or "guifg=NONE"
+        hl_cmd = "highlight " .. group_name .. " " .. bg .. " " .. fg
+        vim.cmd(hl_cmd)
+    end
+end
+
 hl.predef = {
     Fg = { fg = p.fg },
     Grey = { fg = p.grey },
@@ -31,8 +41,11 @@ hl.predef = {
     YellowItalic = { fg = p.yellow, italic = cfg.italic },
 }
 
-hl.common = {
+hl.legacy = {
     Normal = { fg = p.fg, bg = cfg.bg and p.none or p.bg0 },
+}
+
+hl.common = {
     Terminal = { fg = p.fg, bg = cfg.bg and p.none or p.bg0 },
     EndOfBuffer = { fg = p.bg2, bg = cfg.bg and p.none or p.bg0 },
     FoldColumn = { fg = p.fg, bg = cfg.bg and p.none or p.bg1 },
@@ -64,11 +77,11 @@ hl.common = {
     NonText = { fg = p.bg4 },
     Whitespace = { fg = p.bg4 },
     SpecialKey = { fg = p.bg4 },
-    Pmenu = { fg = p.fg, bg = p.bg2 },
-    PmenuSbar = { fg = p.none, bg = p.bg2 },
+    Pmenu = { fg = p.fg, bg = p.bg0 },
+    PmenuSbar = { fg = p.none, bg = p.bg0 },
     PmenuSel = { fg = p.bg0, bg = p.bg_green },
+    PmenuThumb = { fg = p.none, bg = p.bg2 },
     WildMenu = { fg = p.bg0, bg = p.blue },
-    PmenuThumb = { fg = p.none, bg = p.grey },
     Question = { fg = p.yellow },
     SpellBad = { fg = p.red, underline = true, sp = p.red },
     SpellCap = { fg = p.yellow, underline = true, sp = p.yellow },
@@ -294,6 +307,7 @@ function M.clear_namespace()
 end
 
 local function load_sync()
+    load_highlights_legacy(hl.legacy)
     load_highlights(hl.predef)
     load_highlights(hl.common)
     load_highlights(hl.syntax)