End/neovim-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: disabled key maps are now completely removed from which-key

Browse source
This commit is contained in:
Leon Heidelbach 2022-05-14 14:56:55 +02:00 committed by siduck
parent ef27ad4f2d
commit 1bc1d9c52a
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lua/core/utils.lua
View file

@ -24,6 +24,7 @@ end
nvchad.load_config = function() nvchad.load_config = function()
local conf = require "core.default_config" local conf = require "core.default_config"
local ignore_modes = { "mode_opts" }
-- attempt to load and merge a user config -- attempt to load and merge a user config
local chadrc_exists = vim.fn.filereadable(vim.fn.stdpath "config" .. "/lua/custom/chadrc.lua") == 1 local chadrc_exists = vim.fn.filereadable(vim.fn.stdpath "config" .. "/lua/custom/chadrc.lua") == 1
@ -31,7 +32,8 @@ nvchad.load_config = function()
-- 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
local user_config = require "custom.chadrc" local user_config = require "custom.chadrc"
if type(user_config) == "table" then if type(user_config) == "table" then
conf.mappings = nvchad.prune_key_map(conf.mappings, user_config.mappings, { "mode_opts" }) conf.mappings = nvchad.prune_key_map(conf.mappings, user_config.mappings, ignore_modes)
user_config.mappings = nvchad.prune_key_map(user_config.mappings, "rm_disabled", ignore_modes)
conf = vim.tbl_deep_extend("force", conf, user_config) conf = vim.tbl_deep_extend("force", conf, user_config)
else else
error "User config (chadrc.lua) *must* return a table!" error "User config (chadrc.lua) *must* return a table!"
@ -41,7 +43,7 @@ nvchad.load_config = function()
return conf return conf
end end
-- reduces a given keymap to a table of modes each containing a list of key maps for that mode -- reduces a given keymap to a table of modes each containing a list of key maps
nvchad.reduce_key_map = function(key_map, ignore_modes) nvchad.reduce_key_map = function(key_map, ignore_modes)
local prune_keys = {} local prune_keys = {}
for _, modes in pairs(key_map) do for _, modes in pairs(key_map) do
@ -55,11 +57,25 @@ nvchad.reduce_key_map = function(key_map, ignore_modes)
return prune_keys return prune_keys
end end
-- remove disabled mappings from a given key map
nvchad.remove_disabled_mappings = function(key_map)
local clean_map = {}
if type(key_map) == "table" then
for k, v in pairs(key_map) do
if v ~= nil and v ~= "" then clean_map[k] = v end
end
else
return key_map
end
return clean_map
end
-- prune keys from a key map table by matching against another key map table -- prune keys from a key map table by matching against another key map table
nvchad.prune_key_map = function(key_map, prune_map, ignore_modes) nvchad.prune_key_map = function(key_map, prune_map, ignore_modes)
if not prune_map then return key_map end if not prune_map then return key_map end
if not key_map then return prune_map end if not key_map then return prune_map end
local prune_keys = nvchad.reduce_key_map(prune_map, ignore_modes) local prune_keys = type(prune_map) == "table" and nvchad.reduce_key_map(prune_map, ignore_modes)
or { n = {}, v = {}, i = {}, t = {} }
for ext, modes in pairs(key_map) do for ext, modes in pairs(key_map) do
for mode, mappings in pairs(modes) do for mode, mappings in pairs(modes) do
@ -69,7 +85,7 @@ nvchad.prune_key_map = function(key_map, prune_map, ignore_modes)
local filtered_mappings = {} local filtered_mappings = {}
for k, v in pairs(mappings) do for k, v in pairs(mappings) do
if not vim.tbl_contains(prune_keys[mode], k) then if not vim.tbl_contains(prune_keys[mode], k) then
filtered_mappings[k] = v filtered_mappings[k] = nvchad.remove_disabled_mappings(v)
end end
end end
key_map[ext][mode] = filtered_mappings key_map[ext][mode] = filtered_mappings
@ -171,3 +187,4 @@ nvchad.load_override = function(default_table, plugin_name)
return default_table return default_table
end end