From 54e6d1b8446b3f808149aa8a93c62156dfe89e41 Mon Sep 17 00:00:00 2001 From: Oliver Hartmann Date: Wed, 31 Aug 2022 12:18:50 +0200 Subject: [PATCH] set capabilities correctly --- lua/setup/my_lspconfig.lua | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/lua/setup/my_lspconfig.lua b/lua/setup/my_lspconfig.lua index 1d6c835..6cbf883 100644 --- a/lua/setup/my_lspconfig.lua +++ b/lua/setup/my_lspconfig.lua @@ -20,6 +20,7 @@ capabilities.textDocument.completion.completionItem.resolveSupport = { 'additionalTextEdits', }, } +capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) OpenDiagFloat = function() for _, winid in pairs(vim.api.nvim_tabpage_list_wins(0)) do @@ -102,29 +103,34 @@ local on_attach = function(client, bufnr) end require('lspconfig')['pyright'].setup { + capabilities = capabilities, on_attach = on_attach, } require('lspconfig')['groovyls'].setup { + capabilities = capabilities, on_attach = on_attach, } require('lspconfig')['cmake'].setup { + capabilities = capabilities, on_attach = on_attach, } --- require('lspconfig')['clangd'].setup{ --- on_attach = on_attach, --- } -require('clangd_extensions').setup({ - server = { +require('lspconfig')['clangd'].setup{ + capabilities = capabilities, on_attach = on_attach, - capabilities = capabilities, - cmd = { 'clangd', '--compile-commands-dir=build_nvim' }, - }, -}) +} +-- require('clangd_extensions').setup({ +-- server = { +-- on_attach = on_attach, +-- capabilities = capabilities, +-- cmd = { 'clangd', '--compile-commands-dir=build_nvim' }, +-- }, +-- }) require('lspconfig')['jsonls'].setup { + capabilities = capabilities, on_attach = on_attach, } @@ -132,6 +138,7 @@ local lua_rtp = vim.split(package.path, ';') table.insert(lua_rtp, 'lua/?.lua') table.insert(lua_rtp, 'lua/?/init.lua') require('lspconfig').sumneko_lua.setup { + capabilities = capabilities, on_attach = on_attach, settings = { Lua = { @@ -158,10 +165,12 @@ require('lspconfig').sumneko_lua.setup { } require('lspconfig')['dockerls'].setup { + capabilities = capabilities, on_attach = on_attach, } require('lspconfig')['yamlls'].setup { + capabilities = capabilities, on_attach = on_attach, settings = { yaml = {