patch 8.2.2680: Vim9: problem defining a script variable from legacy function

Problem:    Vim9: problem defining a script variable from legacy function.
Solution:   Check if the script is Vim9, not the current syntax.
            (closes #8032)

diff --git a/src/evalvars.c b/src/evalvars.c
index e9e893a3f8ab495843e052050b611e932f68bbb2..a482453331e3e9cc7877e54969971983f966d534 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -3168,6 +3168,7 @@ set_var_const(
     hashtab_T  *ht;
     int                is_script_local;
     int                vim9script = in_vim9script();
+    int                var_in_vim9script;
 
     ht = find_var_ht(name, &varname);
     if (ht == NULL || *varname == NUL)
@@ -3186,6 +3187,7 @@ set_var_const(
        vim9_declare_error(name);
        goto failed;
     }
+    var_in_vim9script = is_script_local && current_script_is_vim9();
 
     di = find_var_in_ht(ht, 0, varname, TRUE);
 
@@ -3217,7 +3219,7 @@ set_var_const(
                goto failed;
            }
 
-           if (is_script_local && vim9script)
+           if (var_in_vim9script)
            {
                where_T where;
 
@@ -3244,7 +3246,7 @@ set_var_const(
 
            // A Vim9 script-local variable is also present in sn_all_vars and
            // sn_var_vals.  It may set "type" from "tv".
-           if (is_script_local && vim9script)
+           if (var_in_vim9script)
                update_vim9_script_var(FALSE, di, flags, tv, &type);
        }
 
@@ -3308,7 +3310,7 @@ set_var_const(
        }
 
        // add a new variable
-       if (vim9script && is_script_local && (flags & ASSIGN_NO_DECL))
+       if (var_in_vim9script && (flags & ASSIGN_NO_DECL))
        {
            semsg(_(e_unknown_variable_str), name);
            goto failed;
@@ -3342,7 +3344,7 @@ set_var_const(
 
        // A Vim9 script-local variable is also added to sn_all_vars and
        // sn_var_vals. It may set "type" from "tv".
-       if (is_script_local && vim9script)
+       if (var_in_vim9script)
            update_vim9_script_var(TRUE, di, flags, tv, &type);
     }
 

diff --git a/src/proto/vim9script.pro b/src/proto/vim9script.pro
index a7d821c0d837a95bb494b27cb8c801e9be4e3a23..c43120c4527a59822bc5b5bff80e2d7fffa97edd 100644 (file)
--- a/src/proto/vim9script.pro
+++ b/src/proto/vim9script.pro
@@ -1,5 +1,6 @@
 /* vim9script.c */
 int in_vim9script(void);
+int current_script_is_vim9(void);
 void ex_vim9script(exarg_T *eap);
 int not_in_vim9(exarg_T *eap);
 int vim9_bad_comment(char_u *p);

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 1169c86924f36f75fb5a3af8eb8721fb9e092f5b..cd8ac091d6d83b6dc6364b5d07ce8514e1f04479 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -3220,6 +3220,35 @@ def Test_source_vim9_from_legacy()
   delete('Xvim9_script.vim')
 enddef
 
+def Test_declare_script_in_func()
+  var lines =<< trim END
+      vim9script
+      func Declare()
+        let s:local = 123
+      endfunc
+      Declare()
+      assert_equal(123, local)
+
+      var error: string
+      try
+        local = 'asdf'
+      catch
+        error = v:exception
+      endtry
+      assert_match('E1012: Type mismatch; expected number but got string', error)
+
+      lockvar local
+      try
+        local = 999
+      catch
+        error = v:exception
+      endtry
+      assert_match('E741: Value is locked: local', error)
+  END
+  CheckScriptSuccess(lines)
+enddef
+        
+
 func Test_vim9script_not_global()
   " check that items defined in Vim9 script are script-local, not global
   let vim9lines =<< trim END

diff --git a/src/version.c b/src/version.c
index 4947b563576de899421d0d2c1e1a4e897564a92c..d448b948028d9b15174276950248e9a410b6e090 100644 (file)
--- 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 */
+/**/
+    2680,
 /**/
     2679,
 /**/

diff --git a/src/vim9script.c b/src/vim9script.c
index 8806de3137a7a48b3b34f50779d4ad56e02b914b..9839a06cfb9293e27df6c3e29166bf3f5eee55fe 100644 (file)
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -17,16 +17,32 @@
 # include "vim9.h"
 #endif
 
+/*
+ * Return TRUE when currently using Vim9 script syntax.
+ * Does not go up the stack, a ":function" inside vim9script uses legacy
+ * syntax.
+ */
     int
 in_vim9script(void)
 {
-    // Do not go up the stack, a ":function" inside vim9script uses legacy
-    // syntax.  "sc_version" is also set when compiling a ":def" function in
-    // legacy script.
+    // "sc_version" is also set when compiling a ":def" function in legacy
+    // script.
     return current_sctx.sc_version == SCRIPT_VERSION_VIM9
                || (cmdmod.cmod_flags & CMOD_VIM9CMD);
 }
 
+/*
+ * Return TRUE if the current script is Vim9 script.
+ * This also returns TRUE in a legacy function in a Vim9 script.
+ */
+    int
+current_script_is_vim9(void)
+{
+    return SCRIPT_ID_VALID(current_sctx.sc_sid)
+           && SCRIPT_ITEM(current_sctx.sc_sid)->sn_version
+                                                      == SCRIPT_VERSION_VIM9;
+}
+
 /*
  * ":vim9script".
  */