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(api): re-route nvim_get_runtime_file errors

Browse Source 
This allows nvim_get_runtime_file to be properly used via pcall
This commit is contained in:
Lewis Russell 2021-12-16 11:40:23 +00:00
parent 238b944e58
commit d512be55a2
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/api/vim.c
View File

@ -497,8 +497,12 @@ ArrayOf(String) nvim_get_runtime_file(String name, Boolean all, Error *err)
int flags = DIP_DIRFILE | (all ? DIP_ALL : 0); int flags = DIP_DIRFILE | (all ? DIP_ALL : 0);
do_in_runtimepath((char_u *)(name.size ? name.data : ""), TRY_WRAP({
flags, find_runtime_cb, &rv); try_start();
do_in_runtimepath((char_u *)(name.size ? name.data : ""),
flags, find_runtime_cb, &rv);
try_end(err);
});
return rv; return rv;
} }

9
test/functional/api/vim_spec.lua
View File

@ -23,6 +23,7 @@ local next_msg = helpers.next_msg
local tmpname = helpers.tmpname local tmpname = helpers.tmpname
local write_file = helpers.write_file local write_file = helpers.write_file
local exec_lua = helpers.exec_lua local exec_lua = helpers.exec_lua
local exc_exec = helpers.exc_exec
local pcall_err = helpers.pcall_err local pcall_err = helpers.pcall_err
local format_string = helpers.format_string local format_string = helpers.format_string
@ -2240,6 +2241,14 @@ describe('API', function()
eq({}, meths.get_runtime_file("foobarlang/", true)) eq({}, meths.get_runtime_file("foobarlang/", true))
end) end)
it('can handle bad patterns', function()
if helpers.pending_win32(pending) then return end
eq("Vim:E220: Missing }.", pcall_err(meths.get_runtime_file, "{", false))
eq('Vim(echo):E5555: API call: Vim:E220: Missing }.',
exc_exec("echo nvim_get_runtime_file('{', v:false)"))
end)
end) end)
describe('nvim_get_all_options_info', function() describe('nvim_get_all_options_info', function()