# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1622922302 -7200
# Node ID 1bed37e82c2e69db67e5e9bf3070c20de6f8cc66
# Parent  a2e03e1f97ea2da980d6191127b6b98d8a4a0eed
patch 8.2.2946: Vim9: substitute expression cannot be a List

Commit: https://github.com/vim/vim/commit/2752360646545a9ae4853d2d5ca91cdb07c14eea
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Jun 5 21:36:19 2021 +0200

    patch 8.2.2946: Vim9: substitute expression cannot be a List

    Problem:    Vim9: substitute expression cannot be a List in a :def function.
    Solution:   Use typval2string(). (closes https://github.com/vim/vim/issues/8330)

diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -1236,6 +1236,13 @@ def Test_substitute_expr()
   END
   CheckScriptSuccess(lines)
   unlet g:cond
+
+  # List results in multiple lines
+  new
+  setline(1, 'some text here')
+  s/text/\=['aaa', 'bbb', 'ccc']/ 
+  assert_equal(['some aaa', 'bbb', 'ccc', ' here'], getline(1, '$'))
+  bwipe!
 enddef
 
 def Test_redir_to_var()
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    2946,
+/**/
     2945,
 /**/
     2944,
diff --git a/src/vim9execute.c b/src/vim9execute.c
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -4130,7 +4130,7 @@ exe_substitute_instr(void)
     {
 	typval_T *tv = STACK_TV_BOT(-1);
 
-	res = vim_strsave(tv_get_string(tv));
+	res = typval2string(tv, TRUE);
 	--ectx->ec_stack.ga_len;
 	clear_tv(tv);
     }