From 3f68f44d725747339933298cdac02589b37ea76c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E6=99=A8?= Date: Wed, 12 Jul 2023 22:34:07 +0800 Subject: [PATCH] fix(lsp-config): lsp-config error when nvim-cmp not enabled. (#1095) * fix(lsp-config): lsp-config error when nvim-cmp not enabled. * Update lua/lazyvim/plugins/lsp/init.lua Co-authored-by: Jonas Holst Damtoft --------- Co-authored-by: Jonas Holst Damtoft --- lua/lazyvim/plugins/lsp/init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua index e7b7801d..13f42ef3 100644 --- a/lua/lazyvim/plugins/lsp/init.lua +++ b/lua/lazyvim/plugins/lsp/init.lua @@ -139,11 +139,12 @@ return { vim.diagnostic.config(vim.deepcopy(opts.diagnostics)) local servers = opts.servers + local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") local capabilities = vim.tbl_deep_extend( "force", {}, vim.lsp.protocol.make_client_capabilities(), - require("cmp_nvim_lsp").default_capabilities(), + has_cmp and cmp_nvim_lsp.default_capabilities() or {}, opts.capabilities or {} )