From 0eedc4cee18d1130858a634abe1ffa8fb39b49bb Mon Sep 17 00:00:00 2001
From: Oscar Wallberg <oscar.wallberg@outlook.com>
Date: Mon, 4 Mar 2024 22:44:23 +0100
Subject: [PATCH] fix(lsp): set default capabilities and extend with
 cmp_nvim_lsp

---
 lua/lsp.lua | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lua/lsp.lua b/lua/lsp.lua
index bf45a20..ba79637 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -410,8 +410,13 @@ end
 function M.setup()
     setup_diagnostics()
 
-    utils.try_require("cmp_nvim_lsp", module_name, function (mod)
-        capabilities = mod.default_capabilities()
+    capabilities = vim.lsp.protocol.make_client_capabilities()
+
+    utils.try_require("cmp_nvim_lsp", module_name, function (cmp_nvim_lsp)
+        capabilities = vim.tbl_deep_extend(
+            "force", capabilities,
+            cmp_nvim_lsp.default_capabilities()
+        )
     end)
 
     for name, server in pairs(config) do