From 58493cfae255adec2d5b407593b82d07abcc0975 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 6 Jan 2022 12:23:30 +0000
Subject: [PATCH] patch 8.2.4016: Vim9: incorrect error for argument that is
 shadowing var

Problem:    Vim9: incorrect error for argument that is shadowing var.
Solution:   Ignore variable that is not in block where the function was
            defined.
---
 src/testdir/test_vim9_func.vim | 15 +++++++++++++++
 src/version.c                  |  2 ++
 src/vim9compile.c              |  6 ++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 025edd5da..9e420ade7 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -933,6 +933,21 @@ def Test_local_function_shadows_global()
       delfunc g:Func
   END
   CheckScriptSuccess(lines)
+
+  # This does not shadow "i" which is visible only inside the for loop
+  lines =<< trim END
+      vim9script
+
+      def Foo(i: number)
+        echo i
+      enddef
+
+      for i in range(3)
+        # Foo() is compiled here
+        Foo(i)
+      endfor
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 func TakesOneArg(arg)
diff --git a/src/version.c b/src/version.c
index d331c8708..dafef8ec9 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 */
+/**/
+    4016,
 /**/
     4015,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index da93c1b89..453e3f545 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -162,7 +162,6 @@ find_script_var(char_u *name, size_t len, cctx_T *cctx)
     hashitem_T	    *hi;
     int		    cc;
     sallvar_T	    *sav;
-    sallvar_T	    *found_sav;
     ufunc_T	    *ufunc;
 
     // Find the list of all script variables with the right name.
@@ -198,7 +197,6 @@ find_script_var(char_u *name, size_t len, cctx_T *cctx)
     // Go over the variables with this name and find one that was visible
     // from the function.
     ufunc = cctx->ctx_ufunc;
-    found_sav = sav;
     while (sav != NULL)
     {
 	int idx;
@@ -211,8 +209,8 @@ find_script_var(char_u *name, size_t len, cctx_T *cctx)
 	sav = sav->sav_next;
     }
 
-    // Not found, assume variable at script level was visible.
-    return found_sav;
+    // Not found, variable was not visible.
+    return NULL;
 }
 
 /*
-- 
2.50.1