Skip to content

Commit e64e384

Browse files
authored
fix(lsp): Merge vim.lsp.config settings with server.default_settings (#980)
1 parent 6a68ea8 commit e64e384

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

lua/rustaceanvim/lsp/init.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ M.start = function(bufnr)
143143
-- (This does not overwrite any existing configs).
144144
vim.lsp.config(ra_client_name, {})
145145
local ra_config = vim.lsp.config[ra_client_name] or {}
146+
if ra_config.settings then
147+
-- Ensure vim.lsp.config settings get merged with server.default_settings.
148+
ra_config.default_settings = ra_config.settings
149+
ra_config.settings = nil
150+
end
146151
-- NOTE: We deep copy to prevent shared state between rust-analyzer clients
147152
local client_config = vim.tbl_deep_extend('force', vim.deepcopy(config.server), ra_config)
148153
---@type rustaceanvim.lsp.StartConfig

0 commit comments

Comments
 (0)