# HG changeset patch # User Bram Moolenaar # Date 1593202503 -7200 # Node ID fe2ed85db946d7fd3679c6c42ae22f9e2e637b26 # Parent 8463e5662d5b377f42ff59a42bf56f929fd745e1 patch 8.2.1064: Vim9: no line break allowed before comperators Commit: https://github.com/vim/vim/commit/e6536aa766e95b6c64489678eb029e6909ee6a35 Author: Bram Moolenaar Date: Fri Jun 26 22:00:38 2020 +0200 patch 8.2.1064: Vim9: no line break allowed before comperators Problem: Vim9: no line break allowed before comperators. Solution: Check for comperator after line break. diff --git a/src/eval.c b/src/eval.c --- a/src/eval.c +++ b/src/eval.c @@ -2191,6 +2191,7 @@ eval4(char_u **arg, typval_T *rettv, eva { typval_T var2; char_u *p; + int getnext; int i; exptype_T type = EXPR_UNKNOWN; int len = 2; @@ -2202,7 +2203,7 @@ eval4(char_u **arg, typval_T *rettv, eva if (eval5(arg, rettv, evalarg) == FAIL) return FAIL; - p = *arg; + p = eval_next_non_blank(*arg, evalarg, &getnext); switch (p[0]) { case '=': if (p[1] == '=') @@ -2247,6 +2248,9 @@ eval4(char_u **arg, typval_T *rettv, eva */ if (type != EXPR_UNKNOWN) { + if (getnext) + *arg = eval_next_line(evalarg); + // extra question mark appended: ignore case if (p[len] == '?') { diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -529,6 +529,43 @@ def RetVoid() let x = 1 enddef +def Test_expr4_vimscript() + " only checks line continuation + let lines =<< trim END + vim9script + let var = 0 + < 1 + assert_equal(1, var) + END + CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + let var = 123 + != 123 + assert_equal(0, var) + END + CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + let list = [1, 2, 3] + let var = list + is list + assert_equal(1, var) + END + CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + let myblob = 0z1234 + let var = myblob + isnot 0z11 + assert_equal(1, var) + END + CheckScriptSuccess(lines) +enddef + func Test_expr4_fails() let msg = "white space required before and after '>'" call CheckDefFailure(["let x = 1>2"], msg) diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1064, +/**/ 1063, /**/ 1062,