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

fixup: proper union of tables

Browse source
This commit is contained in:
Christian Clason 2024-01-18 17:08:20 +01:00
parent 503d0ccdee
commit 5037721ec5
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -405,6 +405,18 @@ function M.is_enabled(mod, lang, bufnr)
return true return true
end end
---Combine two list-like tables without duplicates
local union = function(x, y)
local map = {}
for _, v in ipairs(x) do
map[v] = true
end
for _, v in ipairs(y) do
map[v] = true
end
return vim.tbl_keys(map)
end
---Setup call for users to override module configurations. ---Setup call for users to override module configurations.
---@param user_data TSConfig module overrides ---@param user_data TSConfig module overrides
function M.setup(user_data) function M.setup(user_data)
@ -422,7 +434,7 @@ function M.setup(user_data)
local ensure_installed = user_data.ensure_installed or config.ensure_installed local ensure_installed = user_data.ensure_installed or config.ensure_installed
if type(ensure_installed) == "table" and type(config.ensure_installed) == "table" then if type(ensure_installed) == "table" and type(config.ensure_installed) == "table" then
vim.list_extend(ensure_installed, config.ensure_installed) union(ensure_installed, config.ensure_installed)
end end
if #ensure_installed > 0 then if #ensure_installed > 0 then
if user_data.sync_install then if user_data.sync_install then