diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-08-17 19:36:06 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-08-17 19:36:06 +0200 |
commit | e9bd57286a5cbb0e1ec18b5d194dc4af1bda9f3a (patch) | |
tree | 34510fae2da2db932e6a750cce702e3f1a4c8db2 /src | |
parent | 4dd751b95696957c7baabad2f19f9e02fc596eae (diff) |
patch 8.1.1875: cannot get size and position of the popup menuv8.1.1875
Problem: Cannot get size and position of the popup menu.
Solution: Add pum_getpos(). (Ben Jackson, closes #4827)
Diffstat (limited to 'src')
-rw-r--r-- | src/evalfunc.c | 15 | ||||
-rw-r--r-- | src/testdir/test_popup.vim | 44 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 60 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index f117563406..89430937f2 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -234,6 +234,7 @@ static void f_pow(typval_T *argvars, typval_T *rettv); #endif static void f_prevnonblank(typval_T *argvars, typval_T *rettv); static void f_printf(typval_T *argvars, typval_T *rettv); +static void f_pum_getpos(typval_T *argvars, typval_T *rettv); static void f_pumvisible(typval_T *argvars, typval_T *rettv); #ifdef FEAT_PYTHON3 static void f_py3eval(typval_T *argvars, typval_T *rettv); @@ -741,6 +742,7 @@ static funcentry_T global_functions[] = {"prop_type_get", 1, 2, 0, f_prop_type_get}, {"prop_type_list", 0, 1, 0, f_prop_type_list}, #endif + {"pum_getpos", 0, 0, 0, f_pum_getpos}, {"pumvisible", 0, 0, 0, f_pumvisible}, #ifdef FEAT_PYTHON3 {"py3eval", 1, 1, 0, f_py3eval}, @@ -7961,6 +7963,19 @@ f_printf(typval_T *argvars, typval_T *rettv) } /* + * "pum_getpos()" function + */ + static void +f_pum_getpos(typval_T *argvars UNUSED, typval_T *rettv UNUSED) +{ + if (rettv_dict_alloc(rettv) != OK) + return; +#ifdef FEAT_INS_EXPAND + pum_set_event_info(rettv->vval.v_dict); +#endif +} + +/* * "pumvisible()" function */ static void diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index e7b4c7246d..d9f561bc7f 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -1033,6 +1033,20 @@ func Test_popup_complete_info_02() bwipe! endfunc +func Test_popup_complete_info_no_pum() + new + call assert_false( pumvisible() ) + let no_pum_info = complete_info() + let d = { + \ 'mode': '', + \ 'pum_visible': 0, + \ 'items': [], + \ 'selected': -1, + \ } + call assert_equal( d, complete_info() ) + bwipe! +endfunc + func Test_CompleteChanged() new call setline(1, ['foo', 'bar', 'foobar', '']) @@ -1063,8 +1077,36 @@ func Test_CompleteChanged() autocmd! AAAAA_Group set complete& completeopt& - delfunc! OnPumchange + delfunc! OnPumChange + bw! +endfunc + +function! GetPumPosition() + call assert_true( pumvisible() ) + let g:pum_pos = pum_getpos() + return '' +endfunction + +func Test_pum_getpos() + new + inoremap <buffer><F5> <C-R>=GetPumPosition()<CR> + setlocal completefunc=UserDefinedComplete + + let d = { + \ 'height': 5, + \ 'width': 15, + \ 'row': 1, + \ 'col': 0, + \ 'size': 5, + \ 'scrollbar': v:false, + \ } + call feedkeys("i\<C-X>\<C-U>\<F5>", 'tx') + call assert_equal(d, g:pum_pos) + + call assert_false( pumvisible() ) + call assert_equal( {}, pum_getpos() ) bw! + unlet g:pum_pos endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 875342178c..2c02209f05 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1875, +/**/ 1874, /**/ 1873, |