From 325bf72f935aa2caf25cb644f79dc7a3ea2c1168 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Tue, 1 Nov 2022 15:22:20 +0100
Subject: refactor(hooks): use colorscheme event after reload (#3375)

---
 lua/lvim/utils/hooks.lua | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lua/lvim/utils/hooks.lua')

diff --git a/lua/lvim/utils/hooks.lua b/lua/lvim/utils/hooks.lua
index bf0dac60..13f078b1 100644
--- a/lua/lvim/utils/hooks.lua
+++ b/lua/lvim/utils/hooks.lua
@@ -2,6 +2,7 @@ local M = {}
 
 local Log = require "lvim.core.log"
 local in_headless = #vim.api.nvim_list_uis() == 0
+local plugin_loader = require "lvim.plugin-loader"
 
 function M.run_pre_update()
   Log:debug "Starting pre-update hook"
@@ -15,10 +16,12 @@ function M.run_on_packer_complete()
   Log:debug "Packer operation complete"
   vim.api.nvim_exec_autocmds("User", { pattern = "PackerComplete" })
 
-  vim.g.colors_name = lvim.colorscheme
-  pcall(vim.cmd, "colorscheme " .. lvim.colorscheme)
-
   if M._reload_triggered then
+    if not in_headless then
+      vim.schedule(function()
+        pcall(vim.api.nvim_exec_autocmds, "ColorScheme", { pattern = "*" })
+      end)
+    end
     Log:debug "Reloaded configuration"
     M._reload_triggered = nil
   end
@@ -34,7 +37,7 @@ end
 ---It also forces regenerating any template ftplugin files
 ---Tip: Useful for clearing any outdated settings
 function M.reset_cache()
-  vim.cmd [[LuaCacheClear]]
+  plugin_loader.recompile()
   local lvim_modules = {}
   for module, _ in pairs(package.loaded) do
     if module:match "lvim.core" or module:match "lvim.lsp" then
@@ -68,7 +71,7 @@ function M.run_post_update()
   M.reset_cache()
 
   Log:debug "Syncing core plugins"
-  require("lvim.plugin-loader").sync_core_plugins()
+  plugin_loader.sync_core_plugins()
 
   if not in_headless then
     vim.schedule(function()
-- 
cgit v1.2.3