feat: reload and lir color update (#3123)

4 files changed, 31 insertions, 17 deletions

diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
index 1dd2494a..84e37655 100644
--- a/lua/lvim/core/builtins/init.lua
+++ b/lua/lvim/core/builtins/init.lua
@@ -26,7 +26,8 @@ local builtins = {
 
 function M.config(config)
   for _, builtin_path in ipairs(builtins) do
-    local builtin = require(builtin_path)
+    local builtin = require("lvim.utils.reload").reload(builtin_path)
+
     builtin.config(config)
   end
 end
diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua
index 3485f348..ab316a9b 100644
--- a/lua/lvim/core/indentlines.lua
+++ b/lua/lvim/core/indentlines.lua
@@ -27,7 +27,7 @@ M.config = function()
 end
 
 M.setup = function()
-  local status_ok, indent_blankline = pcall(require, "indent_blankline")
+  local status_ok, indent_blankline = pcall(reload, "indent_blankline")
   if not status_ok then
     return
   end
diff --git a/lua/lvim/core/lir.lua b/lua/lvim/core/lir.lua
index e65d45dd..a47c40b6 100644
--- a/lua/lvim/core/lir.lua
+++ b/lua/lvim/core/lir.lua
@@ -1,21 +1,20 @@
 local M = {}
 
--- local Log = require "lvim.core.log"
-
 M.config = function()
   lvim.builtin.lir = {
     active = true,
     on_config_done = nil,
+    icon = "",
   }
 
-  local status_ok, lir = pcall(require, "lir")
+  local status_ok, lir = pcall(reload, "lir")
   if not status_ok then
     return
   end
 
-  local actions = require "lir.actions"
-  local mark_actions = require "lir.mark.actions"
-  local clipboard_actions = require "lir.clipboard.actions"
+  local actions = reload "lir.actions"
+  local mark_actions = reload "lir.mark.actions"
+  local clipboard_actions = reload "lir.clipboard.actions"
 
   lir.setup {
     show_hidden_files = false,
@@ -84,31 +83,45 @@ M.config = function()
   }
 
   -- custom folder icon
-  require("nvim-web-devicons").set_icon {
+  reload("nvim-web-devicons").set_icon {
     lir_folder_icon = {
       icon = "",
-      -- color = "#7ebae4",
-      -- color = "#569CD6",
       color = "#42A5F5",
       name = "LirFolderNode",
     },
   }
 end
 
+function M.icon_setup()
+  local function get_hl_by_name(name)
+    local ret = vim.api.nvim_get_hl_by_name(name.group, true)
+    return string.format("#%06x", ret[name.property])
+  end
+
+  local found, icon_hl = pcall(get_hl_by_name, { group = "NvimTreeFolderIcon", property = "foreground" })
+  if not found then
+    icon_hl = "#42A5F5"
+  end
+
+  reload("nvim-web-devicons").set_icon {
+    lir_folder_icon = {
+      icon = lvim.builtin.lir.icon,
+      color = icon_hl,
+      name = "LirFolderNode",
+    },
+  }
+end
+
 function M.setup()
   if lvim.builtin.nvimtree.active then
-    -- Log:warn "Unable to configure lir while nvimtree is active! Please set 'lvim.builtin.nvimtree.active=false'"
     return
   end
 
-  local status_ok, lir = pcall(require, "lir")
+  local status_ok, lir = pcall(reload, "lir")
   if not status_ok then
     return
   end
 
-  lir.setup(lvim.builtin.lir.setup)
-  require("nvim-web-devicons").set_icon(lvim.builtin.lir.icons)
-
   if lvim.builtin.lir.on_config_done then
     lvim.builtin.lir.on_config_done(lir)
   end
diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua
index b861cb59..2d186829 100644
--- a/lua/lvim/core/nvimtree.lua
+++ b/lua/lvim/core/nvimtree.lua
@@ -11,7 +11,7 @@ function M.config()
         "dashboard",
         "alpha",
       },
-      auto_reload_on_write = true,
+      auto_reload_on_write = false,
       hijack_directories = {
         enable = false,
       },