kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: checkhealth warning even if init.lua exists #25306

Browse Source 
Problem:
`:checkhealth nvim` warns about missing vimrc if `init.lua` exists but
`init.vim` does not.

Solution:
Check for any of: init.vim, init.lua, $MYVIMRC.
Fix #25291

Backport of https://github.com/neovim/neovim/pull/25306
This commit is contained in:
Tom Blake 2023-09-24 18:43:55 +01:00 committed by dundargoc
parent 3a535ff496
commit ea3966aac9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/lua/nvim/health.lua
View File

@ -54,15 +54,19 @@ local function check_config()
health.report_start('Configuration') health.report_start('Configuration')
local ok = true local ok = true
local vimrc = ( local init_lua = vim.fn.stdpath('config') .. '/init.lua'
empty(vim.env.MYVIMRC) and vim.fn.stdpath('config') .. '/init.vim' or vim.env.MYVIMRC local init_vim = vim.fn.stdpath('config') .. '/init.vim'
) local vimrc = empty(vim.env.MYVIMRC) and init_lua or vim.env.MYVIMRC
if not filereadable(vimrc) then
if not filereadable(vimrc) and not filereadable(init_vim) then
ok = false ok = false
local has_vim = filereadable(vim.fn.expand('~/.vimrc')) local has_vim = filereadable(vim.fn.expand('~/.vimrc'))
health.report_warn( health.report_warn(
(-1 == vim.fn.getfsize(vimrc) and 'Missing' or 'Unreadable') .. ' user config file: ' .. vimrc, ('%s user config file: %s'):format(
{ has_vim and ':help nvim-from-vim' or ':help init.vim' } -1 == vim.fn.getfsize(vimrc) and 'Missing' or 'Unreadable',
vimrc
),
{ has_vim and ':help nvim-from-vim' or ':help config' }
) )
end end