fix: ensure hlgroup cache is always cleared on ColorScheme

willothy · Dec 23, 2023 · 90ac470 · 90ac470
1 parent 321afcd
commit 90ac470
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/lua/cokeline/augroups.lua b/lua/cokeline/augroups.lua
@@ -61,6 +61,17 @@ local setup = function()
   local autocmd, augroup =
     vim.api.nvim_create_autocmd, vim.api.nvim_create_augroup
 
+  -- Invalidate the cache on colorscheme change
+  autocmd("ColorScheme", {
+    pattern = "*",
+    -- NOTE: For some reason, the autocmd does not consistently trigger without this
+    nested = true,
+    group = augroup("cokeline_color_cache", { clear = true }),
+    callback = function()
+      require("cokeline.hlgroups")._cache_clear()
+    end,
+  })
+
   autocmd({ "VimEnter", "BufAdd" }, {
     group = augroup("cokeline_toggle", { clear = true }),
     callback = function()

diff --git a/lua/cokeline/hlgroups.lua b/lua/cokeline/hlgroups.lua
@@ -7,16 +7,11 @@ local cache = {
   groups = {},
 }
 
--- Invalidate the cache on colorscheme change
-vim.api.nvim_create_autocmd("Colorscheme", {
-  group = vim.api.nvim_create_augroup(
-    "cokeline_color_cache",
-    { clear = true }
-  ),
-  callback = function()
-    cache.groups = {}
-  end,
-})
+---Clears the hlgroup cache.
+---@private
+function M._cache_clear()
+  cache.groups = {}
+end
 
 ---@param rgb integer
 ---@return string hex