diff options
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/schemastore.lua | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/lsp.lua | 7 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/tobyvin/lsp/configs.lua | 9 |
3 files changed, 14 insertions, 4 deletions
diff --git a/nvim/.config/nvim/lua/plugins/schemastore.lua b/nvim/.config/nvim/lua/plugins/schemastore.lua index b424b5a..747dc35 100644 --- a/nvim/.config/nvim/lua/plugins/schemastore.lua +++ b/nvim/.config/nvim/lua/plugins/schemastore.lua @@ -32,7 +32,7 @@ function M.init() for name, override in vim.iter(lsp_settings) do local config = require("tobyvin.lsp.configs")[name] if config then - require("tobyvin.lsp.configs")[name] = vim.tbl_extend("force", config, override) + require("tobyvin.lsp.configs")[name] = vim.tbl_deep_extend("keep", config, override) end end end diff --git a/nvim/.config/nvim/lua/tobyvin/lsp.lua b/nvim/.config/nvim/lua/tobyvin/lsp.lua index 288b5f8..5aa1d3b 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp.lua @@ -23,6 +23,13 @@ vim.api.nvim_create_autocmd("LspAttach", { return end + local config = require("tobyvin.lsp.configs")[client.name] + if config then + vim.iter(config.server_capabilities or {}):each(function(name, value) + client.server_capabilities[name] = value + end) + end + for method, setup_handler in pairs(require("tobyvin.lsp.capabilities")) do if client.supports_method(method, { bufnr = args.buf }) then setup_handler(args.buf, client) diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua index a7c494f..0e92e0f 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua @@ -179,9 +179,9 @@ local M = { end, }, ruff = { - on_attach = function(client, _) - client.server_capabilities.hoverProvider = false - end, + server_capabilities = { + hoverProvider = false, + }, }, taplo = {}, texlab = { @@ -248,6 +248,9 @@ local M = { keyOrdering = false, }, }, + server_capabilities = { + documentFormattingProvider = true, + }, }, zls = {}, } |