forked from aniani/vim
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.
This commit is contained in:
@@ -1535,6 +1535,48 @@ def Test_vim9script_autoload_call()
|
|||||||
&rtp = save_rtp
|
&rtp = save_rtp
|
||||||
enddef
|
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()
|
def Test_vim9script_autoload_duplicate()
|
||||||
mkdir('Xdir/autoload', 'p')
|
mkdir('Xdir/autoload', 'p')
|
||||||
|
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
4177,
|
||||||
/**/
|
/**/
|
||||||
4176,
|
4176,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -621,12 +621,12 @@ find_imported(char_u *name, size_t len, int load, cctx_T *cctx)
|
|||||||
if (ret == NULL)
|
if (ret == NULL)
|
||||||
ret = find_imported_in_script(name, len, current_sctx.sc_sid);
|
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;
|
scid_T dummy;
|
||||||
|
|
||||||
// script found before but not loaded yet
|
// 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,
|
(void)do_source(SCRIPT_ITEM(ret->imp_sid)->sn_name, FALSE,
|
||||||
DOSO_NONE, &dummy);
|
DOSO_NONE, &dummy);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user