patch 8.2.3186: Vim9: not all failures for import tested

Problem:    Vim9: not all failures for import tested
Solution:   Test more import failures

diff --git a/src/errors.h b/src/errors.h
index 98a10987fab30b9cc6cff2a04004cb2ad0d23a22..af42428c552b256ac6d32ed7d526234782dc3958 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -511,7 +511,7 @@ EXTERN char e_list_required_for_argument_nr[]
 EXTERN char e_bool_required_for_argument_nr[]
        INIT(= N_("E1212: Bool required for argument %d"));
 EXTERN char e_redefining_imported_item_str[]
-       INIT(= N_("E1213: Redefining imported item %s"));
+       INIT(= N_("E1213: Redefining imported item \"%s\""));
 #if defined(FEAT_DIGRAPHS) && defined(FEAT_EVAL)
 EXTERN char e_digraph_must_be_just_two_characters_str[]
        INIT(= N_("E1214: Digraph must be just two characters: %s"));

diff --git a/src/evalvars.c b/src/evalvars.c
index dcf1058dec73d2b6a1e41cfd459bab53dca6630d..d0bbff79224afdcca9eb7a2ed238a7a08e103d73 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -3250,6 +3250,7 @@ set_var_const(
        {
            scriptitem_T    *si = SCRIPT_ITEM(import->imp_sid);
            svar_T          *sv;
+           where_T         where;
 
            // imported variable from another script
            if ((flags & ASSIGN_NO_DECL) == 0)
@@ -3257,10 +3258,16 @@ set_var_const(
                semsg(_(e_redefining_imported_item_str), name);
                goto failed;
            }
-           sv = ((svar_T *)si->sn_var_vals.ga_data)
-                                                   + import->imp_var_vals_idx;
-           // TODO: check the type
-           // TODO: check for const and locked
+           sv = ((svar_T *)si->sn_var_vals.ga_data) + import->imp_var_vals_idx;
+
+           where.wt_index = 0;
+           where.wt_variable = TRUE;
+           if (check_typval_type(sv->sv_type, tv, where) == FAIL
+                   || value_check_lock(sv->sv_tv->v_lock, name, FALSE))
+           {
+               goto failed;
+           }
+
            dest_tv = sv->sv_tv;
            clear_tv(dest_tv);
        }

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 203c5c905a445de587cf86624a54752ae0f2fb24..037c36d29e59d014d5e5cc7956c8d7f9871929c7 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1375,6 +1375,30 @@ def Test_vim9_import_export()
   writefile(import_missing_comma_lines, 'Ximport3.vim')
   assert_fails('source Ximport3.vim', 'E1046:', '', 2, 'Ximport3.vim')
 
+  var import_redefining_lines =<< trim END
+    vim9script
+    import exported from './Xexport.vim'
+    var exported = 5
+  END
+  writefile(import_redefining_lines, 'Ximport.vim')
+  assert_fails('source Ximport.vim', 'E1213: Redefining imported item "exported"', '', 3)
+
+  var import_assign_wrong_type_lines =<< trim END
+    vim9script
+    import exported from './Xexport.vim'
+    exported = 'xxx'
+  END
+  writefile(import_assign_wrong_type_lines, 'Ximport.vim')
+  assert_fails('source Ximport.vim', 'E1012: Type mismatch; expected number but got string', '', 3)
+
+  var import_assign_const_lines =<< trim END
+    vim9script
+    import CONST from './Xexport.vim'
+    CONST = 4321
+  END
+  writefile(import_assign_const_lines, 'Ximport.vim')
+  assert_fails('source Ximport.vim', 'E741: Value is locked: CONST', '', 3)
+
   delete('Ximport.vim')
   delete('Ximport3.vim')
   delete('Xexport.vim')

diff --git a/src/version.c b/src/version.c
index 04354c2aa17c64aec2c1f2ac9f403bfcd0425b62..0710ce0614a56c0e7a46c1819870374152f40f8d 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 */
+/**/
+    3186,
 /**/
     3185,
 /**/