diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-11-05 14:26:28 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-11-05 14:44:26 +0800 |
| commit | 30cfdd0ea1f67afed6732ecbcdda9dda72a2b0a0 (patch) | |
| tree | 0a52ff4bcb4eebd88b70e36d51a7797b3105dd96 /src | |
| parent | 48405df046e6d15c26aeea429fa44950ccc1a8ac (diff) | |
| download | rneovim-30cfdd0ea1f67afed6732ecbcdda9dda72a2b0a0.tar.gz rneovim-30cfdd0ea1f67afed6732ecbcdda9dda72a2b0a0.tar.bz2 rneovim-30cfdd0ea1f67afed6732ecbcdda9dda72a2b0a0.zip | |
vim-patch:8.2.5027: error for missing :endif when an exception was thrown
Problem: Error for missing :endif when an exception was thrown. (Dani
Dickstein)
Solution: Do not give an error when aborting. (closes vim/vim#10490)
https://github.com/vim/vim/commit/bf79a4e48d09a5ae08645592885d54230fed30b8
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_trycatch.vim | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index dad656d8b6..ed74993b84 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -726,7 +726,7 @@ int do_cmdline(char *cmdline, LineGetter fgetline, void *cookie, int flags) if (cstack.cs_idx >= 0) { // If a sourced file or executed function ran to its end, report the // unclosed conditional. - if (!got_int && !did_throw + if (!got_int && !did_throw && !aborting() && ((getline_equal(fgetline, cookie, getsourceline) && !source_finished(fgetline, cookie)) || (getline_equal(fgetline, cookie, get_func_line) diff --git a/src/nvim/testdir/test_trycatch.vim b/src/nvim/testdir/test_trycatch.vim index 3dff8fa2d8..8a1d2d3fa7 100644 --- a/src/nvim/testdir/test_trycatch.vim +++ b/src/nvim/testdir/test_trycatch.vim @@ -2221,6 +2221,23 @@ func Test_user_command_throw_in_function_call() unlet g:caught endfunc +" Test that after reporting an uncaught exception there is no error for a +" missing :endif +func Test_after_exception_no_endif_error() + function Throw() + throw "Failure" + endfunction + + function Foo() + if 1 + call Throw() + endif + endfunction + call assert_fails('call Foo()', ['E605:', 'E605:']) + delfunc Throw + delfunc Foo +endfunc + " Test for using throw in a called function with following endtry {{{1 func Test_user_command_function_call_with_endtry() let lines =<< trim END |