From e525bdda3aa29f0ffcb18d8d16903ebafc2b5881 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 7 Aug 2021 18:12:40 +0200
Subject: [PATCH] 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 #8723)
---
src/testdir/test_vim9_script.vim | 8 ++++++++
src/version.c | 2 ++
src/vim9compile.c | 6 ++----
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 2c5e3e7dab..059141a754 100644
--- 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
index d31a019916..a6e2f1ef0a 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 */
+/**/
+ 3312,
/**/
3311,
/**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 125135adaa..5effa5c719 100644
--- 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.
--
GitLab