diff options
Diffstat (limited to 'lua/lspconfig/configs.lua')
| -rw-r--r-- | lua/lspconfig/configs.lua | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lua/lspconfig/configs.lua b/lua/lspconfig/configs.lua index a47ecbae..49bac987 100644 --- a/lua/lspconfig/configs.lua +++ b/lua/lspconfig/configs.lua @@ -1,6 +1,6 @@ local util = require 'lspconfig.util' local api, validate, lsp = vim.api, vim.validate, vim.lsp -local tbl_extend = vim.tbl_extend +local tbl_deep_extend = vim.tbl_deep_extend local configs = {} @@ -25,7 +25,7 @@ function configs.__newindex(t, config_name, config_def) local M = {} - local default_config = tbl_extend('keep', config_def.default_config, util.default_config) + local default_config = tbl_deep_extend('keep', config_def.default_config, util.default_config) -- Force this part. default_config.name = config_name @@ -48,7 +48,7 @@ function configs.__newindex(t, config_name, config_def) end end - config = tbl_extend('keep', config, default_config) + config = tbl_deep_extend('keep', config, default_config) if util.on_setup then pcall(util.on_setup, config) @@ -137,10 +137,8 @@ function configs.__newindex(t, config_name, config_def) end local make_config = function(root_dir) - 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 = vim.tbl_deep_extend('keep', new_config.capabilities, { + local new_config = tbl_deep_extend('keep', vim.empty_dict(), config) + new_config.capabilities = tbl_deep_extend('keep', new_config.capabilities, { workspace = { configuration = true, }, |