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

fix: moved lsp mappings to lspconfig to only be set on lsp attach

Browse source
This commit is contained in:
Leon Heidelbach 2022-05-25 01:16:08 +02:00 • committed by siduck
parent c7cfacd360
commit 5ba309a0df
4 changed files with 108 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/core/mappings.lua
View file

@ -102,6 +102,8 @@ M.comment = {
M.lspconfig = {
-- See `<cmd> :help vim.lsp.*` for documentation on any of the below functions
ignore = { "/lua/plugins/configs/whichkey.lua" },
n = {
["gD"] = {
function()

53
lua/core/utils.lua
View file

@ -36,8 +36,8 @@ nvchad.load_config = function()
if type(user_config) == "table" then
conf.mappings = conf.mappings and nvchad.prune_key_map(conf.mappings, user_config.mappings, ignore_modes) or {}
user_config.mappings = user_config.mappings
and nvchad.prune_key_map(user_config.mappings, "rm_disabled", ignore_modes)
or {}
and nvchad.prune_key_map(user_config.mappings, "rm_disabled", ignore_modes)
or {}
conf = vim.tbl_deep_extend("force", conf, user_config)
else
error "User config (chadrc.lua) *must* return a table!"
@ -90,7 +90,7 @@ nvchad.prune_key_map = function(key_map, prune_map, ignore_modes)
return prune_map
end
local prune_keys = type(prune_map) == "table" and nvchad.reduce_key_map(prune_map, ignore_modes)
or { n = {}, v = {}, i = {}, t = {} }
or { n = {}, v = {}, i = {}, t = {} }
for ext, modes in pairs(key_map) do
for mode, mappings in pairs(modes) do
@ -126,9 +126,33 @@ nvchad.map = function(mode, keys, command, opt)
vim.keymap.set(mode, keys, command, opt)
end
-- For those who disabled whichkey
nvchad.no_WhichKey_map = function()
local mappings = nvchad.load_config().mappings
-- register mappings through which-key
nvchad.whichKey_map = function(maps, opts)
local present, wk = pcall(require, "which-key")
local caller_path = nvchad.get_caller_file_path()
if not present then
return false
end
for mode, opt in pairs(opts.mode_opts) do
for _, value in pairs(maps) do
if value[mode] then
-- check if caller_path is in the ignore list
if not value["ignore"] or not vim.tbl_contains(value["ignore"], caller_path) then
local mode_opts = value["mode_opts"] and
vim.tbl_deep_extend("force", opt, value["mode_opts"]) or opt
wk.register(value[mode], mode_opts)
end
end
end
end
return true
end
-- for those who disabled whichkey and want to add specific mapping tables
nvchad.no_WhichKey_table_map = function(mappings)
local ignore_modes = { "mode_opts" }
for _, value in pairs(mappings) do
@ -145,6 +169,13 @@ nvchad.no_WhichKey_map = function()
end
end
-- for those who disabled whichkey
nvchad.no_WhichKey_map = function()
local mappings = nvchad.load_config().mappings
nvchad.no_WhichKey_table_map(mappings)
end
-- load plugin after entering vim ui
nvchad.packer_lazy_load = function(plugin, timer)
if plugin then
@ -197,3 +228,13 @@ nvchad.load_override = function(default_table, plugin_name)
return default_table
end
nvchad.get_caller_file_path = function()
local success, result = pcall(debug.getinfo, 4, "S")
if success then
return result.source:match("@(.*)"):gsub(vim.fn.stdpath("config"), "")
else
return ""
end
end