patch 8.2.2215: Vim9: not recognized in global command
Problem: Vim9: not recognized in global command.
Solution: Skip over pattern. (issue #7541)
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index f05872e..9790789 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -25,6 +25,15 @@
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
diff --git a/src/version.c b/src/version.c
index ff96523..8f9a54e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2215,
+/**/
2214,
/**/
2213,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 53a6105..b035333 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2947,7 +2947,7 @@
}
/*
- * 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 @@
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;