fix(health): support Nvim 0.9

fix #3342

4 files changed, 13 insertions, 13 deletions

diff --git a/lua/lspconfig/configs.lua b/lua/lspconfig/configs.lua
index a4fb5109..391a329b 100644
--- a/lua/lspconfig/configs.lua
+++ b/lua/lspconfig/configs.lua
@@ -1,6 +1,6 @@
 local util = require 'lspconfig.util'
 local async = require 'lspconfig.async'
-local api, validate, lsp, uv, fn = vim.api, vim.validate, vim.lsp, vim.uv, vim.fn
+local api, validate, lsp, uv, fn = vim.api, vim.validate, vim.lsp, (vim.uv or vim.loop), vim.fn
 local tbl_deep_extend = vim.tbl_deep_extend
 
 local configs = {}
diff --git a/lua/lspconfig/health.lua b/lua/lspconfig/health.lua
index 24d3444f..0ae72b8d 100644
--- a/lua/lspconfig/health.lua
+++ b/lua/lspconfig/health.lua
@@ -2,6 +2,7 @@ local M = {}
 local health = require('vim.health')
 
 local api, fn = vim.api, vim.fn
+local uv = vim.uv or vim.loop
 local util = require 'lspconfig.util'
 
 local error_messages = {
@@ -122,7 +123,6 @@ local function make_client_info(client, fname)
 
   client_info.cmd = cmd_type[type(client.config.cmd)](client.config)
   local workspace_folders = fn.has 'nvim-0.9' == 1 and client.workspace_folders or client.workspaceFolders
-  local uv = vim.uv
   fname = vim.fs.normalize(uv.fs_realpath(fname) or fn.fnamemodify(fn.resolve(fname), ':p'))
 
   if workspace_folders then
@@ -189,8 +189,8 @@ local function check_lspconfig(bufnr)
     health.warn('Deprecated servers: ' .. table.concat(deprecated_servers, ', '))
   end
 
-  local buf_clients = not bufnr and {} or vim.lsp.get_clients { bufnr = bufnr }
-  local clients = vim.lsp.get_clients()
+  local buf_clients = not bufnr and {} or util.get_lsp_clients { bufnr = bufnr }
+  local clients = util.get_lsp_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/manager.lua b/lua/lspconfig/manager.lua
index 0dc6a26d..7d6fb88c 100644
--- a/lua/lspconfig/manager.lua
+++ b/lua/lspconfig/manager.lua
@@ -1,6 +1,6 @@
 local api = vim.api
 local lsp = vim.lsp
-local uv = vim.uv
+local uv = vim.uv or vim.loop
 
 local async = require 'lspconfig.async'
 local util = require 'lspconfig.util'
diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua
index f721c7df..2a3adfcf 100644
--- a/lua/lspconfig/util.lua
+++ b/lua/lspconfig/util.lua
@@ -2,10 +2,10 @@ local vim = vim
 local validate = vim.validate
 local api = vim.api
 local lsp = vim.lsp
-local uv = vim.uv
+local uv = vim.uv or vim.loop
 local nvim_eleven = vim.fn.has 'nvim-0.11' == 1
 
-local is_windows = uv.os_uname().version:match 'Windows'
+local iswin = uv.os_uname().version:match 'Windows'
 
 local M = {}
 
@@ -106,7 +106,7 @@ M.path = (function()
   --- @param path string
   --- @return string
   local function sanitize(path)
-    if is_windows then
+    if iswin then
       path = path:sub(1, 1):upper() .. path:sub(2)
       path = path:gsub('\\', '/')
     end
@@ -135,7 +135,7 @@ M.path = (function()
   --- @param path string
   --- @return boolean
   local function is_fs_root(path)
-    if is_windows then
+    if iswin then
       return path:match '^%a:$'
     else
       return path == '/'
@@ -145,7 +145,7 @@ M.path = (function()
   --- @param filename string
   --- @return boolean
   local function is_absolute(filename)
-    if is_windows then
+    if iswin then
       return filename:match '^%a:' or filename:match '^\\\\'
     else
       return filename:match '^/'
@@ -163,7 +163,7 @@ M.path = (function()
     end
     local result = path:gsub(strip_sep_pat, ''):gsub(strip_dir_pat, '')
     if #result == 0 then
-      if is_windows then
+      if iswin then
         return path:sub(1, 2):upper()
       else
         return '/'
@@ -227,7 +227,7 @@ M.path = (function()
     return dir == root
   end
 
-  local path_separator = is_windows and ';' or ':'
+  local path_separator = iswin and ';' or ':'
 
   return {
     escape_wildcards = escape_wildcards,
@@ -332,7 +332,7 @@ function M.insert_package_json(config_files, field, fname)
 
   if root_with_package then
     -- only add package.json if it contains field parameter
-    local path_sep = is_windows and '\\' or '/'
+    local path_sep = iswin and '\\' or '/'
     for line in io.lines(root_with_package .. path_sep .. 'package.json') do
       if line:find(field) then
         config_files[#config_files + 1] = 'package.json'