nvim-plugins/nvim-jdtls
1
0
Fork 0
mirror of https://github.com/mfussenegger/nvim-jdtls synced 2024-09-16 14:34:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Account for new client.settings in custom configuration handler

Browse source 
Assigning to `client.config.settings` no longer works due to:

  9f8c96240d

Because of that, jdtls actions that generate code reverted to using tabs
instead of spaces.
This commit is contained in:
Mathias Fussenegger 2024-02-19 17:42:14 +01:00 committed by Mathias Fußenegger
parent 81ead309b9
commit 382b9f6258
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lua/jdtls/setup.lua
View file

@ -120,14 +120,19 @@ local function configuration_handler(err, result, ctx, config)
-- This isn't done in start_or_attach because a user could use a plugin like editorconfig to configure tabsize/spaces
-- That plugin may run after `start_or_attach` which is why we defer the setting lookup.
-- This ensures the language-server will use the latest version of the options
client.config.settings = vim.tbl_deep_extend('keep', client.config.settings or {}, {
local new_settings = {
java = {
format = {
insertSpaces = api.nvim_buf_get_option(bufnr, 'expandtab'),
insertSpaces = vim.bo[bufnr].expandtab,
tabSize = lsp.util.get_effective_tabstop(bufnr)
}
}
})
}
if client.settings then
client.settings.java = vim.tbl_deep_extend('keep', client.settings.java or {}, new_settings.java)
else
client.config.settings = vim.tbl_deep_extend('keep', client.config.settings or {}, new_settings)
end
end
return lsp.handlers['workspace/configuration'](err, result, ctx, config)
end