Mercurial > vim
changeset 32353:6f74f567b1e6 v9.0.1508
patch 9.0.1508: catch does not work when lines are joined with a newline
Commit: https://github.com/vim/vim/commit/f2588b6fc90ba85b333ee8f747e8d1ebbc7e6300
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri May 5 17:22:35 2023 +0100
patch 9.0.1508: catch does not work when lines are joined with a newline
Problem: Catch does not work when lines are joined with a newline.
Solution: Set "nextcmd" appropriately. (closes https://github.com/vim/vim/issues/12348)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 05 May 2023 18:30:04 +0200 |
| parents | 0d9e079a4c44 |
| children | 7d80b5623536 |
| files | src/eval.c src/testdir/test_trycatch.vim src/version.c |
| diffstat | 3 files changed, 41 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -2699,12 +2699,15 @@ eval0_retarg( semsg(_(e_invalid_expression_str), arg); } - // Some of the expression may not have been consumed. Do not check for - // a next command to avoid more errors, unless "|" is following, which - // could only be a command separator. - if (eap != NULL && p != NULL - && skipwhite(p)[0] == '|' && skipwhite(p)[1] != '|') - eap->nextcmd = check_nextcmd(p); + if (eap != NULL && p != NULL) + { + // Some of the expression may not have been consumed. + // Only execute a next command if it cannot be a "||" operator. + // The next command may be "catch". + char_u *nextcmd = check_nextcmd(p); + if (nextcmd != NULL && *nextcmd != '|') + eap->nextcmd = nextcmd; + } return FAIL; }
--- a/src/testdir/test_trycatch.vim +++ b/src/testdir/test_trycatch.vim @@ -2220,6 +2220,36 @@ func Test_BufEnter_exception() %bwipe! endfunc +" Test for using try/catch when lines are joined by "|" or "\n" {{{1 +func Test_try_catch_nextcmd() + func Throw() + throw "Failure" + endfunc + + let lines =<< trim END + try + let s:x = Throw() + catch + let g:caught = 1 + endtry + END + + let g:caught = 0 + call execute(lines) + call assert_equal(1, g:caught) + + let g:caught = 0 + call execute(join(lines, '|')) + call assert_equal(1, g:caught) + + let g:caught = 0 + call execute(join(lines, "\n")) + call assert_equal(1, g:caught) + + unlet g:caught + delfunc Throw +endfunc + " Test for using try/catch in a user command with a failing expression {{{1 func Test_user_command_try_catch() let lines =<< trim END