Mercurial > vim
changeset 24049:fc4c2beea99a v8.2.2566
patch 8.2.2566: Vim9: Function name is not recognized
Commit: https://github.com/vim/vim/commit/2e2d758902dc08a0e383fe6b198e11dd14f1bdf8
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Mar 3 21:22:41 2021 +0100
patch 8.2.2566: Vim9: Function name is not recognized
Problem: Vim9: Function name is not recognized.
Solution: Change lookup_scriptvar() to also find function names.
(closes #7770)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 03 Mar 2021 21:30:03 +0100 |
parents | 66a3e54d87c8 |
children | df5c5e5bda0c |
files | src/evalvars.c src/ex_docmd.c src/proto/evalvars.pro src/testdir/test_vim9_cmd.vim src/version.c src/vim9script.c |
diffstat | 6 files changed, 43 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -2788,11 +2788,11 @@ get_script_local_ht(void) } /* - * Look for "name[len]" in script-local variables. + * Look for "name[len]" in script-local variables and functions. * Return OK when found, FAIL when not found. */ int -lookup_scriptvar( +lookup_scriptitem( char_u *name, size_t len, cctx_T *dummy UNUSED) @@ -2802,6 +2802,8 @@ lookup_scriptvar( char_u *p; int res; hashitem_T *hi; + int is_global = FALSE; + char_u *fname = name; if (ht == NULL) return FAIL; @@ -2824,9 +2826,24 @@ lookup_scriptvar( // if not script-local, then perhaps imported if (res == FAIL && find_imported(p, 0, NULL) != NULL) res = OK; - if (p != buffer) vim_free(p); + + if (res != OK) + { + // Find a function, so that a following "->" works. Skip "g:" before a + // function name. + // Do not check for an internal function, since it might also be a + // valid command, such as ":split" versuse "split()". + if (name[0] == 'g' && name[1] == ':') + { + is_global = TRUE; + fname = name + 2; + } + if (find_func(fname, is_global, NULL) != NULL) + res = OK; + } + return res; }
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -1829,7 +1829,7 @@ do_one_cmd( if (ea.cmd == cmd + 1 && *cmd == '$') // should be "$VAR = val" --ea.cmd; - p = find_ex_command(&ea, NULL, lookup_scriptvar, NULL); + p = find_ex_command(&ea, NULL, lookup_scriptitem, NULL); if (ea.cmdidx == CMD_SIZE) { char_u *ar = skip_range(ea.cmd, TRUE, NULL);
--- a/src/proto/evalvars.pro +++ b/src/proto/evalvars.pro @@ -61,7 +61,7 @@ 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_in_ht(hashtab_T *ht, int htname, char_u *varname, int no_autoload); hashtab_T *get_script_local_ht(void); -int lookup_scriptvar(char_u *name, size_t len, cctx_T *dummy); +int lookup_scriptitem(char_u *name, size_t len, cctx_T *dummy); hashtab_T *find_var_ht(char_u *name, char_u **varname); char_u *get_var_value(char_u *name); void new_script_vars(scid_T id);
--- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -371,6 +371,24 @@ def Test_method_call_linebreak() MethodAfterLinebreak('foobar') assert_equal('foobar', getline(1)) bwipe! + + lines =<< trim END + vim9script + def Foo(): string + return '# some text' + enddef + + def Bar(F: func): string + return F() + enddef + + Foo + ->Bar() + ->setline(1) + END + CheckScriptSuccess(lines) + assert_equal('# some text', getline(1)) + bwipe! enddef def Test_method_call_whitespace()