Mercurial > vim
diff src/insexpand.c @ 19127:0ee48dc3f8bc v8.2.0123
patch 8.2.0123: complete_info() does not work when CompleteDone is triggered
Commit: https://github.com/vim/vim/commit/17e04781f26c24769e202351c194ee252927eee1
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 17 18:58:59 2020 +0100
patch 8.2.0123: complete_info() does not work when CompleteDone is triggered
Problem: complete_info() does not work when CompleteDone is triggered.
Solution: Trigger CompleteDone before clearing the info.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 17 Jan 2020 19:00:04 +0100 |
| parents | c6248ef5b41b |
| children | 94eda51ba9ba |
line wrap: on
line diff
--- a/src/insexpand.c +++ b/src/insexpand.c @@ -1813,6 +1813,7 @@ ins_compl_prep(int c) int want_cindent; #endif int retval = FALSE; + int prev_mode = ctrl_x_mode; // 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. @@ -2060,6 +2061,18 @@ ins_compl_prep(int c) 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(); compl_started = FALSE; compl_matches = 0; @@ -2084,9 +2097,6 @@ ins_compl_prep(int c) if (want_cindent && in_cinkeys(KEY_COMPLETE, ' ', inindent(0))) do_c_expr_indent(); #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)