diff options
| -rw-r--r-- | src/eval.c | 10 | ||||
| -rw-r--r-- | src/testdir/test_vim9_import.vim | 24 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 90ed14b60..cad688775 100644 --- 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) diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim index dd9f5668d..ebd875ed9 100644 --- a/src/testdir/test_vim9_import.vim +++ b/src/testdir/test_vim9_import.vim @@ -749,6 +749,30 @@ def Test_use_import_in_command_completion() 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 diff --git a/src/version.c b/src/version.c index e833b78be..017557eb0 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4755, +/**/ 4754, /**/ 4753, |