IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3638: getcompletion() always passes zero as position (#16387)

Browse Source 
Problem:    getcompletion() always passes zero as position to custom
            completion function.
Solution:   Pass the pattern length. (closes vim/vim#9173)
4785fe02bb

Co-authored-by: ii14 <ii14@users.noreply.github.com>
This commit is contained in:
ii14 2021-11-21 19:00:51 +01:00 committed by GitHub
parent 134a6385e2
commit 9d868317f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/eval/funcs.c
View File

@ -3386,15 +3386,17 @@ static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr)
emsg(_(e_invarg)); emsg(_(e_invarg));
return; return;
} }
const char *pattern = tv_get_string(&argvars[0]);
if (strcmp(type, "cmdline") == 0) { if (strcmp(type, "cmdline") == 0) {
set_one_cmd_context(&xpc, tv_get_string(&argvars[0])); set_one_cmd_context(&xpc, pattern);
xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
xpc.xp_col = STRLEN(pattern);
goto theend; goto theend;
} }
ExpandInit(&xpc); ExpandInit(&xpc);
xpc.xp_pattern = (char_u *)tv_get_string(&argvars[0]); xpc.xp_pattern = (char_u *)pattern;
xpc.xp_pattern_len = STRLEN(xpc.xp_pattern); xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
xpc.xp_context = cmdcomplete_str_to_type(type); xpc.xp_context = cmdcomplete_str_to_type(type);
if (xpc.xp_context == EXPAND_NOTHING) { if (xpc.xp_context == EXPAND_NOTHING) {

3
src/nvim/testdir/test_cmdline.vim
View File

@ -428,14 +428,17 @@ func Test_getcompletion()
call assert_equal([], l) call assert_equal([], l)
func T(a, c, p) func T(a, c, p)
let g:cmdline_compl_params = [a:a, a:c, a:p]
return "oneA\noneB\noneC" return "oneA\noneB\noneC"
endfunc endfunc
command -nargs=1 -complete=custom,T MyCmd command -nargs=1 -complete=custom,T MyCmd
let l = getcompletion('MyCmd ', 'cmdline') let l = getcompletion('MyCmd ', 'cmdline')
call assert_equal(['oneA', 'oneB', 'oneC'], l) call assert_equal(['oneA', 'oneB', 'oneC'], l)
call assert_equal(['', 'MyCmd ', 6], g:cmdline_compl_params)
delcommand MyCmd delcommand MyCmd
delfunc T delfunc T
unlet g:cmdline_compl_params
" For others test if the name is recognized. " For others test if the name is recognized.
let names = ['buffer', 'environment', 'file_in_path', 'mapping', 'tag', 'tag_listfiles', 'user'] let names = ['buffer', 'environment', 'file_in_path', 'mapping', 'tag', 'tag_listfiles', 'user']