Revert "update : capabalities cmp stuff in lspconfig | load cmp_lsp after lspconfig"

This reverts commit 86d92a2fd2.
This commit is contained in:
siduck76 2021-10-09 11:17:21 +05:30
parent d221504482
commit e8bbe1e4a1
2 changed files with 16 additions and 4 deletions

View file

@ -36,7 +36,21 @@ local function on_attach(_, bufnr)
end end
local capabilities = vim.lsp.protocol.make_client_capabilities() 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 -- replace the default lsp diagnostic symbols
local function lspSymbol(name, icon) local function lspSymbol(name, icon)

View file

@ -159,7 +159,6 @@ return packer.startup(function()
use { use {
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
module = "cmp",
disable = not status.cmp, disable = not status.cmp,
after = "friendly-snippets", after = "friendly-snippets",
config = override_req("nvim_cmp", "plugins.configs.cmp"), config = override_req("nvim_cmp", "plugins.configs.cmp"),
@ -188,8 +187,7 @@ return packer.startup(function()
use { use {
"hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-nvim-lsp",
disable = not status.cmp, disable = not status.cmp,
module = "cmp_nvim_lsp", after = "cmp-nvim-lua",
after = "nvim-lspconfig",
} }
use { use {