patch 8.2.1074: Vim9: no line break allowed after some operators
Problem: Vim9: no line break allowed after some operators.
Solution: Skip a line break after the operator. Add
eval_may_get_next_line() to simplify checking for a line break.
diff --git a/src/dict.c b/src/dict.c
index be3282d..079eb3e 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -805,7 +805,6 @@
char_u buf[NUMBUFLEN];
int vim9script = current_sctx.sc_version == SCRIPT_VERSION_VIM9;
int had_comma;
- int getnext;
/*
* First check if it's not a curly-braces thing: {expr}.
@@ -831,10 +830,7 @@
tvkey.v_type = VAR_UNKNOWN;
tv.v_type = VAR_UNKNOWN;
- *arg = skipwhite(*arg + 1);
- eval_next_non_blank(*arg, evalarg, &getnext);
- if (getnext)
- *arg = eval_next_line(evalarg);
+ *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
while (**arg != '}' && **arg != NUL)
{
if ((literal
@@ -866,10 +862,7 @@
goto failret;
}
- *arg = skipwhite(*arg + 1);
- eval_next_non_blank(*arg, evalarg, &getnext);
- if (getnext)
- *arg = eval_next_line(evalarg);
+ *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
if (eval1(arg, &tv, evalarg) == FAIL) // recursive!
{
if (evaluate)
@@ -911,9 +904,7 @@
}
// the "}" can be on the next line
- eval_next_non_blank(*arg, evalarg, &getnext);
- if (getnext)
- *arg = eval_next_line(evalarg);
+ *arg = skipwhite_and_linebreak(*arg, evalarg);
if (**arg == '}')
break;
if (!had_comma)