diff options
| author | Michael Lingelbach <m.j.lbach@gmail.com> | 2021-03-28 02:00:11 -0700 |
|---|---|---|
| committer | Michael Lingelbach <m.j.lbach@gmail.com> | 2021-03-28 02:00:24 -0700 |
| commit | 3a6dddd489c41736bc10a35e53f02dec6466d6aa (patch) | |
| tree | 537372dd0ea41422abdb5a6d30519f9a778e744a /lua/lspconfig/configs.lua | |
| parent | Add stop, start, and restart commands (diff) | |
| download | nvim-lspconfig-3a6dddd489c41736bc10a35e53f02dec6466d6aa.tar nvim-lspconfig-3a6dddd489c41736bc10a35e53f02dec6466d6aa.tar.gz nvim-lspconfig-3a6dddd489c41736bc10a35e53f02dec6466d6aa.tar.bz2 nvim-lspconfig-3a6dddd489c41736bc10a35e53f02dec6466d6aa.tar.lz nvim-lspconfig-3a6dddd489c41736bc10a35e53f02dec6466d6aa.tar.xz nvim-lspconfig-3a6dddd489c41736bc10a35e53f02dec6466d6aa.tar.zst nvim-lspconfig-3a6dddd489c41736bc10a35e53f02dec6466d6aa.zip | |
Remove duplicated tbl_deep_extend
Diffstat (limited to 'lua/lspconfig/configs.lua')
| -rw-r--r-- | lua/lspconfig/configs.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lua/lspconfig/configs.lua b/lua/lspconfig/configs.lua index 13b92b17..b0642bf6 100644 --- a/lua/lspconfig/configs.lua +++ b/lua/lspconfig/configs.lua @@ -97,10 +97,10 @@ function configs.__newindex(t, config_name, config_def) end local make_config = function(_root_dir) - local new_config = util.tbl_deep_extend("keep", vim.empty_dict(), config) - new_config = util.tbl_deep_extend('keep', new_config, default_config) + local new_config = vim.tbl_deep_extend("keep", vim.empty_dict(), config) + new_config = vim.tbl_deep_extend('keep', new_config, default_config) new_config.capabilities = new_config.capabilities or lsp.protocol.make_client_capabilities() - new_config.capabilities = util.tbl_deep_extend('keep', new_config.capabilities, { + new_config.capabilities = vim.tbl_deep_extend('keep', new_config.capabilities, { workspace = { configuration = true; } @@ -188,7 +188,7 @@ function configs.__newindex(t, config_name, config_def) client.config._on_attach(client, bufnr) end if client.config.commands and not vim.tbl_isempty(client.config.commands) then - M.commands = util.tbl_deep_extend("force", M.commands, client.config.commands) + M.commands = vim.tbl_deep_extend("force", M.commands, client.config.commands) end if not M.commands_created and not vim.tbl_isempty(M.commands) then -- Create the module commands |