From 01c5f2addf86b8d8940d71c92f6219f14a6df99e Mon Sep 17 00:00:00 2001 From: h-east Date: Mon, 9 Jan 2023 15:10:40 +0000 Subject: [PATCH] patch 9.0.1164: evaluating string expression advances function line Problem: Evaluating string expression advances function line. Solution: Disable function lines while parsing a string expression. (Hirohito Higashi, closes #11796) --- src/testdir/test_vim9_expr.vim | 11 +++++++++++ src/version.c | 2 ++ src/vim9expr.c | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 63547820c..29a17fe25 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -3700,6 +3700,17 @@ def Test_expr9_method_call_linebreak() assert_equal('', v:errmsg) END v9.CheckScriptSuccess(lines) + + # this was skipping over the expression without an error + lines =<< trim END + vim9script + def Test(s: string): string + return substitute(s, 'A', '\=toupper("x")', 'g') + ->tolower() + enddef + assert_equal('xbcd', Test('ABCD')) + END + v9.CheckScriptSuccess(lines) enddef def Test_expr9_method_call_import() diff --git a/src/version.c b/src/version.c index 4fbd96de0..1f808f3c6 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1164, /**/ 1163, /**/ diff --git a/src/vim9expr.c b/src/vim9expr.c index 3acb97bef..7f5f4c8b0 100644 --- a/src/vim9expr.c +++ b/src/vim9expr.c @@ -733,7 +733,15 @@ compile_string(isn_T *isn, cctx_T *cctx, int str_offset) cctx->ctx_instr.ga_len = 0; cctx->ctx_instr.ga_maxlen = 0; cctx->ctx_instr.ga_data = NULL; + + // avoid peeking a next line + int galen_save = cctx->ctx_ufunc->uf_lines.ga_len; + cctx->ctx_ufunc->uf_lines.ga_len = 0; + expr_res = compile_expr0(&s, cctx); + + cctx->ctx_ufunc->uf_lines.ga_len = galen_save; + s = skipwhite(s); trailing_error = *s != NUL; -- 2.50.1