From 307db8936b291b82124f05bdcfeb85be5464f21d Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Thu, 9 Dec 2021 17:08:53 +0100 Subject: feat: multiple enhancements to lvim-reload (#2054) --- lua/lvim/config/init.lua | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'lua/lvim/config/init.lua') diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua index a3c5af24..fba6213d 100644 --- a/lua/lvim/config/init.lua +++ b/lua/lvim/config/init.lua @@ -98,28 +98,20 @@ end --- Override the configuration with a user provided one -- @param config_path The path to the configuration overrides function M:reload() - local lvim_modules = {} - for module, _ in pairs(package.loaded) do - if module:match "lvim.core" then - package.loaded[module] = nil - table.insert(lvim_modules, module) - end - end + package.loaded["lvim.utils.hooks"] = nil + local _, hooks = pcall(require, "lvim.utils.hooks") + hooks.run_pre_reload() M:init() M:load() + require("lvim.core.autocmds").configure_format_on_save() + local plugins = require "lvim.plugins" - local autocmds = require "lvim.core.autocmds" - autocmds.configure_format_on_save() local plugin_loader = require "lvim.plugin-loader" - plugin_loader.cache_clear() + plugin_loader.load { plugins, lvim.plugins } - vim.cmd ":PackerInstall" - vim.cmd ":PackerCompile" - -- vim.cmd ":PackerClean" - require("lvim.lsp").setup() - Log:info "Reloaded configuration" + hooks.run_post_reload() end return M -- cgit v1.2.3