Merge LunarVim/release-candidate

1 files changed, 6 insertions, 5 deletions

diff --git a/lua/lvim/lsp/utils.lua b/lua/lvim/lsp/utils.lua
index 7cc8f54f..df3846ce 100644
--- a/lua/lvim/lsp/utils.lua
+++ b/lua/lvim/lsp/utils.lua
@@ -22,22 +22,23 @@ function M.get_active_clients_by_ft(filetype)
 end
 
 function M.get_client_capabilities(client_id)
+  local client
   if not client_id then
     local buf_clients = vim.lsp.buf_get_clients()
-    for _, buf_client in ipairs(buf_clients) do
+    for _, buf_client in pairs(buf_clients) do
       if buf_client.name ~= "null-ls" then
-        client_id = buf_client.id
+        client = buf_client
         break
       end
     end
+  else
+    client = vim.lsp.get_client_by_id(tonumber(client_id))
   end
-  if not client_id then
+  if not client then
     error "Unable to determine client_id"
     return
   end
 
-  local client = vim.lsp.get_client_by_id(tonumber(client_id))
-
   local enabled_caps = {}
   for capability, status in pairs(client.resolved_capabilities) do
     if status == true then