patch 8.2.2303: Vim9: backtick expansion doesn't work for :foldopen
Problem: Vim9: backtick expansion doesn't work for :foldopen.
Solution: Do recognize backtick expansion. (closes #7621)
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index c9e83d9..5b84fec 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -81,6 +81,23 @@
bwipe!
enddef
+def Test_folddo_backtick_expansion()
+ new
+ var name = 'xxx'
+ folddoopen edit `=name`
+ assert_equal('xxx', bufname())
+ bwipe!
+
+ new
+ setline(1, ['one', 'two'])
+ set nomodified
+ :1,2fold
+ foldclose
+ folddoclose edit `=name`
+ assert_equal('xxx', bufname())
+ bwipe!
+enddef
+
def Test_hardcopy_wildcards()
CheckUnix
CheckFeature postscript
diff --git a/src/version.c b/src/version.c
index e7c3ee0..a2553fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2303,
+/**/
2302,
/**/
2301,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index cf5cff8..67307f8 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7505,6 +7505,13 @@
}
}
+ if (eap->cmdidx == CMD_folddoopen || eap->cmdidx == CMD_folddoclosed)
+ {
+ // TODO: should only expand when appropriate for the command
+ eap->arg = skiptowhite(eap->arg);
+ has_expr = TRUE;
+ }
+
if (has_expr && (p = (char_u *)strstr((char *)eap->arg, "`=")) != NULL)
{
int count = 0;