patch 9.0.0744: in script in autoload dir exported variable is not found

Problem:    In script in autoload dir exported variable is not found. (Doug
            Kearns)
Solution:   Find the variable with the "script#" prefix. (closes #11361)

diff --git a/src/evalvars.c b/src/evalvars.c
index fd443cd40f901429e97e15a0e0bae59e89539b22..132de4c717eae7362687d9da84090f0e9ee7c1ac 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -1326,7 +1326,7 @@ skip_var_list(
        }
        return p + 1;
     }
- 
+
     return skip_var_one(arg, include_type);
 }
 
@@ -3160,18 +3160,20 @@ find_var(char_u *name, hashtab_T **htp, int no_autoload)
     // When using "vim9script autoload" script-local items are prefixed but can
     // be used with s:name.
     if (SCRIPT_ID_VALID(current_sctx.sc_sid)
-                                          && name[0] == 's' && name[1] == ':')
+                  && (in_vim9script() || (name[0] == 's' && name[1] == ':')))
     {
        scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
 
        if (si->sn_autoload_prefix != NULL)
        {
-           char_u *auto_name = concat_str(si->sn_autoload_prefix, name + 2);
+           char_u *base_name = (name[0] == 's' && name[1] == ':')
+                                                            ? name + 2 : name;
+           char_u *auto_name = concat_str(si->sn_autoload_prefix, base_name);
 
            if (auto_name != NULL)
            {
                ht = &globvarht;
-               ret = find_var_in_ht(ht, *name, auto_name, TRUE);
+               ret = find_var_in_ht(ht, 'g', auto_name, TRUE);
                vim_free(auto_name);
                if (ret != NULL)
                {

diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index d509007d5e851ec5b05119b46b5a86ae86828c4a..6fe40234e436c3084ec7fa5fbe98e6f686f3c739 100644 (file)
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -1218,6 +1218,26 @@ def Test_autoload_import_deleted()
   delete('Xa.vim')
 enddef
 
+def Test_autoload_import_using_const()
+  mkdir('Xdir/autoload', 'pR')
+  var lines =<< trim END
+      vim9script
+      export const FOO = 42
+      echomsg FOO
+  END
+  writefile(lines, 'Xdir/autoload/exp.vim')
+
+  var save_rtp = &rtp
+  exe 'set rtp^=' .. getcwd() .. '/Xdir'
+  lines =<< trim END
+      vim9script
+      import autoload 'exp.vim'
+      assert_equal(42, exp.FOO)
+  END
+  v9.CheckScriptSuccess(lines)
+  &rtp = save_rtp
+enddef
+
 func Test_import_in_diffexpr()
   CheckExecutable diff
 
@@ -2570,7 +2590,7 @@ def Test_vim9script_autoload_duplicate()
      enddef
   END
   writefile(lines, 'Xdupdir/autoload/dup4func.vim')
-  assert_fails('source Xdupdir/autoload/dup4func.vim', 'E707:')
+  assert_fails('source Xdupdir/autoload/dup4func.vim', 'E1041:')
 
   lines =<< trim END
      vim9script

diff --git a/src/version.c b/src/version.c
index de1c5ce4cd3023879815e877eede83d174781252..5bbf356219be687fa1502ea6db36a82262d6a17c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    744,
 /**/
     743,
 /**/