diff options
| -rw-r--r-- | src/testdir/dumps/Test_opfunc_error.dump | 6 | ||||
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 58 | ||||
| -rw-r--r-- | src/userfunc.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 65 insertions, 10 deletions
diff --git a/src/testdir/dumps/Test_opfunc_error.dump b/src/testdir/dumps/Test_opfunc_error.dump new file mode 100644 index 000000000..80fcc2596 --- /dev/null +++ b/src/testdir/dumps/Test_opfunc_error.dump @@ -0,0 +1,6 @@ +|~+0#4040ff13#ffffff0| @73 +|~| @73 +|E+0#ffffff16#e000002|r@1|o|r| |d|e|t|e|c|t|e|d| |w|h|i|l|e| |p|r|o|c|e|s@1|i|n|g| |f|u|n|c|t|i|o|n| |<|S|N|R|>|9|_|O|p|f|u|n|c|:| +0#0000000#ffffff0@19 +|l+0#af5f00255&|i|n|e| @3|2|:| +0#0000000&@64 +|E+0#ffffff16#e000002|6|8|4|:| |l|i|s|t| |i|n|d|e|x| |o|u|t| |o|f| |r|a|n|g|e|:| |0| +0#0000000#ffffff0@42 +|P+0#00e0003&|r|e|s@1| |E|N|T|E|R| |o|r| |t|y|p|e| |c|o|m@1|a|n|d| |t|o| |c|o|n|t|i|n|u|e> +0#0000000&@35 diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 12a4c5976..8ffaf976f 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -2763,25 +2763,28 @@ enddef func Test_silent_echo() CheckScreendump + call Run_Test_silent_echo() +endfunc - let lines =<< trim END +def Run_Test_silent_echo() + var lines =<< trim END vim9script def EchoNothing() silent echo '' enddef defcompile END - call writefile(lines, 'XTest_silent_echo') + writefile(lines, 'XTest_silent_echo') - " Check that the balloon shows up after a mouse move - let buf = RunVimInTerminal('-S XTest_silent_echo', {'rows': 6}) - call term_sendkeys(buf, ":abc") - call VerifyScreenDump(buf, 'Test_vim9_silent_echo', {}) + # Check that the balloon shows up after a mouse move + var buf = RunVimInTerminal('-S XTest_silent_echo', {'rows': 6}) + term_sendkeys(buf, ":abc") + VerifyScreenDump(buf, 'Test_vim9_silent_echo', {}) - " clean up - call StopVimInTerminal(buf) - call delete('XTest_silent_echo') -endfunc + # clean up + StopVimInTerminal(buf) + delete('XTest_silent_echo') +enddef def SilentlyError() execute('silent! invalid') @@ -3165,6 +3168,41 @@ def Test_opfunc() nunmap <F3> enddef +func Test_opfunc_error() + CheckScreendump + call Run_Test_opfunc_error() +endfunc + +def Run_Test_opfunc_error() + # test that the error from Opfunc() is displayed right away + var lines =<< trim END + vim9script + + def Opfunc(type: string) + try + eval [][0] + catch /nothing/ # error not caught + endtry + enddef + &operatorfunc = Opfunc + nnoremap <expr> l <SID>L() + def L(): string + return 'l' + enddef + 'x'->repeat(10)->setline(1) + feedkeys('g@l', 'n') + feedkeys('llll') + END + call writefile(lines, 'XTest_opfunc_error') + + var buf = RunVimInTerminal('-S XTest_opfunc_error', {rows: 6, wait_for_ruler: 0}) + VerifyScreenDump(buf, 'Test_opfunc_error', {}) + + # clean up + StopVimInTerminal(buf) + delete('XTest_opfunc_error') +enddef + " this was crashing on exit def Test_nested_lambda_in_closure() var lines =<< trim END diff --git a/src/userfunc.c b/src/userfunc.c index da33ba0c7..cc921f5a1 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -3173,6 +3173,15 @@ call_callback( ++callback_depth; ret = call_func(callback->cb_name, len, rettv, argcount, argvars, &funcexe); --callback_depth; + + // When a :def function was called that uses :try an error would be turned + // into an exception. Need to give the error here. + if (need_rethrow && current_exception != NULL) + { + need_rethrow = FALSE; + handle_did_throw(); + } + return ret; } diff --git a/src/version.c b/src/version.c index 15f0658b1..edb1fbe4e 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3798, +/**/ 3797, /**/ 3796, |