mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-16 06:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3459: Vim9: need more tests for empty string arguments

Browse Source 
Problem:    Vim9: need more tests for empty string arguments.
Solution:   Add more tests.  Also use empty argument with menu_info() to get
            the top-level menu names. (Yegappan Lakshmanan, closes vim/vim#8925)
51491adfa8
This commit is contained in:
zeertzjq
2022-08-04 14:48:34 +08:00
parent 93649cefab
commit 5170a4a369
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/menu.c
View File

@@ -1892,9 +1892,22 @@ static char *menu_translate_tab_and_shift(char *arg_start)
}
/// Get the information about a menu item in mode 'which'
static void menuitem_getinfo(const vimmenu_T *menu, int modes, dict_T *dict)
static void menuitem_getinfo(const char *menu_name, const vimmenu_T *menu, int modes, dict_T *dict)
FUNC_ATTR_NONNULL_ALL
{
if (*menu_name == NUL) {
// Return all the top-level menus
list_T *const l = tv_list_alloc(kListLenMayKnow);
tv_dict_add_list(dict, S_LEN("submenus"), l);
// get all the children. Skip PopUp[nvoci].
for (const vimmenu_T *topmenu = menu; topmenu != NULL; topmenu = topmenu->next) {
if (!menu_is_hidden(topmenu->dname)) {
tv_list_append_string(l, topmenu->dname, -1);
}
}
return;
}
tv_dict_add_str(dict, S_LEN("name"), menu->name);
tv_dict_add_str(dict, S_LEN("display"), menu->dname);
if (menu->actext != NULL) {
@@ -1990,6 +2003,6 @@ void f_menu_info(typval_T *argvars, typval_T *rettv, FunPtr fptr)
}
if (menu->modes & modes) {
menuitem_getinfo(menu, modes, retdict);
menuitem_getinfo(menu_name, menu, modes, retdict);
}
}

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

@@ -362,6 +362,9 @@ func Test_menu_info()
\ shortcut: '', modes: ' ', submenus: ['menu']},
\ menu_info(']Test'))
unmenu ]Test
" Test for getting all the top-level menu names
call assert_notequal(menu_info('').submenus, [])
endfunc
" Test for <special> keyword in a menu with 'cpo' containing '<'