patch 8.2.4330: Vim9: no error if script imports itself

Problem:    Vim9: no error if script imports itself.
Solution:   Give an error when a script imports itself.

diff --git a/src/errors.h b/src/errors.h
index ecd4eb92d020775b689e6c353d26236e7be2e7a9..c66d26d8d99ce5f9653407d38ecd8af4c29fdeea 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -2802,7 +2802,8 @@ EXTERN char e_function_reference_invalid[]
        INIT(= N_("E1086: Function reference invalid"));
 EXTERN char e_cannot_use_index_when_declaring_variable[]
        INIT(= N_("E1087: Cannot use an index when declaring a variable"));
-// E1088 unused
+EXTERN char e_script_cannot_import_itself[]
+       INIT(= N_("E1088: Script cannot import itself"));
 EXTERN char e_unknown_variable_str[]
        INIT(= N_("E1089: Unknown variable: %s"));
 EXTERN char e_cannot_assign_to_argument[]

diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index 1e8851e92df53640e60ba96b0ab7da59faa0e61b..652e4d36b633b55f8e1009ad90365d89e88a6b3e 100644 (file)
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -500,7 +500,16 @@ def Test_import_fails()
   v9.CheckScriptFailure(lines, 'E1262:')
 
   delete('Xthat.vim')
- 
+
+  lines =<< trim END
+      vim9script
+      export var item = 'hello'
+      import './Xyourself.vim'
+  END
+  writefile(lines, 'Xyourself.vim')
+  assert_fails('source Xyourself.vim', 'E1088:')
+  delete('Xyourself.vim')
+
   mkdir('Ximport')
 
   writefile(['vim9script'], 'Ximport/.vim')

diff --git a/src/version.c b/src/version.c
index 2feed3cf37f0933fd1af64b7f565d4ef2d9df4ff..d7da6df6e05530ffcd29de3a424fbcbd5010d57b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4330,
 /**/
     4329,
 /**/

diff --git a/src/vim9script.c b/src/vim9script.c
index 5c1c055668968d773155bfdc80d4f1c96ef1f791..872108827e8fc0f089d06cecc500591f12de4420 100644 (file)
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -516,6 +516,12 @@ handle_import(
        goto erret;
     }
 
+    if (sid == current_sctx.sc_sid)
+    {
+       emsg(_(e_script_cannot_import_itself));
+       goto erret;
+    }
+
     import_gap = gap != NULL ? gap : &SCRIPT_ITEM(import_sid)->sn_imports;
     for (i = 0; i < import_gap->ga_len; ++i)
     {