summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2021-08-27 09:00:15 +0200
committerAndreas Schneider <asn@cryptomilk.org>2021-08-27 09:00:15 +0200
commitbc29b0244cd854bc6608579d0c3c354c28f07685 (patch)
treeab3af9ef7f1b7ee592fcff80387f64086e2e80a4
parent38dee524792962c3c29342e7559bc2670c60504a (diff)
downloaddotfiles-bc29b0244cd854bc6608579d0c3c354c28f07685.tar.gz
dotfiles-bc29b0244cd854bc6608579d0c3c354c28f07685.tar.xz
dotfiles-bc29b0244cd854bc6608579d0c3c354c28f07685.zip
nvim:lsp: Announce nvim-cmp client capabilities to servers
-rw-r--r--nvim/.config/nvim/lua/lsp/init.lua9
1 files changed, 9 insertions, 0 deletions
diff --git a/nvim/.config/nvim/lua/lsp/init.lua b/nvim/.config/nvim/lua/lsp/init.lua
index 4e7ccd8..689da4d 100644
--- a/nvim/.config/nvim/lua/lsp/init.lua
+++ b/nvim/.config/nvim/lua/lsp/init.lua
@@ -19,6 +19,7 @@ local lsp_on_attach = function(client, bufnr)
pcall(require, "cmp_nvim_lsp") and
pcall(require, "luasnip") then
+
require('cmp_nvim_lsp').setup()
local cmp = require('cmp')
@@ -275,8 +276,16 @@ if util.shell_type('diagnostic-languageserver') then
}
end
+local lsp_capabilities = vim.lsp.protocol.make_client_capabilities()
+-- nvim-cmp almost supports LSP's capabilities, advertise it to LSP servers.
+if pcall(require, "cmp") and
+ pcall(require, 'cmp_nvim_lsp') then
+ lsp_capabilities = require('cmp_nvim_lsp').update_capabilities(lsp_capabilities)
+end
+
for _, lsp in ipairs(lsp_servers) do
lsp_config[lsp].setup {
on_attach = lsp_on_attach,
+ capabilities = lsp_capabilities,
}
end