thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3312: Vim9: after "if false" line breaks in expression not skipped

Browse Source 
Problem:    Vim9: after "if false" line breaks in expression not skipped.
Solution:   Do parse the expression. (closes #8723)
This commit is contained in:
Bram Moolenaar
2021-08-07 18:12:40 +02:00
parent dae453f339
commit e525bdda3a
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_vim9_script.vim
View File

@@ -2372,6 +2372,14 @@ def Test_if_const_expr()
if false if false
burp burp
endif endif
# expression with line breaks skipped
if false
('aaa'
.. 'bbb'
.. 'ccc'
)->setline(1)
endif
enddef enddef
def Test_if_const_expr_fails() def Test_if_const_expr_fails()

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3312,
/**/ /**/
3311, 3311,
/**/ /**/

6
src/vim9compile.c
View File

@@ -9730,14 +9730,12 @@ compile_def_function(
if (p == ea.cmd && ea.cmdidx != CMD_SIZE) 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); line += STRLEN(line);
goto nextline; goto nextline;
} }
else if (ea.cmdidx != CMD_eval)
// Expression or function call.
if (ea.cmdidx != CMD_eval)
{ {
// CMD_var cannot happen, compile_assignment() above would be // CMD_var cannot happen, compile_assignment() above would be
// used. Most likely an assignment to a non-existing variable. // used. Most likely an assignment to a non-existing variable.