From c035fc7fd51e6f6978b55a613bfc72188d168993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 8 Jul 2025 23:37:54 +0200 Subject: [PATCH] nvim: move out capabilities to a module --- .config/nvim/lua/lsp.lua | 4 ++++ .config/nvim/plugin/lsp.lua | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 34cfcacf..c0b7b450 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -29,4 +29,8 @@ M.on_attach = function(client, bufnr) end end +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities) +M.capabilities = capabilities + return M diff --git a/.config/nvim/plugin/lsp.lua b/.config/nvim/plugin/lsp.lua index e02aec21..65333cba 100644 --- a/.config/nvim/plugin/lsp.lua +++ b/.config/nvim/plugin/lsp.lua @@ -114,10 +114,6 @@ end -- Set log level vim.lsp.set_log_level("off") --- Capabilities -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities) - ---------- -- Init -- ---------- @@ -125,7 +121,7 @@ local mylsp = require("lsp") for name, config in pairs(servers) do require("lspconfig")[name].setup { - capabilities = capabilities, + capabilities = mylsp.capabilities, settings = config.settings, -- NOTE: https://github.com/neovim/neovim/issues/30675 offset_encoding = config.offset_encoding or "utf-8", @@ -142,7 +138,7 @@ end -- Java local config = { on_attach = mylsp.on_attach, - capabilities = capabilities, + capabilities = mylsp.capabilities, cmd = { -- https://github.com/NixOS/nixpkgs/issues/232822#issuecomment-1564243667 -- `-data` argument is necessary @@ -162,7 +158,7 @@ vim.api.nvim_create_autocmd("FileType", { -- Scala local metals = require("metals") local metals_config = metals.bare_config() -metals_config.capabilities = capabilities +metals_config.capabilities = mylsp.capabilities metals_config.settings.useGlobalExecutable = true require("dap").configurations.scala = {