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.4585: cannot use keypad page-up/down for completion menu

Browse Source 
Problem:    Cannot use keypad page-up/down for completion menu.
Solution:   Recognize the keypad keys. (Yegappan Lakshmanan, closes vim/vim#9963)

155b088208

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
zeertzjq 2023-01-15 07:23:51 +08:00
parent 066a1a069b
commit 940643aa33
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/ex_getln.c
View File

@ -2010,8 +2010,8 @@ static int command_line_handle_key(CommandLineState *s)
case Ctrl_N: // next match
case Ctrl_P: // previous match
if (s->xpc.xp_numfiles > 0) {
if (nextwild(&s->xpc, (s->c == Ctrl_P) ? WILD_PREV : WILD_NEXT,
0, s->firstc != '@') == FAIL) {
const int wild_type = (s->c == Ctrl_P) ? WILD_PREV : WILD_NEXT;
if (nextwild(&s->xpc, wild_type, 0, s->firstc != '@') == FAIL) {
break;
}
return command_line_not_changed(s);
@ -2031,9 +2031,9 @@ static int command_line_handle_key(CommandLineState *s)
|| s->c == K_KPAGEUP || s->c == K_KPAGEDOWN)) {
// If the popup menu is displayed, then PageUp and PageDown
// are used to scroll the menu.
if (nextwild(&s->xpc,
(s->c == K_PAGEUP) ? WILD_PAGEUP : WILD_PAGEDOWN,
0, s->firstc != '@') == FAIL) {
const int wild_type =
(s->c == K_PAGEDOWN || s->c == K_KPAGEDOWN) ? WILD_PAGEDOWN : WILD_PAGEUP;
if (nextwild(&s->xpc, wild_type, 0, s->firstc != '@') == FAIL) {
break;
}
return command_line_not_changed(s);

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

@ -2206,7 +2206,8 @@ func Test_wildmenu_dirstack()
endfunc
" Test for recalling newer or older cmdline from history with <Up>, <Down>,
" <S-Up>, <S-Down>, <PageUp>, <PageDown>, <C-p>, or <C-n>.
" <S-Up>, <S-Down>, <PageUp>, <PageDown>, <kPageUp>, <kPageDown>, <C-p>, or
" <C-n>.
func Test_recalling_cmdline()
CheckFeature cmdline_hist
@ -2214,17 +2215,18 @@ func Test_recalling_cmdline()
cnoremap <Plug>(save-cmdline) <Cmd>let g:cmdlines += [getcmdline()]<CR>
let histories = [
\ {'name': 'cmd', 'enter': ':', 'exit': "\<Esc>"},
\ {'name': 'search', 'enter': '/', 'exit': "\<Esc>"},
\ {'name': 'expr', 'enter': ":\<C-r>=", 'exit': "\<Esc>\<Esc>"},
\ {'name': 'input', 'enter': ":call input('')\<CR>", 'exit': "\<CR>"},
\ #{name: 'cmd', enter: ':', exit: "\<Esc>"},
\ #{name: 'search', enter: '/', exit: "\<Esc>"},
\ #{name: 'expr', enter: ":\<C-r>=", exit: "\<Esc>\<Esc>"},
\ #{name: 'input', enter: ":call input('')\<CR>", exit: "\<CR>"},
"\ TODO: {'name': 'debug', ...}
\]
let keypairs = [
\ {'older': "\<Up>", 'newer': "\<Down>", 'prefixmatch': v:true},
\ {'older': "\<S-Up>", 'newer': "\<S-Down>", 'prefixmatch': v:false},
\ {'older': "\<PageUp>", 'newer': "\<PageDown>", 'prefixmatch': v:false},
\ {'older': "\<C-p>", 'newer': "\<C-n>", 'prefixmatch': v:false},
\ #{older: "\<Up>", newer: "\<Down>", prefixmatch: v:true},
\ #{older: "\<S-Up>", newer: "\<S-Down>", prefixmatch: v:false},
\ #{older: "\<PageUp>", newer: "\<PageDown>", prefixmatch: v:false},
\ #{older: "\<kPageUp>", newer: "\<kPageDown>", prefixmatch: v:false},
\ #{older: "\<C-p>", newer: "\<C-n>", prefixmatch: v:false},
\]
let prefix = 'vi'
for h in histories