commit b697dc295d0625bf2445649f03019f9b8fccc1a8
author Bram Moolenaar <Bram@vim.org> Sat Jan 22 11:27:29 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Sat Jan 22 11:27:29 2022 +0000
tree 5dccc253b9b1b5e7a6469c74f63ca3682b29c6d4
parent 3d8e25a6d2660432df033cdad29f981ffe6ae0fc

patch 8.2.4177: Vim9: autoload script not loaded after "vim9script noclear"

Problem:    Vim9: autoload script not loaded after "vim9script noclear".
Solution:   Check IMP_FLAGS_AUTOLOAD properly.

src/testdir/test_vim9_import.vim

diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index f06bea2..df22a77 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -1535,6 +1535,48 @@
   &rtp = save_rtp
 enddef
 
+def Test_vim9script_noclear_autoload()
+  mkdir('Xdir/autoload', 'p')
+  var save_rtp = &rtp
+  exe 'set rtp^=' .. getcwd() .. '/Xdir'
+
+  var lines =<< trim END
+      vim9script
+      export def Func(): string
+        return 'called'
+      enddef
+      g:double_loaded = 'yes'
+  END
+  writefile(lines, 'Xdir/autoload/double.vim')
+
+  lines =<< trim END
+      vim9script noclear
+      if exists('g:script_loaded')
+        finish
+      endif
+      g:script_loaded = true
+
+      import autoload 'double.vim'
+      nnoremap <F3> <ScriptCmd>g:result = double.Func()<CR>
+  END
+  g:double_loaded = 'no'
+  writefile(lines, 'Xloaddouble')
+  source Xloaddouble
+  assert_equal('no', g:double_loaded)
+  assert_equal(true, g:script_loaded)
+  source Xloaddouble
+  feedkeys("\<F3>", 'xt')
+  assert_equal('called', g:result)
+  assert_equal('yes', g:double_loaded)
+
+  delete('Xloaddouble')
+  unlet g:double_loaded
+  unlet g:script_loaded
+  unlet g:result
+  delete('Xdir', 'rf')
+  &rtp = save_rtp
+enddef
+
 def Test_vim9script_autoload_duplicate()
   mkdir('Xdir/autoload', 'p')
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 7f0dff5..154b7e3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4177,
+/**/
     4176,
 /**/
     4175,

src/vim9compile.c

diff --git a/src/vim9compile.c b/src/vim9compile.c
index ddb486b..2b706ad 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -621,12 +621,12 @@
     if (ret == NULL)
 	ret = find_imported_in_script(name, len, current_sctx.sc_sid);
 
-    if (ret != NULL && load && ret->imp_flags == IMP_FLAGS_AUTOLOAD)
+    if (ret != NULL && load && (ret->imp_flags & IMP_FLAGS_AUTOLOAD))
     {
 	scid_T dummy;
 
 	// script found before but not loaded yet
-	ret->imp_flags = 0;
+	ret->imp_flags &= ~IMP_FLAGS_AUTOLOAD;
 	(void)do_source(SCRIPT_ITEM(ret->imp_sid)->sn_name, FALSE,
 							    DOSO_NONE, &dummy);
     }