Skip to content

Commit

Permalink
patch 8.2.4755: cannot use <SID>FuncRef in completion spec
Browse files Browse the repository at this point in the history
Problem:    Cannot use <SID>FuncRef in completion spec.
Solution:   Dereference a function name in another way. (closes #10197)
  • Loading branch information
brammool committed Apr 15, 2022
1 parent 7714231 commit 12eb2eb
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
10 changes: 9 additions & 1 deletion src/eval.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 24 additions & 0 deletions src/testdir/test_vim9_import.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4755,
/**/
4754,
/**/
Expand Down

0 comments on commit 12eb2eb

Please sign in to comment.