Merge #27246 from justinmk/health

This commit is contained in:
Justin M. Keyes 2024-01-29 09:43:49 -08:00 committed by GitHub
commit a060c13f55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 7 deletions

View File

@ -23,9 +23,15 @@ local function check_runtime()
health.start('Runtime') health.start('Runtime')
-- Files from an old installation. -- Files from an old installation.
local bad_files = { local bad_files = {
['plugin/man.vim'] = false, ['plugin/health.vim'] = false,
['scripts.vim'] = false, ['autoload/health/nvim.vim'] = false,
['autoload/health/provider.vim'] = false,
['autoload/man.vim'] = false, ['autoload/man.vim'] = false,
['plugin/man.vim'] = false,
['queries/help/highlights.scm'] = false,
['queries/help/injections.scm'] = false,
['scripts.vim'] = false,
['syntax/syncolor.vim'] = false,
} }
local bad_files_msg = '' local bad_files_msg = ''
for k, _ in pairs(bad_files) do for k, _ in pairs(bad_files) do
@ -42,10 +48,10 @@ local function check_runtime()
if not ok then if not ok then
health.error( health.error(
string.format( string.format(
'$VIMRUNTIME has files from an old installation (this can cause weird behavior):\n%s', 'Found old files in $VIMRUNTIME (this can cause weird behavior):\n%s',
bad_files_msg bad_files_msg
), ),
{ 'Delete $VIMRUNTIME (or uninstall Nvim), then reinstall Nvim.' } { 'Delete the $VIMRUNTIME directory (or uninstall Nvim), then reinstall Nvim.' }
) )
end end
end end

View File

@ -255,7 +255,7 @@ function M.check()
'See :help provider-python for more information.', 'See :help provider-python for more information.',
'You may disable this provider (and warning) by adding `let g:loaded_python3_provider = 0` to your init.vim', 'You may disable this provider (and warning) by adding `let g:loaded_python3_provider = 0` to your init.vim',
}) })
elseif pyname ~= '' and python_exe == '' then elseif pyname and pyname ~= '' and python_exe == '' then
if not vim.g[host_prog_var] then if not vim.g[host_prog_var] then
local message = string.format( local message = string.format(
'`g:%s` is not set. Searching for %s in the environment.', '`g:%s` is not set. Searching for %s in the environment.',
@ -343,7 +343,7 @@ function M.check()
end end
end end
if python_exe == '' and pyname ~= '' then if pyname and python_exe == '' and pyname ~= '' then
-- An error message should have already printed. -- An error message should have already printed.
health.error('`' .. pyname .. '` was not found.') health.error('`' .. pyname .. '` was not found.')
elseif python_exe ~= '' and not check_bin(python_exe) then elseif python_exe ~= '' and not check_bin(python_exe) then

View File

@ -22,7 +22,7 @@ function M.check()
local ruby_detect_table = require('vim.provider.ruby').detect() local ruby_detect_table = require('vim.provider.ruby').detect()
local host = ruby_detect_table[1] local host = ruby_detect_table[1]
if host:find('^%s*$') then if (not host) or host:find('^%s*$') then
health.warn('`neovim-ruby-host` not found.', { health.warn('`neovim-ruby-host` not found.', {
'Run `gem install neovim` to ensure the neovim RubyGem is installed.', 'Run `gem install neovim` to ensure the neovim RubyGem is installed.',
'Run `gem environment` to ensure the gem bin directory is in $PATH.', 'Run `gem environment` to ensure the gem bin directory is in $PATH.',