Mercurial > vim

changeset 26974:fceb494e22de v8.2.4016

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4016: Vim9: incorrect error for argument that is shadowing var Commit: https://github.com/vim/vim/commit/58493cfae255adec2d5b407593b82d07abcc0975 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 6 12:23:30 2022 +0000 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.
author Bram Moolenaar <Bram@vim.org>
date Thu, 06 Jan 2022 13:30:04 +0100
parents 3d561592f19b
children ae1e69d77cea
files src/testdir/test_vim9_func.vim src/version.c src/vim9compile.c
diffstat 3 files changed, 19 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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 */
 /**/
+    4016,
+/**/
     4015,
 /**/
     4014,
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -162,7 +162,6 @@ find_script_var(char_u *name, size_t len
     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
     // 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
 	sav = sav->sav_next;
     }
 
-    // Not found, assume variable at script level was visible.
-    return found_sav;
+    // Not found, variable was not visible.
+    return NULL;
 }
 
 /*