mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 01:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1062: some test function names do not match what they are doing (#21429)

Browse Source 
Problem:    Some test function names do not match what they are doing.
Solution:   Leave out user data for the test that is called "NoUserData".
            (closes vim/vim#11703)

4cd45f1408

Nvim's tests already match function names. Add missing indent changes
and a missing comment from patch 8.2.0084.
This commit is contained in:
zeertzjq
2022-12-16 06:08:59 +08:00
committed by GitHub
parent ef95174694
commit a2bf0cef10
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/insexpand.c
View File

@@ -2755,6 +2755,7 @@ static void get_complete_info(list_T *what_list, dict_T *retdict)
tv_dict_add_str(di, S_LEN("kind"), EMPTY_IF_NULL(match->cp_text[CPT_KIND])); tv_dict_add_str(di, S_LEN("kind"), EMPTY_IF_NULL(match->cp_text[CPT_KIND]));
tv_dict_add_str(di, S_LEN("info"), EMPTY_IF_NULL(match->cp_text[CPT_INFO])); tv_dict_add_str(di, S_LEN("info"), EMPTY_IF_NULL(match->cp_text[CPT_INFO]));
if (match->cp_user_data.v_type == VAR_UNKNOWN) { if (match->cp_user_data.v_type == VAR_UNKNOWN) {
// Add an empty string for backwards compatibility
tv_dict_add_str(di, S_LEN("user_data"), ""); tv_dict_add_str(di, S_LEN("user_data"), "");
} else { } else {
tv_dict_add_tv(di, S_LEN("user_data"), &match->cp_user_data); tv_dict_add_tv(di, S_LEN("user_data"), &match->cp_user_data);

42
src/nvim/testdir/test_ins_complete.vim
View File

@@ -191,17 +191,17 @@ func s:CompleteDone_CompleteFuncDict( findstart, base )
endif endif
return { return {
\ 'words': [ \ 'words': [
\ { \ {
\ 'word': 'aword', \ 'word': 'aword',
\ 'abbr': 'wrd', \ 'abbr': 'wrd',
\ 'menu': 'extra text', \ 'menu': 'extra text',
\ 'info': 'words are cool', \ 'info': 'words are cool',
\ 'kind': 'W', \ 'kind': 'W',
\ 'user_data': ['one', 'two'] \ 'user_data': ['one', 'two']
\ } \ }
\ ] \ ]
\ } \ }
endfunc endfunc
func s:CompleteDone_CheckCompletedItemNone() func s:CompleteDone_CheckCompletedItemNone()
@@ -261,16 +261,16 @@ func s:CompleteDone_CompleteFuncDictNoUserData(findstart, base)
endif endif
return { return {
\ 'words': [ \ 'words': [
\ { \ {
\ 'word': 'aword', \ 'word': 'aword',
\ 'abbr': 'wrd', \ 'abbr': 'wrd',
\ 'menu': 'extra text', \ 'menu': 'extra text',
\ 'info': 'words are cool', \ 'info': 'words are cool',
\ 'kind': 'W' \ 'kind': 'W',
\ } \ }
\ ] \ ]
\ } \ }
endfunc endfunc
func s:CompleteDone_CheckCompletedItemDictNoUserData() func s:CompleteDone_CheckCompletedItemDictNoUserData()