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", {