From b04ecb95416aa4df09969f2b2744830291843dce Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Sun, 3 Oct 2021 12:46:40 +0530
Subject: [PATCH] nvim: lsp: Remove redundant capabilities settings

The required capabilities to be set are already correctly set by
nvim-cmp, no need to set them again. We had added that to enable rust
snippet expansion earlier.

Also see older revisions of this document.
https://github.com/neovim/nvim-lspconfig/wiki/Snippets
---
 nvim/.config/nvim/lua/lsp.lua | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua
index c2bf5ad..7a051a1 100644
--- a/nvim/.config/nvim/lua/lsp.lua
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -206,19 +206,8 @@ local determine_setup_lua = function ()
   return library, runtime_path, lua_version()
 end
 
-local get_snippet_capabilities = function()
-  local capabilities = vim.lsp.protocol.make_client_capabilities()
-
-  capabilities.textDocument.completion.completionItem.snippetSupport = true
-  capabilities.textDocument.completion.completionItem.resolveSupport = {
-    properties = {
-      'documentation',
-      'detail',
-      'additionalTextEdits',
-    }
-  }
-  return cmp.update_capabilities(capabilities)
-end
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = cmp.update_capabilities(capabilities)
 
 local rust_tool_opts = {
   tools = {
@@ -245,7 +234,7 @@ local rust_tool_opts = {
   },
   server = {
     on_attach    = on_attach,
-    capabilities = get_snippet_capabilities(),
+    capabilities = capabilities,
     settings = {
       ["rust-analyzer"] = {
         checkOnSave = {
@@ -260,13 +249,13 @@ local servers = { 'hls', 'pylsp', 'tsserver' }
 for _, lsp in ipairs(servers) do
   nvim_lsp[lsp].setup {
     on_attach    = on_attach,
-    capabilities = get_snippet_capabilities(),
+    capabilities = capabilities
   }
 end
 
 nvim_lsp.clangd.setup {
   on_attach    = on_attach,
-  capabilities = get_snippet_capabilities(),
+  capabilities = capabilities,
   default_config = {
     cmd       = { "clangd", "--background-index", "--pch-storage=memory", "--clang-tidy", "--suggest-missing-includes" },
     filetypes = { 'c', 'cpp' },
@@ -286,7 +275,7 @@ local library, runtime_path, lua_version = determine_setup_lua()
 nvim_lsp.sumneko_lua.setup {
   cmd          = { "/usr/bin/lua-language-server" };
   on_attach    = on_attach,
-  capabilities = get_snippet_capabilities(),
+  capabilities = capabilities,
   settings = {
     Lua = {
       runtime = {