patch 8.2.3129: Vim9: imported uninitialized list does not get type checked

Problem:    Vim9: imported uninitialized list does not get type checked.
Solution:   Get type from imported variable.

diff --git a/src/eval.c b/src/eval.c
index 555cd38f234a211c1250dad6017d59aeb11a84cc..e0f0816030de021ec05af062f189580a777d1696 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -959,7 +959,7 @@ get_lval(
                && lp->ll_tv == &v->di_tv
                && ht != NULL && ht == get_script_local_ht())
        {
-           svar_T  *sv = find_typval_in_script(lp->ll_tv, TRUE);
+           svar_T  *sv = find_typval_in_script(lp->ll_tv);
 
            // Vim9 script local variable: get the type
            if (sv != NULL)

diff --git a/src/evalvars.c b/src/evalvars.c
index a171c822f3e9e2d408d8f15267d7d1b3b498a88e..66018cff0592d7ddca760decf29f40533f6944d1 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2564,9 +2564,9 @@ eval_variable(
     int                ret = OK;
     typval_T   *tv = NULL;
     int                found = FALSE;
-    dictitem_T *v;
     hashtab_T  *ht = NULL;
     int                cc;
+    type_T     *type = NULL;
 
     // truncate the name, so that we can use strcmp()
     cc = name[len];
@@ -2576,13 +2576,16 @@ eval_variable(
     if ((tv = lookup_debug_var(name)) == NULL)
     {
        // Check for user-defined variables.
-       v = find_var(name, &ht, flags & EVAL_VAR_NOAUTOLOAD);
+       dictitem_T      *v = find_var(name, &ht, flags & EVAL_VAR_NOAUTOLOAD);
+
        if (v != NULL)
        {
            tv = &v->di_tv;
            if (dip != NULL)
                *dip = v;
        }
+       else
+           ht = NULL;
     }
 
     if (tv == NULL && (in_vim9script() || STRNCMP(name, "s:", 2) == 0))
@@ -2628,6 +2631,7 @@ eval_variable(
                svar_T          *sv = ((svar_T *)si->sn_var_vals.ga_data)
                                                    + import->imp_var_vals_idx;
                tv = sv->sv_tv;
+               type = sv->sv_type;
            }
        }
        else if (in_vim9script())
@@ -2656,13 +2660,10 @@ eval_variable(
        }
        else if (rettv != NULL)
        {
-           type_T      *type = NULL;
-
            if (ht != NULL && ht == get_script_local_ht())
            {
-               svar_T *sv = find_typval_in_script(tv, FALSE);
+               svar_T *sv = find_typval_in_script(tv);
 
-               // TODO: check imported variable
                if (sv != NULL)
                    type = sv->sv_type;
            }

diff --git a/src/proto/vim9script.pro b/src/proto/vim9script.pro
index 14f0800dc5ed4ca18dcd2d06af653525fcd7829c..41bf1287a1573966bc67471d98db57482aa7c6a6 100644 (file)
--- a/src/proto/vim9script.pro
+++ b/src/proto/vim9script.pro
@@ -16,7 +16,7 @@ char_u *vim9_declare_scriptvar(exarg_T *eap, char_u *arg);
 void update_vim9_script_var(int create, dictitem_T *di, int flags, typval_T *tv, type_T **type, int do_member);
 void hide_script_var(scriptitem_T *si, int idx, int func_defined);
 void free_all_script_vars(scriptitem_T *si);
-svar_T *find_typval_in_script(typval_T *dest, int give_error);
+svar_T *find_typval_in_script(typval_T *dest);
 int check_script_var_type(typval_T *dest, typval_T *value, char_u *name, where_T where);
 int check_reserved_name(char_u *name);
 /* vim: set ft=c : */

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index cde3e7c636dd81311c90c9dc9e5cb5eb8d07c11d..d4fdd7cf8178d8e9ae11a53a0e4a8058c42f2c09 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1391,6 +1391,7 @@ def Test_import_as()
     vim9script
     export var one = 1
     export var yes = 'yes'
+    export var slist: list<string>
   END
   writefile(export_lines, 'XexportAs')
 
@@ -1415,6 +1416,13 @@ def Test_import_as()
   END
   CheckScriptSuccess(import_lines)
 
+  import_lines =<< trim END
+    vim9script
+    import {slist as impSlist} from './XexportAs'
+    impSlist->add(123)
+  END
+  CheckScriptFailure(import_lines, 'E1012: Type mismatch; expected string but got number')
+
   delete('XexportAs')
 enddef
 
@@ -1947,8 +1955,8 @@ def Test_import_rtp()
         'g:imported_rtp = exported',
         ]
   writefile(import_lines, 'Ximport_rtp.vim')
-  mkdir('import')
-  writefile(s:export_script_lines, 'import/Xexport_rtp.vim')
+  mkdir('Ximport')
+  writefile(s:export_script_lines, 'Ximport/Xexport_rtp.vim')
 
   var save_rtp = &rtp
   &rtp = getcwd()
@@ -1960,7 +1968,7 @@ def Test_import_rtp()
   Undo_export_script_lines()
   unlet g:imported_rtp
   delete('Ximport_rtp.vim')
-  delete('import', 'rf')
+  delete('Ximport', 'rf')
 enddef
 
 def Test_import_compile_error()

diff --git a/src/userfunc.c b/src/userfunc.c
index 4ab7cc18bceca3aa4db865b914314ea5aac2ec11..4234681cd7b3947b1904110447b7ebf311422ac5 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -1512,7 +1512,7 @@ deref_func_name(
        {
            if (type != NULL && ht == get_script_local_ht())
            {
-               svar_T  *sv = find_typval_in_script(&v->di_tv, TRUE);
+               svar_T  *sv = find_typval_in_script(&v->di_tv);
 
                if (sv != NULL)
                    *type = sv->sv_type;

diff --git a/src/version.c b/src/version.c
index c523be2299718b5e7dda33654bbedb4be3e04923..6a5997070e232d9cc00aaabc840e34a5834caa03 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3129,
 /**/
     3128,
 /**/

diff --git a/src/vim9script.c b/src/vim9script.c
index 8acb7c32b422e84442bfad0eb99e42c7880e72bf..d40e334aefa9ba1ad8af7bae298c6ee4e1212c28 100644 (file)
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -616,7 +616,7 @@ handle_import(
            if (idx < 0 && ufunc == NULL)
                goto erret;
 
-           // If already imported with the same propertis and the
+           // If already imported with the same properties and the
            // IMP_FLAGS_RELOAD set then we keep that entry.  Otherwise create
            // a new one (and give an error for an existing import).
            imported = find_imported(name, len, cctx);
@@ -806,7 +806,7 @@ update_vim9_script_var(
     }
     else
     {
-       sv = find_typval_in_script(&di->di_tv, TRUE);
+       sv = find_typval_in_script(&di->di_tv);
     }
     if (sv != NULL)
     {
@@ -922,11 +922,10 @@ free_all_script_vars(scriptitem_T *si)
 
 /*
  * Find the script-local variable that links to "dest".
- * Returns NULL if not found and when "give_error" is TRUE this is considered
- * an internal error.
+ * Returns NULL if not found and give an internal error.
  */
     svar_T *
-find_typval_in_script(typval_T *dest, int give_error)
+find_typval_in_script(typval_T *dest)
 {
     scriptitem_T    *si = SCRIPT_ITEM(current_sctx.sc_sid);
     int                    idx;
@@ -945,8 +944,7 @@ find_typval_in_script(typval_T *dest, int give_error)
        if (sv->sv_name != NULL && sv->sv_tv == dest)
            return sv;
     }
-    if (give_error)
-       iemsg("find_typval_in_script(): not found");
+    iemsg("find_typval_in_script(): not found");
     return NULL;
 }
 
@@ -961,7 +959,7 @@ check_script_var_type(
        char_u      *name,
        where_T     where)
 {
-    svar_T  *sv = find_typval_in_script(dest, TRUE);
+    svar_T  *sv = find_typval_in_script(dest);
     int            ret;
 
     if (sv != NULL)