From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 5 Jan 2021 18:23:28 +0000 (+0100)
Subject: patch 8.2.2303: Vim9: backtick expansion doesn't work for :foldopen
X-Git-Tag: v8.2.2303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecac591cce23919059a5d93ed2e94541b1be99b5;p=thirdparty%2Fvim.git

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 c9e83d9bca..5b84feceea 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -81,6 +81,23 @@ def Test_global_backtick_expansion()
   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 e7c3ee0a0d..a2553fcc4a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2303,
 /**/
     2302,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index cf5cff8598..67307f8a93 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7505,6 +7505,13 @@ compile_exec(char_u *line, exarg_T *eap, cctx_T *cctx)
 	}
     }
 
+    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;