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

patch 8.2.1074: Vim9: no line break allowed after some operators

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2020-06-27 21:18:00 +02:00
parent 7a4981b936
commit 9215f01218
7 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/list.c
View File

@@ -1164,7 +1164,6 @@ get_list_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
{
int evaluate = evalarg == NULL ? FALSE
: evalarg->eval_flags & EVAL_EVALUATE;
int getnext;
list_T *l = NULL;
typval_T tv;
listitem_T *item;
@@ -1178,10 +1177,7 @@ get_list_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
return FAIL;
}
*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 (eval1(arg, &tv, evalarg) == FAIL) // recursive!
@@ -1212,9 +1208,7 @@ get_list_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int do_error)
}
// 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;