diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-30 20:55:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-30 20:55:15 +0200 |
| commit | 006ad48b8a15c3bace741d8caaf3195e592fbe78 (patch) | |
| tree | 638f00ff744ade4f42ee2c1a09636b7c08fbf9d5 | |
| parent | e46a4405056276b4cbdacee76b11f85c8ea1830b (diff) | |
patch 8.2.1098: Vim9: cannot use line break in :throw argumentv8.2.1098
Problem: Vim9: cannot use line break in :throw argument.
Solution: Check for line break.
| -rw-r--r-- | src/eval.c | 12 | ||||
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 5b69dc736d..a98eea34be 100644 --- a/src/eval.c +++ b/src/eval.c @@ -333,10 +333,18 @@ eval_to_string_skip( { typval_T tv; char_u *retval; + evalarg_T evalarg; + CLEAR_FIELD(evalarg); + evalarg.eval_flags = skip ? 0 : EVAL_EVALUATE; + if (eap != NULL && getline_equal(eap->getline, eap->cookie, getsourceline)) + { + evalarg.eval_getline = eap->getline; + evalarg.eval_cookie = eap->cookie; + } if (skip) ++emsg_skip; - if (eval0(arg, &tv, eap, skip ? NULL : &EVALARG_EVALUATE) == FAIL || skip) + if (eval0(arg, &tv, eap, &evalarg) == FAIL || skip) retval = NULL; else { @@ -345,7 +353,7 @@ eval_to_string_skip( } if (skip) --emsg_skip; - clear_evalarg(&EVALARG_EVALUATE, eap); + clear_evalarg(&evalarg, eap); return retval; } diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index ff1b134227..031b31917c 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -585,6 +585,20 @@ def Test_try_catch_fails() call CheckDefFailure(['throw xxx'], 'E1001:') enddef +def Test_throw_vimscript() + " only checks line continuation + let lines =<< trim END + vim9script + try + throw 'one' + .. 'two' + catch + assert_equal('onetwo', v:exception) + endtry + END + CheckScriptSuccess(lines) +enddef + if has('channel') let someJob = test_null_job() diff --git a/src/version.c b/src/version.c index c9815bc639..5854c37fcf 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1098, +/**/ 1097, /**/ 1096, |