patch 8.2.2774: Vim9: cannot import an existing name even when using "as"

Problem:    Vim9: cannot import an existing name even when using "as".
Solution:   Do not check for an existing name when using "as". (closes #8113)

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index d9ae4ff670856241026527ed9ba6a257734f627c..2f2fc9cc02adbd8bb41f28da028333bb01240d2c 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1280,6 +1280,8 @@ def Test_import_as()
 
   var import_lines =<< trim END
     vim9script
+    var one = 'notused'
+    var yes = 777
     import one as thatOne from './XexportAs'
     assert_equal(1, thatOne)
     import yes as yesYes from './XexportAs'

diff --git a/src/version.c b/src/version.c
index 113ba8ff00f744e0953ad1b97dd9a2c94f91e3d1..5d26348addbedf191fce1e936f4c18b8f5c06f40 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 */
+/**/
+    2774,
 /**/
     2773,
 /**/

diff --git a/src/vim9script.c b/src/vim9script.c
index 796b7d13cbdf6ac993300ea0d8edfee53ff9cffc..583a8d4c5976ba11b779f30d2968b5a126009809 100644 (file)
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -600,7 +600,8 @@ handle_import(
            }
            else
            {
-               if (check_defined(name, len, cctx, FALSE) == FAIL)
+               if (as_name == NULL
+                             && check_defined(name, len, cctx, FALSE) == FAIL)
                    goto erret;
 
                imported = new_imported(gap != NULL ? gap