From 627fdd60493860c9c5194d8ec0a70ec5aaa45bf8 Mon Sep 17 00:00:00 2001 From: Chase Colman <5411+chase@users.noreply.github.com> Date: Thu, 11 Nov 2021 04:45:52 +0800 Subject: fix(keymap): unset on reload, load correct order, add unset default (#1942) fix(keymap): don't unset default keymaps on reload unless set to false fix(keymaps): prevent accessing undefined default mode fix(keymap): use unadapted mode for default check fix(keymap): apply initial lvim.keys --- lua/lvim/config/init.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lua/lvim/config/init.lua') diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua index c932c456..20bc4c81 100644 --- a/lua/lvim/config/init.lua +++ b/lua/lvim/config/init.lua @@ -26,15 +26,14 @@ function M:init() lvim.database = { save_location = utils.join_paths(home_dir, ".config", "lunarvim_db"), auto_execute = 1 } end + lvim.keys = apply_defaults(lvim.keys, require("lvim.keymappings").get_defaults()) + local builtins = require "lvim.core.builtins" builtins.config { user_config_file = user_config_file } local settings = require "lvim.config.settings" settings.load_options() - local default_keymaps = require("lvim.keymappings").get_defaults() - lvim.keys = apply_defaults(lvim.keys, default_keymaps) - local autocmds = require "lvim.core.autocmds" lvim.autocommands = apply_defaults(lvim.autocommands, autocmds.load_augroups()) @@ -89,6 +88,9 @@ function M:load(config_path) autocmds.define_augroups(lvim.autocommands) vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader + + local default_keymaps = require("lvim.keymappings").get_defaults() + lvim.keys = apply_defaults(lvim.keys, default_keymaps) require("lvim.keymappings").load(lvim.keys) local settings = require "lvim.config.settings" @@ -98,6 +100,8 @@ end --- Override the configuration with a user provided one -- @param config_path The path to the configuration overrides function M:reload() + require("lvim.keymappings").clear(lvim.keys) + local lvim_modules = {} for module, _ in pairs(package.loaded) do if module:match "lvim.core" then -- cgit v1.2.3 From b0a9ee720a64f4ec1563e7358d58506a714d39fe Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Sun, 14 Nov 2021 13:44:00 +0100 Subject: refactor: more configurable format-on-save (#1937) --- lua/lvim/config/init.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lua/lvim/config/init.lua') diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua index 20bc4c81..8359ff18 100644 --- a/lua/lvim/config/init.lua +++ b/lua/lvim/config/init.lua @@ -20,7 +20,7 @@ end -- Define lvim global variable function M:init() if vim.tbl_isempty(lvim or {}) then - lvim = require "lvim.config.defaults" + lvim = vim.deepcopy(require "lvim.config.defaults") local home_dir = vim.loop.os_homedir() lvim.vsnip_dir = utils.join_paths(home_dir, ".config", "snippets") lvim.database = { save_location = utils.join_paths(home_dir, ".config", "lunarvim_db"), auto_execute = 1 } @@ -114,7 +114,8 @@ function M:reload() M:load() local plugins = require "lvim.plugins" - utils.toggle_autoformat() + 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 } -- cgit v1.2.3 From c26ac5364f2bb04b7428105db39c12c6549d5dfb Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:04:34 +0100 Subject: refactor: load the default keymaps once (#1965) --- lua/lvim/config/init.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lua/lvim/config/init.lua') diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua index 8359ff18..a3c5af24 100644 --- a/lua/lvim/config/init.lua +++ b/lua/lvim/config/init.lua @@ -26,7 +26,7 @@ function M:init() lvim.database = { save_location = utils.join_paths(home_dir, ".config", "lunarvim_db"), auto_execute = 1 } end - lvim.keys = apply_defaults(lvim.keys, require("lvim.keymappings").get_defaults()) + require("lvim.keymappings").load_defaults() local builtins = require "lvim.core.builtins" builtins.config { user_config_file = user_config_file } @@ -89,8 +89,6 @@ function M:load(config_path) vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader - local default_keymaps = require("lvim.keymappings").get_defaults() - lvim.keys = apply_defaults(lvim.keys, default_keymaps) require("lvim.keymappings").load(lvim.keys) local settings = require "lvim.config.settings" @@ -100,8 +98,6 @@ end --- Override the configuration with a user provided one -- @param config_path The path to the configuration overrides function M:reload() - require("lvim.keymappings").clear(lvim.keys) - local lvim_modules = {} for module, _ in pairs(package.loaded) do if module:match "lvim.core" then -- cgit v1.2.3 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