leigh/telescope.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(pickers): config mappings (#1147)

Browse Source 
This happens because we removed our packed deepcopy. So i refactored
this part to not do a deepcopy
This commit is contained in:
Simon Hauser
2021-08-21 20:02:38 +02:00
committed by GitHub
parent 364d795d22
commit 1c276f5539
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lua/telescope/builtin/init.lua
View File

@@ -391,18 +391,15 @@ local apply_config = function(mod)
for k, v in pairs(mod) do for k, v in pairs(mod) do
mod[k] = function(opts) mod[k] = function(opts)
opts = opts or {} opts = opts or {}
local defaults = {}
local pconf = vim.deepcopy(pickers_conf[k] or {}) local pconf = pickers_conf[k] or {}
if pconf.theme then if pconf.theme then
local theme = pconf.theme defaults = require("telescope.themes")["get_" .. pconf.theme](pconf)
pconf.theme = nil
pconf = require("telescope.themes")["get_" .. theme](pconf)
end end
if pconf.mappings then if pconf.mappings then
local mappings = pconf.mappings defaults.attach_mappings = function(_, map)
pconf.mappings = nil for mode, tbl in pairs(pconf.mappings) do
pconf.attach_mappings = function(_, map)
for mode, tbl in pairs(mappings) do
for key, action in pairs(tbl) do for key, action in pairs(tbl) do
map(mode, key, action) map(mode, key, action)
end end
@@ -412,16 +409,14 @@ local apply_config = function(mod)
end end
if pconf.attach_mappings and opts.attach_mappings then if pconf.attach_mappings and opts.attach_mappings then
local attach_mappings = pconf.attach_mappings
pconf.attach_mappings = nil
local opts_attach = opts.attach_mappings local opts_attach = opts.attach_mappings
opts.attach_mappings = function(prompt_bufnr, map) opts.attach_mappings = function(prompt_bufnr, map)
attach_mappings(prompt_bufnr, map) pconf.attach_mappings(prompt_bufnr, map)
return opts_attach(prompt_bufnr, map) return opts_attach(prompt_bufnr, map)
end end
end end
v(vim.tbl_extend("force", pconf, opts)) v(vim.tbl_extend("force", defaults, opts))
end end
end end