From b4893b84507570f24af32597716ffb67fb0ef24e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 21 Feb 2021 22:20:24 +0100
Subject: patch 8.2.2540: Vim9: no error for using script var name for argument

Problem:    Vim9: no error for using script var name for argument.
Solution:   Check for this error. (closes #7868)
---
 src/proto/vim9compile.pro      | 1 +
 src/testdir/test_vim9_func.vim | 9 +++++++++
 src/userfunc.c                 | 8 ++++++++
 src/version.c                  | 2 ++
 src/vim9compile.c              | 2 +-
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/proto/vim9compile.pro b/src/proto/vim9compile.pro
index 04c3c5efd..410910f00 100644
--- a/src/proto/vim9compile.pro
+++ b/src/proto/vim9compile.pro
@@ -1,4 +1,5 @@
 /* vim9compile.c */
+int script_var_exists(char_u *name, size_t len, int vim9script, cctx_T *cctx);
 int check_defined(char_u *p, size_t len, cctx_T *cctx);
 int check_compare_types(exprtype_T type, typval_T *tv1, typval_T *tv2);
 int use_typecheck(type_T *actual, type_T *expected);
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index c24d32f93..05becd72c 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -589,6 +589,15 @@ def Test_call_wrong_args()
   END
   CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected string but got list<unknown>', 5)
 
+  lines =<< trim END
+    vim9script
+    var name = 'piet'
+    def FuncOne(name: string)
+      echo nr
+    enddef
+  END
+  CheckScriptFailure(lines, 'E1054:')
+
   lines =<< trim END
     vim9script
     def FuncOne(nr: number)
diff --git a/src/userfunc.c b/src/userfunc.c
index 450582c4f..8579c3b38 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -80,6 +80,14 @@ one_function_arg(
 	    semsg(_("E125: Illegal argument: %s"), arg);
 	return arg;
     }
+
+    // Vim9 script: cannot use script var name for argument.
+    if (argtypes != NULL && script_var_exists(arg, p - arg, FALSE, NULL) == OK)
+    {
+	semsg(_(e_variable_already_declared_in_script), arg);
+	return arg;
+    }
+
     if (newargs != NULL && ga_grow(newargs, 1) == FAIL)
 	return arg;
     if (newargs != NULL)
diff --git a/src/version.c b/src/version.c
index b096340cf..25ea70bee 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 */
+/**/
+    2540,
 /**/
     2539,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index c9591ad7b..0be2b29d8 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -337,7 +337,7 @@ script_is_vim9()
  * "cctx" is NULL at the script level.
  * Returns OK or FAIL.
  */
-    static int
+    int
 script_var_exists(char_u *name, size_t len, int vim9script, cctx_T *cctx)
 {
     int		    is_vim9_script;
-- 
cgit v1.2.1