Mercurial > vim
changeset 28461:938c174b8088 v8.2.4755
patch 8.2.4755: cannot use <SID>FuncRef in completion spec
Commit: https://github.com/vim/vim/commit/12eb2eb4d78828513d91e04b0e69550ed37a5932
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Apr 15 22:57:09 2022 +0100
patch 8.2.4755: cannot use <SID>FuncRef in completion spec
Problem: Cannot use <SID>FuncRef in completion spec.
Solution: Dereference a function name in another way. (closes https://github.com/vim/vim/issues/10197)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 16 Apr 2022 00:00:03 +0200 |
| parents | 5bd8735b98a4 |
| children | 5a16a3283624 |
| files | src/eval.c src/testdir/test_vim9_import.vim src/version.c |
| diffstat | 3 files changed, 35 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -639,7 +639,15 @@ deref_function_name( ref.v_type = VAR_UNKNOWN; if (eval7(arg, &ref, evalarg, FALSE) == FAIL) - return NULL; + { + dictitem_T *v; + + // If <SID>VarName was used it would not be found, try another way. + v = find_var_also_in_script(name, NULL, FALSE); + if (v == NULL) + return NULL; + copy_tv(&v->di_tv, &ref); + } if (*skipwhite(*arg) != NUL) { if (verbose)
--- a/src/testdir/test_vim9_import.vim +++ b/src/testdir/test_vim9_import.vim @@ -749,6 +749,30 @@ def Test_use_import_in_command_completio delete('Xscript.vim') enddef +def Test_use_import_with_funcref_in_command_completion() + var lines =<< trim END + vim9script + export def Complete(..._): list<string> + return ['abcd'] + enddef + END + writefile(lines, 'Xscript.vim') + + lines =<< trim END + vim9script + import './Xscript.vim' + + var Ref = Xscript.Complete + exe "command -nargs=1 -complete=customlist," .. expand('<SID>') .. "Ref Cmd echo 'ok'" + feedkeys(":Cmd ab\<Tab>\<C-B>#\<CR>", 'xnt') + assert_equal('#Cmd abcd', @:) + END + v9.CheckScriptSuccess(lines) + + delcommand Cmd + delete('Xscript.vim') +enddef + def Test_use_autoload_import_in_insert_completion() mkdir('Xdir/autoload', 'p') var save_rtp = &rtp