mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 04:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11115 from bfredl/wildmenumode

Browse Source 
cmdline: wildmenumode() should be true with wildoptions+=pum
This commit is contained in:
Björn Linse
2019-09-29 15:55:18 +02:00
committed by GitHub
parent 0a2a1e241f 0636b25f28
commit ce637d0ef1
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/eval.c
View File

@@ -18845,9 +18845,10 @@ static void f_visualmode(typval_T *argvars, typval_T *rettv, FunPtr fptr)
*/ */
static void f_wildmenumode(typval_T *argvars, typval_T *rettv, FunPtr fptr) static void f_wildmenumode(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{ {
if (wild_menu_showing) if (wild_menu_showing || ((State & CMDLINE) && pum_visible())) {
rettv->vval.v_number = 1; rettv->vval.v_number = 1;
} }
}
/// "win_findbuf()" function /// "win_findbuf()" function
static void f_win_findbuf(typval_T *argvars, typval_T *rettv, FunPtr fptr) static void f_win_findbuf(typval_T *argvars, typval_T *rettv, FunPtr fptr)

3
test/functional/ui/popupmenu_spec.lua
View File

@@ -516,6 +516,7 @@ describe('ui/ext_popupmenu', function()
{1:~ }| {1:~ }|
:sign ^ | :sign ^ |
]]) ]])
eq(0, funcs.wildmenumode())
feed('<tab>') feed('<tab>')
screen:expect{grid=[[ screen:expect{grid=[[
@@ -530,6 +531,7 @@ describe('ui/ext_popupmenu', function()
{1:~ }| {1:~ }|
:sign define^ | :sign define^ |
]], popupmenu={items=wild_expected, pos=0, anchor={1, 9, 6}}} ]], popupmenu={items=wild_expected, pos=0, anchor={1, 9, 6}}}
eq(1, funcs.wildmenumode())
feed('<left>') feed('<left>')
screen:expect{grid=[[ screen:expect{grid=[[
@@ -589,6 +591,7 @@ describe('ui/ext_popupmenu', function()
:sign unplace^ | :sign unplace^ |
]], popupmenu={items=wild_expected, pos=5, anchor={1, 9, 6}}} ]], popupmenu={items=wild_expected, pos=5, anchor={1, 9, 6}}}
feed('<esc>') feed('<esc>')
eq(0, funcs.wildmenumode())
-- check positioning with multibyte char in pattern -- check positioning with multibyte char in pattern
command("e långfile1") command("e långfile1")