Mercurial > vim
changeset 24874:14b0b35d8488 v8.2.2975
patch 8.2.2975: Vim9: can only use an autoload function name as a string
Commit: https://github.com/vim/vim/commit/f0a4069e3df904ac6bd57718ec06e56c5d7363e4
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jun 11 22:05:47 2021 +0200
patch 8.2.2975: Vim9: can only use an autoload function name as a string
Problem: Vim9: can only use an autoload function name as a string.
Solution: Load the autoload script when encountered. (closes https://github.com/vim/vim/issues/8124)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 11 Jun 2021 22:15:03 +0200 |
| parents | e66659584572 |
| children | 14fda88ab35a |
| files | src/evalvars.c src/scriptfile.c src/testdir/test_vim9_func.vim src/version.c src/vim9compile.c |
| diffstat | 5 files changed, 43 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -2921,8 +2921,9 @@ find_var_ht(char_u *name, char_u **varna if (ht != NULL) return ht; // local variable - // in Vim9 script items at the script level are script-local - if (in_vim9script()) + // In Vim9 script items at the script level are script-local, except + // for autoload names. + if (in_vim9script() && vim_strchr(name, AUTOLOAD_CHAR) == NULL) { ht = get_script_local_ht(); if (ht != NULL)
--- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -1128,6 +1128,7 @@ do_source( proftime_T wait_start; #endif int trigger_source_post = FALSE; + int save_estack_compiling = estack_compiling; ESTACK_CHECK_DECLARATION p = expand_env_save(fname); @@ -1142,6 +1143,7 @@ do_source( smsg(_("Cannot source a directory: \"%s\""), fname); goto theend; } + estack_compiling = FALSE; #ifdef FEAT_EVAL // See if we loaded this script before. @@ -1508,6 +1510,7 @@ almosttheend: theend: vim_free(fname_exp); + estack_compiling = save_estack_compiling; return retval; }
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -114,6 +114,34 @@ def Test_autoload_name_mismatch() delete(dir, 'rf') enddef +def Test_autoload_names() + var dir = 'Xdir/autoload' + mkdir(dir, 'p') + + var lines =<< trim END + func foobar#function() + return 'yes' + endfunc + let foobar#var = 'no' + END + writefile(lines, dir .. '/foobar.vim') + + var save_rtp = &rtp + exe 'set rtp=' .. getcwd() .. '/Xdir' + + lines =<< trim END + assert_equal('yes', foobar#function()) + var Function = foobar#function + assert_equal('yes', Function()) + + assert_equal('no', foobar#var) + END + CheckDefAndScriptSuccess(lines) + + &rtp = save_rtp + delete(dir, 'rf') +enddef + def CallRecursive(n: number): number return CallRecursive(n + 1) enddef
--- 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 */ /**/ + 2975, +/**/ 2974, /**/ 2973,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3084,7 +3084,13 @@ compile_load( if (name == NULL) return FAIL; - if (arg_exists(*arg, len, &idx, &type, &gen_load_outer, cctx) == OK) + if (vim_strchr(name, AUTOLOAD_CHAR) != NULL) + { + script_autoload(name, FALSE); + res = generate_LOAD(cctx, ISN_LOADAUTO, 0, name, &t_any); + } + else if (arg_exists(*arg, len, &idx, &type, &gen_load_outer, cctx) + == OK) { if (gen_load_outer == 0) gen_load = TRUE;