Mercurial > vim
changeset 23344:1f37fd20f851 v8.2.2215
patch 8.2.2215: Vim9: not recognized in global command
Commit: https://github.com/vim/vim/commit/56ce9ea3ea46529cac2fdf3151abfa0e1ae49bad
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Dec 25 18:35:29 2020 +0100
patch 8.2.2215: Vim9: not recognized in global command
Problem: Vim9: not recognized in global command.
Solution: Skip over pattern. (issue https://github.com/vim/vim/issues/7541)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 25 Dec 2020 18:45:03 +0100 |
| parents | 2085a9327b52 |
| children | 3cfaf9e39808 |
| files | src/testdir/test_vim9_cmd.vim src/version.c src/vim9compile.c |
| diffstat | 3 files changed, 25 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -25,6 +25,15 @@ def Test_edit_wildcards() CheckDefFailure(['edit `="foo"'], 'E1083:') enddef +def Test_global_backtick_expansion() + new + setline(1, 'xx') + var name = 'foobar' + g/^xx/s/.*/`=name` + assert_equal('foobar', getline(1)) + bwipe! +enddef + def Test_hardcopy_wildcards() CheckUnix CheckFeature postscript
--- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2215, +/**/ 2214, /**/ 2213,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2947,7 +2947,7 @@ compile_list(char_u **arg, cctx_T *cctx, } /* - * parse a lambda: {arg, arg -> expr} + * parse a lambda: "{arg, arg -> expr}" or "(arg, arg) => expr" * "*arg" points to the '{'. */ static int @@ -7315,6 +7315,19 @@ compile_exec(char_u *line, exarg_T *eap, eap->arg = skiptowhite(eap->arg); } + if ((eap->cmdidx == CMD_global || eap->cmdidx == CMD_vglobal) + && STRLEN(eap->arg) > 4) + { + int delim = *eap->arg; + + p = skip_regexp_ex(eap->arg + 1, delim, TRUE, NULL, NULL); + if (*p == delim) + { + eap->arg = p + 1; + has_expr = TRUE; + } + } + if (has_expr && (p = (char_u *)strstr((char *)eap->arg, "`=")) != NULL) { int count = 0;