aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

patch 8.2.0123: complete_info() does not work when CompleteDone is triggered

Browse Source 
Problem:    complete_info() does not work when CompleteDone is triggered.
Solution:   Trigger CompleteDone before clearing the info.
This commit is contained in:
Bram Moolenaar
2020-01-17 18:58:59 +01:00
parent f2a44e5c48
commit 17e04781f2
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/autocmd.txt
View File

@@ -1,4 +1,4 @@
*autocmd.txt* For Vim version 8.2. Last change: 2019 Dec 17 *autocmd.txt* For Vim version 8.2. Last change: 2020 Jan 17
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -610,6 +610,8 @@ CompleteChanged *CompleteChanged*
CompleteDone After Insert mode completion is done. Either CompleteDone After Insert mode completion is done. Either
when something was completed or abandoning when something was completed or abandoning
completion. |ins-completion| completion. |ins-completion|
|complete_info()| can be used, the info is
cleared after triggering CompleteDone.
The |v:completed_item| variable contains The |v:completed_item| variable contains
information about the completed item. information about the completed item.

16
src/insexpand.c
View File

@@ -1813,6 +1813,7 @@ ins_compl_prep(int c)
int want_cindent; int want_cindent;
#endif #endif
int retval = FALSE; int retval = FALSE;
int prev_mode = ctrl_x_mode;
// Forget any previous 'special' messages if this is actually // Forget any previous 'special' messages if this is actually
// a ^X mode key - bar ^R, in which case we wait to see what it gives us. // a ^X mode key - bar ^R, in which case we wait to see what it gives us.
@@ -2060,6 +2061,18 @@ ins_compl_prep(int c)
auto_format(FALSE, TRUE); auto_format(FALSE, TRUE);
{
int new_mode = ctrl_x_mode;
// Trigger the CompleteDone event to give scripts a chance to
// act upon the completion. Do this before clearing the info,
// and restore ctrl_x_mode, so that complete_info() can be
// used.
ctrl_x_mode = prev_mode;
ins_apply_autocmds(EVENT_COMPLETEDONE);
ctrl_x_mode = new_mode;
}
ins_compl_free(); ins_compl_free();
compl_started = FALSE; compl_started = FALSE;
compl_matches = 0; compl_matches = 0;
@@ -2084,9 +2097,6 @@ ins_compl_prep(int c)
if (want_cindent && in_cinkeys(KEY_COMPLETE, ' ', inindent(0))) if (want_cindent && in_cinkeys(KEY_COMPLETE, ' ', inindent(0)))
do_c_expr_indent(); do_c_expr_indent();
#endif #endif
// Trigger the CompleteDone event to give scripts a chance to act
// upon the completion.
ins_apply_autocmds(EVENT_COMPLETEDONE);
} }
} }
else if (ctrl_x_mode == CTRL_X_LOCAL_MSG) else if (ctrl_x_mode == CTRL_X_LOCAL_MSG)

2
src/testdir/test_ins_complete.vim
View File

@@ -183,6 +183,8 @@ func s:CompleteDone_CheckCompletedItemDict()
call assert_equal( 'W', v:completed_item[ 'kind' ] ) call assert_equal( 'W', v:completed_item[ 'kind' ] )
call assert_equal( 'test', v:completed_item[ 'user_data' ] ) call assert_equal( 'test', v:completed_item[ 'user_data' ] )
call assert_equal('function', complete_info().mode)
let s:called_completedone = 1 let s:called_completedone = 1
endfunc endfunc

2
src/version.c
View File

@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
123,
/**/ /**/
122, 122,
/**/ /**/