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

test(startup_spec): add a test for #18315 (#24391)

Browse Source
This commit is contained in:
zeertzjq 2023-07-19 07:14:32 +08:00 committed by GitHub
parent be74807eef
commit ab5cdbd167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/runtime.c
View File

@ -1237,7 +1237,8 @@ void load_plugins(void)
add_pack_start_dirs(); add_pack_start_dirs();
} }
// don't use source_runtime() yet so we can check for :packloadall below // Don't use source_runtime_vim_lua() yet so we can check for :packloadall below.
// NB: after calling this "rtp_copy" may have been freed if it wasn't copied.
source_in_path_vim_lua(rtp_copy, plugin_pattern, DIP_ALL | DIP_NOAFTER); source_in_path_vim_lua(rtp_copy, plugin_pattern, DIP_ALL | DIP_NOAFTER);
TIME_MSG("loading rtp plugins"); TIME_MSG("loading rtp plugins");

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

@ -917,27 +917,27 @@ describe('runtime:', function()
local plugin_folder_path = table.concat({xconfig, 'nvim', 'plugin'}, pathsep) local plugin_folder_path = table.concat({xconfig, 'nvim', 'plugin'}, pathsep)
local plugin_file_path = table.concat({plugin_folder_path, 'plugin.lua'}, pathsep) local plugin_file_path = table.concat({plugin_folder_path, 'plugin.lua'}, pathsep)
mkdir_p(plugin_folder_path) mkdir_p(plugin_folder_path)
finally(function()
rmdir(plugin_folder_path)
end)
write_file(plugin_file_path, [[ vim.g.lua_plugin = 1 ]]) write_file(plugin_file_path, [[ vim.g.lua_plugin = 1 ]])
clear{ args_rm={'-u'}, env=xenv } clear{ args_rm={'-u'}, env=xenv }
eq(1, eval('g:lua_plugin')) eq(1, eval('g:lua_plugin'))
rmdir(plugin_folder_path)
end) end)
it('loads plugin/*.lua from start packages', function() it('loads plugin/*.lua from start packages', function()
local plugin_path = table.concat({xconfig, 'nvim', 'pack', 'category', local plugin_path = table.concat({xconfig, 'nvim', 'pack', 'category', 'start', 'test_plugin'}, pathsep)
'start', 'test_plugin'}, pathsep)
local plugin_folder_path = table.concat({plugin_path, 'plugin'}, pathsep) local plugin_folder_path = table.concat({plugin_path, 'plugin'}, pathsep)
local plugin_file_path = table.concat({plugin_folder_path, 'plugin.lua'}, local plugin_file_path = table.concat({plugin_folder_path, 'plugin.lua'}, pathsep)
pathsep)
local profiler_file = 'test_startuptime.log' local profiler_file = 'test_startuptime.log'
mkdir_p(plugin_folder_path)
finally(function() finally(function()
os.remove(profiler_file) os.remove(profiler_file)
rmdir(plugin_path) rmdir(plugin_path)
end) end)
mkdir_p(plugin_folder_path)
write_file(plugin_file_path, [[vim.g.lua_plugin = 2]]) write_file(plugin_file_path, [[vim.g.lua_plugin = 2]])
clear{ args_rm={'-u'}, args={'--startuptime', profiler_file}, env=xenv } clear{ args_rm={'-u'}, args={'--startuptime', profiler_file}, env=xenv }
@ -961,19 +961,41 @@ describe('runtime:', function()
local plugin_after_path = table.concat({plugin_path, 'after', 'plugin'}, pathsep) local plugin_after_path = table.concat({plugin_path, 'after', 'plugin'}, pathsep)
local plugin_file_path = table.concat({plugin_folder_path, 'plugin.lua'}, pathsep) local plugin_file_path = table.concat({plugin_folder_path, 'plugin.lua'}, pathsep)
local plugin_after_file_path = table.concat({plugin_after_path, 'helloo.lua'}, pathsep) local plugin_after_file_path = table.concat({plugin_after_path, 'helloo.lua'}, pathsep)
mkdir_p(plugin_folder_path) mkdir_p(plugin_folder_path)
write_file(plugin_file_path, [[table.insert(_G.lista, "unos")]])
mkdir_p(plugin_after_path) mkdir_p(plugin_after_path)
finally(function()
rmdir(plugin_path)
end)
write_file(plugin_file_path, [[table.insert(_G.lista, "unos")]])
write_file(plugin_after_file_path, [[table.insert(_G.lista, "dos")]]) write_file(plugin_after_file_path, [[table.insert(_G.lista, "dos")]])
clear{ args_rm={'-u'}, args={'--cmd', 'lua _G.lista = {}'}, env=xenv } clear{ args_rm={'-u'}, args={'--cmd', 'lua _G.lista = {}'}, env=xenv }
eq({'unos', 'dos'}, exec_lua "return _G.lista") eq({'unos', 'dos'}, exec_lua "return _G.lista")
rmdir(plugin_path)
end) end)
it('no crash setting &rtp in plugins with :packloadall called before #18315', function()
local plugin_folder_path = table.concat({xconfig, 'nvim', 'plugin'}, pathsep)
mkdir_p(plugin_folder_path)
finally(function()
rmdir(plugin_folder_path)
end)
write_file(table.concat({plugin_folder_path, 'plugin.vim'}, pathsep), [[
let &runtimepath = &runtimepath
let g:vim_plugin = 1
]])
write_file(table.concat({plugin_folder_path, 'plugin.lua'}, pathsep), [[
vim.o.runtimepath = vim.o.runtimepath
vim.g.lua_plugin = 1
]])
clear{ args_rm={'-u'}, args = {'--cmd', 'packloadall'}, env=xenv }
eq(1, eval('g:vim_plugin'))
eq(1, eval('g:lua_plugin'))
end)
it("loads ftdetect/*.{vim,lua} respecting 'rtp' order", function() it("loads ftdetect/*.{vim,lua} respecting 'rtp' order", function()
local ftdetect_folder = table.concat({xconfig, 'nvim', 'ftdetect'}, pathsep) local ftdetect_folder = table.concat({xconfig, 'nvim', 'ftdetect'}, pathsep)