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

Update lua/lazyvim/plugins/lsp/init.lua

Browse source 
Co-authored-by: Jonas Holst Damtoft <Jomik@users.noreply.github.com>
This commit is contained in:
暮晨 2023-07-12 16:45:00 +08:00 • committed by GitHub
parent f70d2e2e56
commit 13e96bf677
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -139,12 +139,14 @@ 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.lsp.protocol.make_client_capabilities() local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
local ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") local capabilities = vim.tbl_deep_extend(
if ok then "force",
capabilities = vim.tbl_deep_extend("force", capabilities, cmp_nvim_lsp.default_capabilities()) {},
end vim.lsp.protocol.make_client_capabilities(),
capabilities = vim.tbl_deep_extend("force", capabilities, opts.capabilities or {}) has_cmp and cmp_nvim_lsp.default_capabilities() or {},
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", {