benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-18 19:30:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(configs): simplify module setup process

Browse source 
Abuse a bit of tbl_extend and tbl_deep_extend.
We might want to continue this effort, and simplify this part of the
plugin.

Fixes #178
This commit is contained in:
Thomas Vigouroux 2020-07-15 08:45:08 +02:00 • committed by Thomas Vigouroux
parent 8670df0905
commit e405802863
1 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lua/nvim-treesitter/configs.lua
View file

@ -19,9 +19,8 @@ end
local config = { local config = {
modules = {}, modules = {},
ensure_installed = nil ensure_installed = {}
} }
local user_setup_data = nil
-- List of modules that need to be setup on initialization. -- List of modules that need to be setup on initialization.
local queued_modules_defs = {} local queued_modules_defs = {}
-- Whether we've initialized the plugin yet. -- Whether we've initialized the plugin yet.
@ -86,9 +85,7 @@ local builtin_modules = {
is_supported = function(lang) is_supported = function(lang)
return has_some_textobject_mapping(lang) or queries.has_textobjects(lang) return has_some_textobject_mapping(lang) or queries.has_textobjects(lang)
end, end,
keymaps = { keymaps = {}
inverse_mappings = true
}
} }
} }
@ -281,7 +278,11 @@ end
-- Setup call for users to override module configurations. -- Setup call for users to override module configurations.
-- @param user_data module overrides -- @param user_data module overrides
function M.setup(user_data) function M.setup(user_data)
user_setup_data = user_data or {} for name, data in pairs(user_data) do
local mod = config.modules[name] or {}
M.setup_module(mod, data, name)
config.modules[name] = mod
end
end end
-- Sets up a single module or all submodules of a group. -- Sets up a single module or all submodules of a group.
@ -301,15 +302,7 @@ function M.setup_module(mod, data, mod_name)
mod.disable = data.disable mod.disable = data.disable
end end
if mod.keymaps and type(data.keymaps) == 'table' then if mod.keymaps and type(data.keymaps) == 'table' then
if mod.keymaps.inverse_mappings then mod.keymaps = vim.tbl_extend("force", mod.keymaps, data.keymaps)
mod.keymaps = data.keymaps
else
for f, map in pairs(data.keymaps) do
if mod.keymaps[f] then
mod.keymaps[f] = map
end
end
end
end end
for k, v in pairs(data) do for k, v in pairs(data) do
@ -365,8 +358,7 @@ function M.define_modules(mod_defs)
}) })
end, mod_defs) end, mod_defs)
M.setup_module(mod_defs, user_setup_data) config.modules = vim.tbl_deep_extend("keep", config.modules, mod_defs)
config.modules = vim.tbl_extend("keep", config.modules, mod_defs)
for _, lang in pairs(parsers.available_parsers()) do for _, lang in pairs(parsers.available_parsers()) do
for _, mod in ipairs(M.available_modules(mod_defs)) do for _, mod in ipairs(M.available_modules(mod_defs)) do