Mercurial > vim

changeset 27297:f7cb41ff22a4 v8.2.4177

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4177: Vim9: autoload script not loaded after "vim9script noclear" Commit: https://github.com/vim/vim/commit/b697dc295d0625bf2445649f03019f9b8fccc1a8 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 22 11:27:29 2022 +0000 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.
author Bram Moolenaar <Bram@vim.org>
date Sat, 22 Jan 2022 12:30:04 +0100
parents b37daa64ce58
children 3e5e360d9096
files src/testdir/test_vim9_import.vim src/version.c src/vim9compile.c
diffstat 3 files changed, 46 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -1535,6 +1535,48 @@ def Test_vim9script_autoload_call()
   &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')
 
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4177,
+/**/
     4176,
 /**/
     4175,
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -621,12 +621,12 @@ find_imported(char_u *name, size_t len, 
     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);
     }