diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-05-08 16:37:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-08 16:37:07 +0100 |
| commit | 933c2922b5e81b238c2e56361c76cf7c9548a2d7 (patch) | |
| tree | 6ace5f090aab2fd5e260d2139c6aac1c540280d3 | |
| parent | 27724251bc73f97b55240731f4316ee1b4eac1c5 (diff) | |
patch 8.2.4914: string interpolation in :def function may failv8.2.4914
Problem: String interpolation in :def function may fail.
Solution: Do not terminate the expression. (closes #10377)
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 52cbeae527..202bb58e69 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -2143,6 +2143,19 @@ def Test_expr8_string() v9.CheckDefAndScriptFailure(['var x = "abc'], 'E114:', 1) v9.CheckDefAndScriptFailure(["var x = 'abc"], 'E115:', 1) v9.CheckDefFailure(["if 0", "echo 'xx", "endif"], 'E115', 2) + + # interpolated string + var val = 'val' + var vv = $"some {val}" + assert_equal('some val', vv) + vv = $'other {val}' + assert_equal('other val', vv) + + var x = 'x' + var vl = 'foo xxx bar xxx baz' + ->split($'x{x}x') + ->map((_, v: string) => v =~ 'bar') + assert_equal([false, true, false], vl) enddef def Test_expr8_vimvar() diff --git a/src/version.c b/src/version.c index 792bd24b9d..6badc759ff 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4914, +/**/ 4913, /**/ 4912, diff --git a/src/vim9compile.c b/src/vim9compile.c index 15dab9862e..e95340c7ad 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -981,7 +981,6 @@ compile_all_expr_in_str(char_u *str, int evalstr, cctx_T *cctx) { char_u *p = str; char_u *val; - char_u save_c; int count = 0; if (cctx->ctx_skip == SKIP_YES) @@ -1051,11 +1050,8 @@ compile_all_expr_in_str(char_u *str, int evalstr, cctx_T *cctx) semsg(_(e_missing_close_curly_str), str); return FAIL; } - save_c = *block_end; - *block_end = NUL; if (compile_expr0(&block_start, cctx) == FAIL) return FAIL; - *block_end = save_c; may_generate_2STRING(-1, TRUE, cctx); ++count; |