mroot/lazyvim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2026-07-25 14:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(lsp-config): lsp-config error when nvim-cmp not enabled.

Browse source
This commit is contained in:
leisurelicht 2023-07-12 01:22:13 +08:00
parent a38bf3001d
commit f70d2e2e56
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lua/lazyvim/plugins/lsp/init.lua
View file

@ -139,13 +139,12 @@ return {
vim.diagnostic.config(vim.deepcopy(opts.diagnostics)) vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
local servers = opts.servers local servers = opts.servers
local capabilities = vim.tbl_deep_extend( local capabilities = vim.lsp.protocol.make_client_capabilities()
"force", local ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
{}, if ok then
vim.lsp.protocol.make_client_capabilities(), capabilities = vim.tbl_deep_extend("force", capabilities, cmp_nvim_lsp.default_capabilities())
require("cmp_nvim_lsp").default_capabilities(), end
opts.capabilities or {} capabilities = vim.tbl_deep_extend("force", capabilities, opts.capabilities or {})
)
local function setup(server) local function setup(server)
local server_opts = vim.tbl_deep_extend("force", { local server_opts = vim.tbl_deep_extend("force", {