Mercurial > vim
changeset 27002:cf5b5e95f62b v8.2.4030
patch 8.2.4030: a script local funcref is not found from a mapping
Commit: https://github.com/vim/vim/commit/71f21938bc9f4f6c0e52c178f51cb19be9804690
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 7 18:20:55 2022 +0000
patch 8.2.4030: a script local funcref is not found from a mapping
Problem: A script local funcref is not found from a mapping.
Solution: When looking for a function, also find a script-local funcref.
(closes #9485)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 07 Jan 2022 19:30:03 +0100 |
| parents | d3404d1f5478 |
| children | ee78c4d9035d |
| files | src/evalvars.c src/proto/evalvars.pro src/testdir/test_vim9_script.vim src/userfunc.c src/version.c |
| diffstat | 5 files changed, 59 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -2690,7 +2690,7 @@ eval_variable( { if ((flags & EVAL_VAR_IMPORT) == 0) { - if (sid != 0 && SCRIPT_ID_VALID(sid)) + if (SCRIPT_ID_VALID(sid)) { ht = &SCRIPT_VARS(sid); if (ht != NULL) @@ -2878,6 +2878,35 @@ find_var(char_u *name, hashtab_T **htp, } /* + * Like find_var() but if the name starts with <SNR>99_ then look in the + * referenced script (used for a funcref). + */ + dictitem_T * +find_var_also_in_script(char_u *name, hashtab_T **htp, int no_autoload) +{ + if (STRNCMP(name, "<SNR>", 5) == 0 && isdigit(name[5])) + { + char_u *p = name + 5; + int sid = getdigits(&p); + + if (SCRIPT_ID_VALID(sid) && *p == '_') + { + hashtab_T *ht = &SCRIPT_VARS(sid); + + if (ht != NULL) + { + dictitem_T *di = find_var_in_ht(ht, 0, p + 1, no_autoload); + + if (di != NULL) + return di; + } + } + } + + return find_var(name, htp, no_autoload); +} + +/* * Find variable "varname" in hashtab "ht" with name "htname". * When "varname" is empty returns curwin/curtab/etc vars dictionary. * Returns NULL if not found.
--- a/src/proto/evalvars.pro +++ b/src/proto/evalvars.pro @@ -60,6 +60,7 @@ char_u *set_cmdarg(exarg_T *eap, char_u int eval_variable(char_u *name, int len, scid_T sid, typval_T *rettv, dictitem_T **dip, int flags); void check_vars(char_u *name, int len); dictitem_T *find_var(char_u *name, hashtab_T **htp, int no_autoload); +dictitem_T *find_var_also_in_script(char_u *name, hashtab_T **htp, int no_autoload); dictitem_T *find_var_in_ht(hashtab_T *ht, int htname, char_u *varname, int no_autoload); hashtab_T *get_script_local_ht(void); int lookup_scriptitem(char_u *name, size_t len, int cmd, cctx_T *dummy);
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1662,32 +1662,31 @@ def Test_import_in_filetype() &rtp = save_rtp enddef -" FIXME -"def Test_use_import_in_mapping() -" var lines =<< trim END -" vim9script -" export def Funcx() -" g:result = 42 -" enddef -" END -" writefile(lines, 'XsomeExport.vim') -" lines =<< trim END -" vim9script -" import './XsomeExport.vim' as some -" var Funcy = some.Funcx -" nnoremap <F3> :call <sid>Funcy()<cr> -" END -" writefile(lines, 'Xmapscript.vim') -" -" source Xmapscript.vim -" feedkeys("\<F3>", "xt") -" assert_equal(42, g:result) -" -" unlet g:result -" delete('XsomeExport.vim') -" delete('Xmapscript.vim') -" nunmap <F3> -"enddef +def Test_use_import_in_mapping() + var lines =<< trim END + vim9script + export def Funcx() + g:result = 42 + enddef + END + writefile(lines, 'XsomeExport.vim') + lines =<< trim END + vim9script + import './XsomeExport.vim' as some + var Funcy = some.Funcx + nnoremap <F3> :call <sid>Funcy()<cr> + END + writefile(lines, 'Xmapscript.vim') + + source Xmapscript.vim + feedkeys("\<F3>", "xt") + assert_equal(42, g:result) + + unlet g:result + delete('XsomeExport.vim') + delete('Xmapscript.vim') + nunmap <F3> +enddef def Test_vim9script_mix() var lines =<< trim END