# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1663499706 -7200
# Node ID 1358585dde2bfdd6bfdeb537dbeac48d4bc86b66
# Parent  96b5bf36b9260c8e4d421412bd3caf2acbd4a446
patch 9.0.0495: closure doesn't work properly in nested loop

Commit: https://github.com/vim/vim/commit/dbbb02bc770646776a04122ff58313d170873e67
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Sep 18 12:00:21 2022 +0100

    patch 9.0.0495: closure doesn't work properly in nested loop

    Problem:    Closure doesn't work properly in nested loop.
    Solution:   Save variables up to the outer loop.

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -2300,6 +2300,32 @@ def Test_for_loop_with_closure()
       endfor
   END
   v9.CheckDefAndScriptSuccess(lines)
+
+  # Also works for a nested loop
+  lines =<< trim END
+      var flist: list<func>
+      var n = 0
+      for i in range(3)
+        var ii = i
+        for a in ['a', 'b', 'c']
+          var aa = a
+          flist[n] = () => ii .. aa
+          ++n
+        endfor
+      endfor
+
+      n = 0
+      for i in range(3)
+        for a in ['a', 'b', 'c']
+          assert_equal(i .. a, flist[n]())
+          ++n
+        endfor
+      endfor
+  END
+  v9.CheckScriptSuccess(['vim9script'] + lines)
+  # FIXME: not yet right for :def
+  lines[14] = 'assert_equal(2 .. a, flist[n]())'
+  v9.CheckDefSuccess(lines)
 enddef
 
 def Test_for_loop_fails()
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    495,
+/**/
     494,
 /**/
     493,
diff --git a/src/vim9execute.c b/src/vim9execute.c
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2671,7 +2671,7 @@ execute_endloop(isn_T *iptr, ectx_T *ect
     {
 	partial_T   *pt = ((partial_T **)gap->ga_data)[idx];
 
-	if (pt->pt_refcount > 1)
+	if (pt->pt_refcount > 1 && pt->pt_loopvars == NULL)
 	{
 	    int refcount = pt->pt_refcount;
 	    int i;
@@ -2727,7 +2727,7 @@ execute_endloop(isn_T *iptr, ectx_T *ect
     {
 	partial_T   *pt = ((partial_T **)gap->ga_data)[idx];
 
-	if (pt->pt_refcount > 1)
+	if (pt->pt_refcount > 1 && pt->pt_loopvars == NULL)
 	{
 	    ++loopvars->lvs_refcount;
 	    pt->pt_loopvars = loopvars;