# HG changeset patch # User Bram Moolenaar # Date 1628352903 -7200 # Node ID 5ab75ca75d216aa1e55e2b10854bea29694bd1db # Parent 6934c532862736e708864485440e9186e1997c13 patch 8.2.3312: Vim9: after "if false" line breaks in expression not skipped Commit: https://github.com/vim/vim/commit/e525bdda3aa29f0ffcb18d8d16903ebafc2b5881 Author: Bram Moolenaar Date: Sat Aug 7 18:12:40 2021 +0200 patch 8.2.3312: Vim9: after "if false" line breaks in expression not skipped Problem: Vim9: after "if false" line breaks in expression not skipped. Solution: Do parse the expression. (closes https://github.com/vim/vim/issues/8723) diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2372,6 +2372,14 @@ def Test_if_const_expr() if false burp endif + + # expression with line breaks skipped + if false + ('aaa' + .. 'bbb' + .. 'ccc' + )->setline(1) + endif enddef def Test_if_const_expr_fails() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3312, +/**/ 3311, /**/ 3310, diff --git a/src/vim9compile.c b/src/vim9compile.c --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -9730,14 +9730,12 @@ compile_def_function( if (p == ea.cmd && ea.cmdidx != CMD_SIZE) { - if (cctx.ctx_skip == SKIP_YES) + if (cctx.ctx_skip == SKIP_YES && ea.cmdidx != CMD_eval) { line += STRLEN(line); goto nextline; } - - // Expression or function call. - if (ea.cmdidx != CMD_eval) + else if (ea.cmdidx != CMD_eval) { // CMD_var cannot happen, compile_assignment() above would be // used. Most likely an assignment to a non-existing variable.