Nvim: move to nvim-cmp

.config/nvim/after/available/lspconfig.rc.lua

@@ -1,5 +1,4 @@
 local nvim_lsp = require('lspconfig')
-local coq = require('coq')
 local clangd_extensions = require('clangd_extensions')
 local lsp_signature = require('lsp_signature')
 
@@ -43,40 +42,41 @@ local on_attach = function(client, bufnr)
 end
 
 local signs = {
-    { name = "DiagnosticSignError", text = "" },
-    { name = "DiagnosticSignWarn", text = "" },
-    { name = "DiagnosticSignHint", text = "" },
-    { name = "DiagnosticSignInfo", text = "" },
-  }
+  { name = "DiagnosticSignError", text = "" },
+  { name = "DiagnosticSignWarn", text = "" },
+  { name = "DiagnosticSignHint", text = "" },
+  { name = "DiagnosticSignInfo", text = "" },
+}
 
-  for _, sign in ipairs(signs) do
-    vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" })
-  end
+for _, sign in ipairs(signs) do
+  vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" })
+end
 
-vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
-  vim.lsp.diagnostic.on_publish_diagnostics, {
-    signs = {
-      active = signs,
-      --severity_limit = 'info',
-    },
-    severity_sort = true,
-    underline = false,
-    update_in_insert = false,
-    --virtual_text = {
-    --  spacing = 40,
-    --  severity_limit = 'Warning',
-    --},
-    virtual_text = false,
-  }
-)
+--vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
+--  vim.lsp.diagnostic.on_publish_diagnostics, {
+--    signs = {
+--      active = signs,
+--      --severity_limit = 'info',
+--    },
+--    severity_sort = true,
+--    underline = false,
+--    update_in_insert = false,
+--    --virtual_text = {
+--    --  spacing = 40,
+--    --  severity_limit = 'Warning',
+--    --},
+--    virtual_text = false,
+--  }
+--)
+--
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
 
-nvim_lsp.groovyls.setup (coq.lsp_ensure_capabilities({
+nvim_lsp.groovyls.setup({
   cmd = { "java", "-jar", "/home/kmcr/tools/groovy-language-server/build/libs/groovy-language-server-all.jar" },
   on_attach = on_attach,
-  on_publish_diagnostics = diagnostic_handler,
-  capabilities = vim.lsp.protocol.make_client_capabilities(),
-  })
-)
+  --on_publish_diagnostics = diagnostic_handler,
+  capabilities = capabilities
+})
 
 -- nvim_lsp.ccls.setup(
 --   coq.lsp_ensure_capabilities({
@@ -92,14 +92,13 @@ nvim_lsp.groovyls.setup (coq.lsp_ensure_capabilities({
 --     root_dir = nvim_lsp.util.root_pattern("compile_commands.json"),
 --     on_attach = on_attach,
 --     on_publish_diagnostics = diagnostic_handler,
---     capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()),
 --     flags = {
 --       debounce_text_changes = 150,
 --     }}
 --   )
 -- )
 
-clangd_extensions.setup(coq.lsp_ensure_capabilities({
+clangd_extensions.setup({
   server = {
     on_attach = on_attach,
     root_pattern = {
@@ -109,16 +108,17 @@ clangd_extensions.setup(coq.lsp_ensure_capabilities({
       'compile_commands.json',
       'compile_flags.txt',
       'configure.ac',
-    }
+    },
+    capabilities = capabilities
   },
   inlay_hints = {
     max_len_align = true,
     max_len_align_padding = 3,
     right_align = true,
   }
-}))
+})
 
-nvim_lsp.pylsp.setup(coq.lsp_ensure_capabilities({
+nvim_lsp.pylsp.setup({
   settings = {
     pylint = {
       enabled = false
@@ -127,24 +127,24 @@ nvim_lsp.pylsp.setup(coq.lsp_ensure_capabilities({
       enabled = false,
     },
   },
-  flags = {
-    debounce_text_changes = 150,
-  },
+  -- flags = {
+  --   debounce_text_changes = 150,
+  -- },
   on_attach = on_attach,
-  on_publish_diagnostics = diagnostic_handler,
-  capabilities = vim.lsp.protocol.make_client_capabilities(),
-}))
+  capabilities = capabilities
+  --on_publish_diagnostics = diagnostic_handler,
+})
 
 -- Use a loop to conveniently call 'setup' on multiple servers and
 -- map buffer local keybindings when the language server attaches
 local servers = { "cmake", "rust_analyzer", "bashls" }
 for _, lsp in ipairs(servers) do
-  nvim_lsp[lsp].setup(coq.lsp_ensure_capabilities({
+  nvim_lsp[lsp].setup({
     on_attach = on_attach,
-    on_publish_diagnostics = diagnostic_handler,
-    capabilities = vim.lsp.protocol.make_client_capabilities(),
-    flags = {
-      debounce_text_changes = 150,
-    }
-  }))
+    --on_publish_diagnostics = diagnostic_handler,
+    capabilities = capabilities,
+    -- flags = {
+    --   debounce_text_changes = 150,
+    -- }
+  })
 end