IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(startup): support .exrc or .nvimrc with init.lua (#21181)

Browse Source
This commit is contained in:
Kristijan Husak 2022-11-26 01:50:52 +01:00 committed by GitHub
parent 9dfbbde240
commit 3f478547cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/main.c
View File

@ -1919,7 +1919,8 @@ static bool do_user_initialization(void)
xfree(user_vimrc);
xfree(init_lua_path);
return false;
do_exrc = p_exrc;
return do_exrc;
}
xfree(init_lua_path);

64
test/functional/core/startup_spec.lua
View File

@ -12,6 +12,7 @@ local eval = helpers.eval
local exec_lua = helpers.exec_lua
local feed = helpers.feed
local funcs = helpers.funcs
local pesc = helpers.pesc
local mkdir = helpers.mkdir
local mkdir_p = helpers.mkdir_p
local nvim_prog = helpers.nvim_prog
@ -576,7 +577,66 @@ describe('user config init', function()
eq(funcs.fnamemodify(init_lua_path, ':p'), eval('$MYVIMRC'))
end)
describe 'with explicitly provided config'(function()
describe('with existing .exrc in cwd', function()
local exrc_path = '.exrc'
local xstate = 'Xstate'
before_each(function()
write_file(init_lua_path, [[
vim.o.exrc = true
vim.g.from_exrc = 0
]])
mkdir_p(xstate .. pathsep .. (is_os('win') and 'nvim-data' or 'nvim'))
write_file(exrc_path, [[
let g:from_exrc = 1
]])
end)
after_each(function()
os.remove(exrc_path)
rmdir(xstate)
end)
it('loads .exrc #13501', function()
clear{ args_rm = {'-u'}, env={ XDG_CONFIG_HOME=xconfig, XDG_STATE_HOME=xstate } }
-- The .exrc file is not trusted, and the prompt is skipped because there is no UI.
eq(0, eval('g:from_exrc'))
local screen = Screen.new(50, 8)
screen:attach()
funcs.termopen({nvim_prog})
screen:expect({ any = pesc('[i]gnore, (v)iew, (d)eny, (a)llow:') })
-- `i` to enter Terminal mode, `a` to allow
feed('ia')
screen:expect([[
|
~ |
~ |
~ |
~ |
[No Name] 0,0-1 All|
|
-- TERMINAL -- |
]])
feed(':echo g:from_exrc<CR>')
screen:expect([[
|
~ |
~ |
~ |
~ |
[No Name] 0,0-1 All|
1 |
-- TERMINAL -- |
]])
clear{ args_rm = {'-u'}, env={ XDG_CONFIG_HOME=xconfig, XDG_STATE_HOME=xstate } }
-- The .exrc file is now trusted.
eq(1, eval('g:from_exrc'))
end)
end)
describe('with explicitly provided config', function()
local custom_lua_path = table.concat({xhome, 'custom.lua'}, pathsep)
before_each(function()
write_file(custom_lua_path, [[
@ -591,7 +651,7 @@ describe('user config init', function()
end)
end)
describe 'VIMRC also exists'(function()
describe('VIMRC also exists', function()
before_each(function()
write_file(table.concat({xconfig, 'nvim', 'init.vim'}, pathsep), [[
let g:vim_rc = 1