fix breaking change in hrsh7th/cmp-nvim-lsp/issues/38

Arjun31415 · Oct 16, 2022 · 7eb277a · 7eb277a
1 parent a0cb6cc
commit 7eb277a
Show file tree

Hide file tree

Showing 4 changed files with 919 additions and 1,096 deletions.
diff --git a/lua/config/lsp/handlers.lua b/lua/config/lsp/handlers.lua
@@ -80,11 +80,10 @@ M.on_attach = function(client, bufnr)
   if client.server_capabilities.documentSymbolProvider and client.name ~= "html" then navic_attach(client, bufnr) end
 end
 
-local capabilities = vim.lsp.protocol.make_client_capabilities()
 M.capabilities = {}
 local status_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
 if not status_ok then return M end
 
-M.capabilities = cmp_nvim_lsp.update_capabilities(capabilities)
+M.capabilities = cmp_nvim_lsp.default_capabilities()
 
 return M
diff --git a/lua/config/lsp/lsp-installer.lua b/lua/config/lsp/lsp-installer.lua
@@ -91,6 +91,8 @@ lspconfig.tailwindcss.setup({ on_attach = configFunctions.on_attach })
 lspconfig.vimls.setup({ on_attach = configFunctions.on_attach })
 -- rust_analyzer
 require("config.lsp.settings.rust")
+-- java server setup
+lspconfig.jdtls.setup({ on_attach = configFunctions.on_attach})
 -- lspconfig.rust_analyzer.setup({on_attach = configFunctions.on_attach})
 -- latex server
 lspconfig.texlab.setup({ on_attach = configFunctions.on_attach })

diff --git a/lua/config/nvim-cmp.lua b/lua/config/nvim-cmp.lua
@@ -88,7 +88,7 @@ cmp.setup({
 })
 cmp.setup.filetype("gitcommit", {
   sources = cmp.config.sources({
-    { name = "cmp_git" }, -- You can specify the `cmp_git` source if you were installed it.
+    { name = "cmp_git" }, -- You can specify the `cmp_git` source if you have installed it.
   }, { { name = "buffer" } }),
 })