forked from aniani/vim
patch 8.2.3166: Vim9: nested autoload call error overruled by "Unknown error"
Problem: Vim9: nested autoload call error overruled by "Unknown error". Solution: Check need_rethrow before giving an "Unknown error". (closes #8568)
This commit is contained in:
parent
9e60e899ee
commit
b5841b99e6
@ -3699,6 +3699,46 @@ def Test_script_var_in_autocmd()
|
||||
CheckScriptSuccess(lines)
|
||||
enddef
|
||||
|
||||
def Test_error_in_autoload_script()
|
||||
var save_rtp = &rtp
|
||||
var dir = getcwd() .. '/Xruntime'
|
||||
&rtp = dir
|
||||
mkdir(dir .. '/autoload', 'p')
|
||||
|
||||
var lines =<< trim END
|
||||
vim9script noclear
|
||||
def script#autoloaded()
|
||||
enddef
|
||||
def Broken()
|
||||
var x: any = ''
|
||||
eval x != 0
|
||||
enddef
|
||||
Broken()
|
||||
END
|
||||
writefile(lines, dir .. '/autoload/script.vim')
|
||||
|
||||
lines =<< trim END
|
||||
vim9script
|
||||
def CallAutoloaded()
|
||||
script#autoloaded()
|
||||
enddef
|
||||
|
||||
function Legacy()
|
||||
try
|
||||
call s:CallAutoloaded()
|
||||
catch
|
||||
call assert_match('E1030: Using a String as a Number', v:exception)
|
||||
endtry
|
||||
endfunction
|
||||
|
||||
Legacy()
|
||||
END
|
||||
CheckScriptSuccess(lines)
|
||||
|
||||
&rtp = save_rtp
|
||||
delete(dir, 'rf')
|
||||
enddef
|
||||
|
||||
def Test_cmdline_win()
|
||||
# if the Vim syntax highlighting uses Vim9 constructs they can be used from
|
||||
# the command line window.
|
||||
|
@ -755,6 +755,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
3166,
|
||||
/**/
|
||||
3165,
|
||||
/**/
|
||||
|
@ -4737,7 +4737,8 @@ failed_early:
|
||||
// Not sure if this is necessary.
|
||||
suppress_errthrow = save_suppress_errthrow;
|
||||
|
||||
if (ret != OK && did_emsg_cumul + did_emsg == did_emsg_before)
|
||||
if (ret != OK && did_emsg_cumul + did_emsg == did_emsg_before
|
||||
&& !need_rethrow)
|
||||
semsg(_(e_unknown_error_while_executing_str),
|
||||
printable_func_name(ufunc));
|
||||
funcdepth_restore(orig_funcdepth);
|
||||
|
Loading…
x
Reference in New Issue
Block a user