aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

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

Browse Source 
Problem:    Vim9: autoload script not loaded after "vim9script noclear".
Solution:   Check IMP_FLAGS_AUTOLOAD properly.
This commit is contained in:
Bram Moolenaar
2022-01-22 11:27:29 +00:00
parent 3d8e25a6d2
commit b697dc295d
3 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/testdir/test_vim9_import.vim
View File

@@ -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')

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4177,
/**/
4176,
/**/

4
src/vim9compile.c
View File

@@ -621,12 +621,12 @@ find_imported(char_u *name, size_t len, int load, cctx_T *cctx)
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);
}