9 files changed, 22 insertions, 19 deletions
diff --git a/.github/ci/run_sanitizer.sh b/.github/ci/run_sanitizer.sh
index a52f6d56..aad5a49c 100644
--- a/.github/ci/run_sanitizer.sh
+++ b/.github/ci/run_sanitizer.sh
@@ -15,7 +15,7 @@ if git diff --pickaxe-all -U0 -G "${SEARCH_PATTERN}" "${REF_BRANCH}" "${PR_BRANC
   exit 1
 fi
 
-SEARCH_PATTERN='(util\.path\.dirname|util\.path\.sanitize|util\.path\.exists|util\.path\.is_file|util\.path\.is_dir|util\.path\.join|util\.path\.iterate_parents|util\.path\.traverse_parents|util\.find_mercurial_ancestor|util\.find_node_modules_ancestor|util\.find_package_json_ancestor|util\.find_git_ancestor)'
+SEARCH_PATTERN='(util\.path\.dirname|util\.path\.sanitize|util\.path\.exists|util\.path\.is_file|util\.path\.is_dir|util\.path\.join|util\.path\.iterate_parents|util\.path\.traverse_parents|util\.find_mercurial_ancestor|util\.find_node_modules_ancestor|util\.find_package_json_ancestor|util\.find_git_ancestor|util\.get_lsp_clients)'
 
 if git diff --pickaxe-all -U0 -G "${SEARCH_PATTERN}" "${REF_BRANCH}" "${PR_BRANCH}" -- '*.lua' | grep -Ev '\.lua$' | grep -E "^\+.*${SEARCH_PATTERN}" ; then
   echo
diff --git a/lua/lspconfig/configs/basedpyright.lua b/lua/lspconfig/configs/basedpyright.lua
index fa45d14d..5eea38c2 100644
--- a/lua/lspconfig/configs/basedpyright.lua
+++ b/lua/lspconfig/configs/basedpyright.lua
@@ -16,7 +16,7 @@ local function organize_imports()
     arguments = { vim.uri_from_bufnr(0) },
   }
 
-  local clients = util.get_lsp_clients {
+  local clients = vim.lsp.get_clients {
     bufnr = vim.api.nvim_get_current_buf(),
     name = 'basedpyright',
   }
@@ -26,7 +26,7 @@ local function organize_imports()
 end
 
 local function set_python_path(path)
-  local clients = util.get_lsp_clients {
+  local clients = vim.lsp.get_clients {
     bufnr = vim.api.nvim_get_current_buf(),
     name = 'basedpyright',
   }
diff --git a/lua/lspconfig/configs/denols.lua b/lua/lspconfig/configs/denols.lua
index c1df6d45..160583a5 100644
--- a/lua/lspconfig/configs/denols.lua
+++ b/lua/lspconfig/configs/denols.lua
@@ -96,7 +96,7 @@ return {
   commands = {
     DenolsCache = {
       function()
-        local clients = util.get_lsp_clients { bufnr = 0, name = 'denols' }
+        local clients = vim.lsp.get_clients { bufnr = 0, name = 'denols' }
         if #clients > 0 then
           buf_cache(0, clients[#clients])
         end
diff --git a/lua/lspconfig/configs/gopls.lua b/lua/lspconfig/configs/gopls.lua
index 85531a88..6106c617 100644
--- a/lua/lspconfig/configs/gopls.lua
+++ b/lua/lspconfig/configs/gopls.lua
@@ -17,7 +17,7 @@ return {
         end
       end
       if mod_cache and fname:sub(1, #mod_cache) == mod_cache then
-        local clients = util.get_lsp_clients { name = 'gopls' }
+        local clients = vim.lsp.get_clients { name = 'gopls' }
         if #clients > 0 then
           return clients[#clients].config.root_dir
         end
diff --git a/lua/lspconfig/configs/pyright.lua b/lua/lspconfig/configs/pyright.lua
index 51681dfa..5da2e739 100644
--- a/lua/lspconfig/configs/pyright.lua
+++ b/lua/lspconfig/configs/pyright.lua
@@ -16,7 +16,7 @@ local function organize_imports()
     arguments = { vim.uri_from_bufnr(0) },
   }
 
-  local clients = util.get_lsp_clients {
+  local clients = vim.lsp.get_clients {
     bufnr = vim.api.nvim_get_current_buf(),
     name = 'pyright',
   }
@@ -26,7 +26,7 @@ local function organize_imports()
 end
 
 local function set_python_path(path)
-  local clients = util.get_lsp_clients {
+  local clients = vim.lsp.get_clients {
     bufnr = vim.api.nvim_get_current_buf(),
     name = 'pyright',
   }
diff --git a/lua/lspconfig/configs/rust_analyzer.lua b/lua/lspconfig/configs/rust_analyzer.lua
index 95fe8866..79fcad48 100644
--- a/lua/lspconfig/configs/rust_analyzer.lua
+++ b/lua/lspconfig/configs/rust_analyzer.lua
@@ -3,7 +3,7 @@ local async = require 'lspconfig.async'
 
 local function reload_workspace(bufnr)
   bufnr = util.validate_bufnr(bufnr)
-  local clients = util.get_lsp_clients { bufnr = bufnr, name = 'rust_analyzer' }
+  local clients = vim.lsp.get_clients { bufnr = bufnr, name = 'rust_analyzer' }
   for _, client in ipairs(clients) do
     vim.notify 'Reloading Cargo Workspace'
     client.request('rust-analyzer/reloadWorkspace', nil, function(err)
@@ -26,7 +26,7 @@ local function is_library(fname)
 
   for _, item in ipairs { toolchains, registry, git_registry } do
     if util.path.is_descendant(item, fname) then
-      local clients = util.get_lsp_clients { name = 'rust_analyzer' }
+      local clients = vim.lsp.get_clients { name = 'rust_analyzer' }
       return #clients > 0 and clients[#clients].config.root_dir or nil
     end
   end
diff --git a/lua/lspconfig/health.lua b/lua/lspconfig/health.lua
index 5ef54283..19194af7 100644
--- a/lua/lspconfig/health.lua
+++ b/lua/lspconfig/health.lua
@@ -235,8 +235,8 @@ local function check_lspconfig(bufnr)
     health.warn('Deprecated servers: ' .. table.concat(deprecated_servers, ', '))
   end
 
-  local buf_clients = not bufnr and {} or util.get_lsp_clients { bufnr = bufnr }
-  local clients = util.get_lsp_clients()
+  local buf_clients = not bufnr and {} or vim.lsp.get_clients { bufnr = bufnr }
+  local clients = vim.lsp.get_clients()
   local buffer_filetype = bufnr and vim.fn.getbufvar(bufnr, '&filetype') or '(invalid buffer)'
   local fname = bufnr and api.nvim_buf_get_name(bufnr) or '(invalid buffer)'
 
diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua
index 1e6b64a7..0e4ab120 100644
--- a/lua/lspconfig/util.lua
+++ b/lua/lspconfig/util.lua
@@ -173,7 +173,7 @@ end
 
 function M.get_active_client_by_name(bufnr, servername)
   --TODO(glepnir): remove this for loop when we want only support 0.10+
-  for _, client in pairs(M.get_lsp_clients { bufnr = bufnr }) do
+  for _, client in pairs(vim.lsp.get_clients { bufnr = bufnr }) do
     if client.name == servername then
       return client
     end
@@ -264,12 +264,9 @@ function M.tbl_flatten(t)
   return nvim_eleven and vim.iter(t):flatten(math.huge):totable() or vim.tbl_flatten(t)
 end
 
-function M.get_lsp_clients(filter)
-  --- @diagnostic disable-next-line:deprecated
-  return nvim_eleven and lsp.get_clients(filter) or lsp.get_active_clients(filter)
-end
-
+---
 --- Deprecated functions
+---
 
 --- @deprecated use `vim.fn.isdirectory(path) == 1` instead
 --- @param filename string
@@ -332,7 +329,7 @@ end
 
 --- @deprecated Will be removed. Do not use.
 function M.get_active_clients_list_by_ft(filetype)
-  local clients = M.get_lsp_clients()
+  local clients = vim.lsp.get_clients()
   local clients_list = {}
   for _, client in pairs(clients) do
     --- @diagnostic disable-next-line:undefined-field
@@ -364,4 +361,10 @@ function M.get_other_matching_providers(filetype)
   return other_matching_configs
 end
 
+--- @deprecated Use vim.lsp.get_clients instead.
+function M.get_lsp_clients(filter)
+  --- @diagnostic disable-next-line:deprecated
+  return nvim_eleven and lsp.get_clients(filter) or lsp.get_active_clients(filter)
+end
+
 return M
diff --git a/plugin/lspconfig.lua b/plugin/lspconfig.lua
index 47ba1731..a432c9ae 100644
--- a/plugin/lspconfig.lua
+++ b/plugin/lspconfig.lua
@@ -138,7 +138,7 @@ api.nvim_create_user_command('LspStop', function(info)
 
   -- default to stopping all servers on current buffer
   if #args == 0 then
-    clients = util.get_lsp_clients({ bufnr = vim.api.nvim_get_current_buf() })
+    clients = vim.lsp.get_clients({ bufnr = vim.api.nvim_get_current_buf() })
   else
     clients = get_clients_from_cmd_args(args)
   end