DevComp/my-nvim-setup
1
0
Fork 0
mirror of https://github.com/CompeyDev/my-nvim-setup.git synced 2024-12-12 12:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add whichkey groups back

Browse source
This commit is contained in:
siduck 2022-08-07 08:50:36 +05:30
parent 0b83d9cc0c
commit d2dec96ad6
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lua/core/utils.lua
View file

@ -15,10 +15,27 @@ M.close_buffer = function(bufnr)
end end
end end
-- store mapping section names which have plugin key = true
local lazyload_mappings_list = {}
local add_mappingSection_toList = function()
local default_mappings = require("core.default_config").mappings
-- store mapping section name into a table
for section_name, section_mappings in pairs(default_mappings) do
if section_mappings.plugin then
lazyload_mappings_list[section_name] = true
section_mappings.plugin = nil
end
end
end
M.load_config = function() M.load_config = function()
local config = require "core.default_config" local config = require "core.default_config"
local chadrc_exists, chadrc = pcall(require, "custom.chadrc") local chadrc_exists, chadrc = pcall(require, "custom.chadrc")
add_mappingSection_toList()
if chadrc_exists then if chadrc_exists then
-- merge user config if it exists and is a table; otherwise display an error -- merge user config if it exists and is a table; otherwise display an error
if type(chadrc) == "table" then if type(chadrc) == "table" then
@ -33,9 +50,6 @@ M.load_config = function()
return config return config
end end
-- store mapping section names which have plugin key = true
local lazyload_mappings_list = {}
M.remove_default_keys = function(user_mappings) M.remove_default_keys = function(user_mappings)
local user_keys = {} local user_keys = {}
local user_sections = vim.tbl_keys(user_mappings) local user_sections = vim.tbl_keys(user_mappings)
@ -54,13 +68,7 @@ M.remove_default_keys = function(user_mappings)
local default_mappings = require("core.default_config").mappings local default_mappings = require("core.default_config").mappings
-- remove user_maps from default mapping table -- remove user_maps from default mapping table
for section_name, section_mappings in pairs(default_mappings) do for _, section_mappings in pairs(default_mappings) do
-- store mapping section name into a table
if section_mappings.plugin then
lazyload_mappings_list[section_name] = true
section_mappings.plugin = nil
end
for mode, mode_mapping in pairs(section_mappings) do for mode, mode_mapping in pairs(section_mappings) do
for keybind, _ in pairs(mode_mapping) do for keybind, _ in pairs(mode_mapping) do
disable_key(mode, keybind, mode_mapping) disable_key(mode, keybind, mode_mapping)

10
lua/plugins/configs/whichkey.lua
View file

@ -38,4 +38,14 @@ local options = {
options = require("core.utils").load_override(options, "folke/which-key.nvim") options = require("core.utils").load_override(options, "folke/which-key.nvim")
local utils = require "core.utils"
local mappings = utils.load_config().mappings
local mapping_groups = { groups = vim.deepcopy(mappings.groups) }
mappings.disabled = nil
mappings.groups = nil
utils.load_mappings(mapping_groups)
wk.setup(options) wk.setup(options)