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

1 files changed, 11 insertions, 6 deletions

diff --git a/runtime/lua/vim/health/health.lua b/runtime/lua/vim/health/health.lua
index 5bc03199ee..d226f35f9a 100644
--- a/runtime/lua/vim/health/health.lua
+++ b/runtime/lua/vim/health/health.lua
@@ -11,10 +11,14 @@ local function check_runtime()
   health.start('Runtime')
   -- Files from an old installation.
   local bad_files = {
-    ['plugin/health.vim'] = false,
     ['autoload/health/nvim.vim'] = false,
     ['autoload/health/provider.vim'] = false,
     ['autoload/man.vim'] = false,
+    ['lua/provider/node/health.lua'] = false,
+    ['lua/provider/perl/health.lua'] = false,
+    ['lua/provider/python/health.lua'] = false,
+    ['lua/provider/ruby/health.lua'] = false,
+    ['plugin/health.vim'] = false,
     ['plugin/man.vim'] = false,
     ['queries/help/highlights.scm'] = false,
     ['queries/help/injections.scm'] = false,
@@ -39,7 +43,7 @@ local function check_runtime()
         'Found old files in $VIMRUNTIME (this can cause weird behavior):\n%s',
         bad_files_msg
       ),
-      { 'Delete the $VIMRUNTIME directory (or uninstall Nvim), then reinstall Nvim.' }
+      { 'Delete the $VIMRUNTIME directory, then reinstall Nvim.' }
     )
   end
 end
@@ -50,11 +54,11 @@ local function check_config()
 
   local init_lua = vim.fn.stdpath('config') .. '/init.lua'
   local init_vim = vim.fn.stdpath('config') .. '/init.vim'
-  local vimrc = vim.env.MYVIMRC and vim.fn.expand(vim.env.MYVIMRC) or init_lua
+  local vimrc = vim.env.MYVIMRC and vim.fs.normalize(vim.env.MYVIMRC) or init_lua
 
   if vim.fn.filereadable(vimrc) == 0 and vim.fn.filereadable(init_vim) == 0 then
     ok = false
-    local has_vim = vim.fn.filereadable(vim.fn.expand('~/.vimrc')) == 1
+    local has_vim = vim.fn.filereadable(vim.fs.normalize('~/.vimrc')) == 1
     health.warn(
       ('%s user config file: %s'):format(
         -1 == vim.fn.getfsize(vimrc) and 'Missing' or 'Unreadable',
@@ -114,7 +118,7 @@ local function check_config()
   )
   shadafile = (
     vim.o.shadafile == ''
-      and (shadafile == '' and vim.fn.stdpath('state') .. '/shada/main.shada' or vim.fn.expand(
+      and (shadafile == '' and vim.fn.stdpath('state') .. '/shada/main.shada' or vim.fs.normalize(
         shadafile
       ))
     or (vim.o.shadafile == 'NONE' and '' or vim.o.shadafile)
@@ -239,6 +243,7 @@ local function check_tmux()
     return
   end
 
+  ---@param option string
   local get_tmux_option = function(option)
     local cmd = 'tmux show-option -qvg ' .. option -- try global scope
     local out = vim.fn.system(vim.fn.split(cmd))
@@ -378,7 +383,7 @@ local function check_terminal()
     'SSH_TTY',
   }) do
     if vim.env[env_var] then
-      health.info(vim.fn.printf('$%s="%s"', env_var, vim.env[env_var]))
+      health.info(string.format('$%s="%s"', env_var, vim.env[env_var]))
     end
   end
 end