From e8bbe1e4a1b9b4f27c88ccad7e47defc81e37163 Mon Sep 17 00:00:00 2001 From: siduck76 Date: Sat, 9 Oct 2021 11:17:21 +0530 Subject: [PATCH] Revert "update : capabalities cmp stuff in lspconfig | load cmp_lsp after lspconfig" This reverts commit 86d92a2fd212fe7d7abffe5349686f2c87c3f9bf. --- lua/plugins/configs/lspconfig.lua | 16 +++++++++++++++- lua/plugins/init.lua | 4 +--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua index d0c6727..36446d1 100644 --- a/lua/plugins/configs/lspconfig.lua +++ b/lua/plugins/configs/lspconfig.lua @@ -36,7 +36,21 @@ local function on_attach(_, bufnr) end local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities) +capabilities.textDocument.completion.completionItem.documentationFormat = { "markdown", "plaintext" } +capabilities.textDocument.completion.completionItem.snippetSupport = true +capabilities.textDocument.completion.completionItem.preselectSupport = true +capabilities.textDocument.completion.completionItem.insertReplaceSupport = true +capabilities.textDocument.completion.completionItem.labelDetailsSupport = true +capabilities.textDocument.completion.completionItem.deprecatedSupport = true +capabilities.textDocument.completion.completionItem.commitCharactersSupport = true +capabilities.textDocument.completion.completionItem.tagSupport = { valueSet = { 1 } } +capabilities.textDocument.completion.completionItem.resolveSupport = { + properties = { + "documentation", + "detail", + "additionalTextEdits", + }, +} -- replace the default lsp diagnostic symbols local function lspSymbol(name, icon) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 8538568..52ccef4 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -159,7 +159,6 @@ return packer.startup(function() use { "hrsh7th/nvim-cmp", - module = "cmp", disable = not status.cmp, after = "friendly-snippets", config = override_req("nvim_cmp", "plugins.configs.cmp"), @@ -188,8 +187,7 @@ return packer.startup(function() use { "hrsh7th/cmp-nvim-lsp", disable = not status.cmp, - module = "cmp_nvim_lsp", - after = "nvim-lspconfig", + after = "cmp-nvim-lua", } use {