From 13e96bf6776e6ca4d3f5bbd2bdc0756c5e69ca94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E6=99=A8?= Date: Wed, 12 Jul 2023 16:45:00 +0800 Subject: [PATCH] Update lua/lazyvim/plugins/lsp/init.lua Co-authored-by: Jonas Holst Damtoft --- lua/lazyvim/plugins/lsp/init.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua index 556ff1af..13f42ef3 100644 --- a/lua/lazyvim/plugins/lsp/init.lua +++ b/lua/lazyvim/plugins/lsp/init.lua @@ -139,12 +139,14 @@ return { vim.diagnostic.config(vim.deepcopy(opts.diagnostics)) local servers = opts.servers - local capabilities = vim.lsp.protocol.make_client_capabilities() - local ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") - if ok then - capabilities = vim.tbl_deep_extend("force", capabilities, cmp_nvim_lsp.default_capabilities()) - end - capabilities = vim.tbl_deep_extend("force", capabilities, opts.capabilities or {}) + local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") + local capabilities = vim.tbl_deep_extend( + "force", + {}, + vim.lsp.protocol.make_client_capabilities(), + has_cmp and cmp_nvim_lsp.default_capabilities() or {}, + opts.capabilities or {} + ) local function setup(server) local server_opts = vim.tbl_deep_extend("force", {