diff options
| -rw-r--r-- | runtime/doc/autocmd.txt | 34 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 12 | ||||
| -rw-r--r-- | src/nvim/auevents.lua | 2 | ||||
| -rw-r--r-- | src/nvim/edit.c | 4 | ||||
| -rw-r--r-- | test/functional/viml/completion_spec.lua | 4 |
5 files changed, 28 insertions, 28 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index a4c0107cc9..b6db7b263d 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -354,7 +354,7 @@ Name triggered by ~ |SessionLoadPost| after loading a session file |MenuPopup| just before showing the popup menu -|MenuPopupChanged| after popup menu changed, not fired on popup menu hide +|CompleteChanged| after popup menu changed, not fired on popup menu hide |CompleteDone| after Insert mode completion is done |User| to be used in combination with ":doautocmd" @@ -589,6 +589,22 @@ CompleteDone After Insert mode completion is done. Either The |v:completed_item| variable contains the completed item. +CompleteChanged *CompleteChanged* + After each time popup menu changed, not fired + on popup menu hide, use |CompleteDone| for popup + menu hide. + + Sets these |v:event| keys: + completed_item + height + width + row + col + size + scrollbar + + It is not allowed to change the text |textlock|. + *CursorHold* CursorHold When the user doesn't press a key for the time specified with 'updatetime'. Not re-triggered @@ -853,22 +869,6 @@ MenuPopup Just before showing the popup menu (under the o Operator-pending i Insert c Command line -MenuPopupChanged *MenuPopupChanged* - After each time popup menu changed, not fired - on popup menu hide, use |CompleteDone| for popup - menu hide. - - Sets these |v:event| keys: - completed_item - height - width - row - col - size - scrollbar - - It is not allowed to change the text |textlock|. - *OptionSet* OptionSet After setting an option (except during |startup|). The |autocmd-pattern| is matched diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index a8a2263f75..1f83d0de54 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1554,16 +1554,16 @@ v:event Dictionary of event data for the current |autocommand|. Valid regtype Type of register as returned by |getregtype()|. completed_item Current selected complete item on - |MenuPopupChanged|, Is `{}` when no complete + |CompleteChanged|, Is `{}` when no complete item selected. - height Height of popup menu on |MenuPopupChanged| - width width of popup menu on |MenuPopupChanged| - row Row count of popup menu on |MenuPopupChanged|, + height Height of popup menu on |CompleteChanged| + width width of popup menu on |CompleteChanged| + row Row count of popup menu on |CompleteChanged|, relative to screen. - col Col count of popup menu on |MenuPopupChanged|, + col Col count of popup menu on |CompleteChanged|, relative to screen. size Total number of completion items on - |MenuPopupChanged|. + |CompleteChanged|. scrollbar Is |v:true| if popup menu have scrollbar, or |v:false| if not. diff --git a/src/nvim/auevents.lua b/src/nvim/auevents.lua index 345bf67c0e..32a7920b6e 100644 --- a/src/nvim/auevents.lua +++ b/src/nvim/auevents.lua @@ -29,6 +29,7 @@ return { 'CmdWinLeave', -- before leaving the cmdline window 'ColorScheme', -- after loading a colorscheme 'ColorSchemePre', -- before loading a colorscheme + 'CompleteChanged', -- after popup menu changed 'CompleteDone', -- after finishing insert complete 'CursorHold', -- cursor in same position for a while 'CursorHoldI', -- idem, in Insert mode @@ -66,7 +67,6 @@ return { 'InsertLeave', -- when leaving Insert mode 'JobActivity', -- when job sent some data 'MenuPopup', -- just before popup menu is displayed - 'MenuPopupChanged', -- after popup menu changed 'OptionSet', -- after setting any option 'QuickFixCmdPost', -- after :make, :grep etc. 'QuickFixCmdPre', -- before :make, :grep etc. diff --git a/src/nvim/edit.c b/src/nvim/edit.c index acb03a606d..7b31fa0c76 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -2681,7 +2681,7 @@ void ins_compl_show_pum(void) pum_display(compl_match_array, compl_match_arraysize, cur, array_changed, 0); curwin->w_cursor.col = col; - if (!has_event(EVENT_MENUPOPUPCHANGED)) { + if (!has_event(EVENT_COMPLETECHANGED)) { return; } dict_T *dict = get_vim_var_dict(VV_EVENT); @@ -2694,7 +2694,7 @@ void ins_compl_show_pum(void) pum_set_boundings(dict); tv_dict_set_keys_readonly(dict); textlock++; - apply_autocmds(EVENT_MENUPOPUPCHANGED, NULL, NULL, false, curbuf); + apply_autocmds(EVENT_COMPLETECHANGED, NULL, NULL, false, curbuf); textlock--; tv_dict_clear(dict); } diff --git a/test/functional/viml/completion_spec.lua b/test/functional/viml/completion_spec.lua index c84b2c1087..a8d6135e3f 100644 --- a/test/functional/viml/completion_spec.lua +++ b/test/functional/viml/completion_spec.lua @@ -1073,7 +1073,7 @@ describe('completion', function() ]]) end) - it('MenuPopupChanged autocommand', function() + it('CompleteChanged autocommand', function() curbufmeths.set_lines(0, 1, false, { 'foo', 'bar', 'foobar', ''}) source([[ set complete=. completeopt=noinsert,noselect,menuone @@ -1082,7 +1082,7 @@ describe('completion', function() let g:item = get(v:event, 'completed_item', {}) let g:word = get(g:item, 'word', v:null) endfunction - autocmd! MenuPopupChanged * :call OnPumChange() + autocmd! CompleteChanged * :call OnPumChange() call cursor(4, 1) ]]) |