Merge remote-tracking branch 'upstream/master' into usermarksusermarks

1 files changed, 14 insertions, 2 deletions

diff --git a/runtime/lua/vim/lsp/health.lua b/runtime/lua/vim/lsp/health.lua
index ba730e3d6d..987707e661 100644
--- a/runtime/lua/vim/lsp/health.lua
+++ b/runtime/lua/vim/lsp/health.lua
@@ -2,8 +2,8 @@ local M = {}
 
 --- Performs a healthcheck for LSP
 function M.check()
-  local report_info = vim.fn['health#report_info']
-  local report_warn = vim.fn['health#report_warn']
+  local report_info = vim.health.report_info
+  local report_warn = vim.health.report_warn
 
   local log = require('vim.lsp.log')
   local current_log_level = log.get_level()
@@ -27,6 +27,18 @@ function M.check()
 
   local report_fn = (log_size / 1000000 > 100 and report_warn or report_info)
   report_fn(string.format('Log size: %d KB', log_size / 1000))
+
+  local clients = vim.lsp.get_active_clients()
+  vim.health.report_start('vim.lsp: Active Clients')
+  if next(clients) then
+    for _, client in pairs(clients) do
+      report_info(
+        string.format('%s (id=%s, root_dir=%s)', client.name, client.id, client.config.root_dir)
+      )
+    end
+  else
+    report_info('No active clients')
+  end
 end
 
 return M