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
This commit is contained in:
parent
cf78dcae4d
commit
b04ecb9541
|
@ -206,19 +206,8 @@ local determine_setup_lua = function ()
|
||||||
return library, runtime_path, lua_version()
|
return library, runtime_path, lua_version()
|
||||||
end
|
end
|
||||||
|
|
||||||
local get_snippet_capabilities = function()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
capabilities = cmp.update_capabilities(capabilities)
|
||||||
|
|
||||||
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
|
||||||
capabilities.textDocument.completion.completionItem.resolveSupport = {
|
|
||||||
properties = {
|
|
||||||
'documentation',
|
|
||||||
'detail',
|
|
||||||
'additionalTextEdits',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return cmp.update_capabilities(capabilities)
|
|
||||||
end
|
|
||||||
|
|
||||||
local rust_tool_opts = {
|
local rust_tool_opts = {
|
||||||
tools = {
|
tools = {
|
||||||
|
@ -245,7 +234,7 @@ local rust_tool_opts = {
|
||||||
},
|
},
|
||||||
server = {
|
server = {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = get_snippet_capabilities(),
|
capabilities = capabilities,
|
||||||
settings = {
|
settings = {
|
||||||
["rust-analyzer"] = {
|
["rust-analyzer"] = {
|
||||||
checkOnSave = {
|
checkOnSave = {
|
||||||
|
@ -260,13 +249,13 @@ local servers = { 'hls', 'pylsp', 'tsserver' }
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
nvim_lsp[lsp].setup {
|
nvim_lsp[lsp].setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = get_snippet_capabilities(),
|
capabilities = capabilities
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
nvim_lsp.clangd.setup {
|
nvim_lsp.clangd.setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = get_snippet_capabilities(),
|
capabilities = capabilities,
|
||||||
default_config = {
|
default_config = {
|
||||||
cmd = { "clangd", "--background-index", "--pch-storage=memory", "--clang-tidy", "--suggest-missing-includes" },
|
cmd = { "clangd", "--background-index", "--pch-storage=memory", "--clang-tidy", "--suggest-missing-includes" },
|
||||||
filetypes = { 'c', 'cpp' },
|
filetypes = { 'c', 'cpp' },
|
||||||
|
@ -286,7 +275,7 @@ local library, runtime_path, lua_version = determine_setup_lua()
|
||||||
nvim_lsp.sumneko_lua.setup {
|
nvim_lsp.sumneko_lua.setup {
|
||||||
cmd = { "/usr/bin/lua-language-server" };
|
cmd = { "/usr/bin/lua-language-server" };
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = get_snippet_capabilities(),
|
capabilities = capabilities,
|
||||||
settings = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
runtime = {
|
runtime = {
|
||||||
|
|
Loading…
Reference in a new issue