From f70d2e2e56b2573f73e381fdb9f7975cf6e3b222 Mon Sep 17 00:00:00 2001
From: leisurelicht <leisurelicht@gmail.com>
Date: Wed, 12 Jul 2023 01:22:13 +0800
Subject: [PATCH] fix(lsp-config): lsp-config error when nvim-cmp not enabled.

---
 lua/lazyvim/plugins/lsp/init.lua | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index e7b7801d..556ff1af 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -139,13 +139,12 @@ return {
       vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
 
       local servers = opts.servers
-      local capabilities = vim.tbl_deep_extend(
-        "force",
-        {},
-        vim.lsp.protocol.make_client_capabilities(),
-        require("cmp_nvim_lsp").default_capabilities(),
-        opts.capabilities or {}
-      )
+      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 function setup(server)
         local server_opts = vim.tbl_deep_extend("force", {