pt/nvchad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utils: Improve remove_default_keys function

Browse Source 
undo this black magic
This commit is contained in:
Akianonymus 2022-08-06 20:59:40 +05:30 committed by Sidhanth Rathod
parent 5bd4282835
commit d7b97dfe63
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lua/core/utils.lua
View File

@ -22,8 +22,8 @@ M.load_config = function()
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
M.remove_default_keys() config.mappings = M.remove_default_keys(chadrc.mappings.disabled or nil, config.mappings)
config = merge_tb("force", config, chadrc) config = merge_tb("force", config, chadrc) or {}
else else
error "chadrc must return a table!" error "chadrc must return a table!"
end end
@ -33,35 +33,35 @@ M.load_config = function()
return config return config
end end
M.remove_default_keys = function() M.remove_default_keys = function(disabled_mappings, default_mappings)
local chadrc = require "custom.chadrc" if not disabled_mappings then
local user_mappings = chadrc.mappings or {} return default_mappings
local user_keys = {}
local user_sections = vim.tbl_keys(user_mappings)
-- push user_map keys in user_keys table
for _, section in ipairs(user_sections) do
user_keys = vim.tbl_deep_extend("force", user_keys, user_mappings[section])
end end
local function disable_key(mode, keybind, mode_mapping) -- store keys in a array with true value to compare
local keys_in_mode = vim.tbl_keys(user_keys[mode] or {}) local keys_to_disable = {}
for _, section_keys in pairs(disabled_mappings) do
if vim.tbl_contains(keys_in_mode, keybind) then if type(section_keys) == "table" then
mode_mapping[keybind] = nil for k, _ in pairs(section_keys) do
keys_to_disable[k] = true
end
end end
end end
local default_mappings = require("core.default_config").mappings -- make a copy as we need to modify default_mappings
for section_name, section_mappings in pairs(default_mappings) do
-- remove user_maps from default mapping table section_mappings.plugin = nil
for _, section_mappings in pairs(default_mappings) do
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 k, _ in pairs(mode_mapping) do
disable_key(mode, keybind, mode_mapping) -- if key if found then remove from default_mappings
if keys_to_disable[k] then
default_mappings[section_name][mode][k] = nil
end end
end end
end end
end
return default_mappings
end end
M.load_mappings = function(mappings, mapping_opt) M.load_mappings = function(mappings, mapping_opt)