patch 9.1.1305: completion menu active after switching windows/tabs
Problem: When switching to another window or tab page while the
completion menu is active, the menu stays visible, although it
belongs to the previous window/tab page context (Evgeni
Chasnovski).
Solution: Track the window and tab page where completion started. Detect
changes in the main editing loop and cancel completion mode if
the current window or tab page differs from where completion
started.
fixes: #17090
closes: #17101
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/insexpand.c b/src/insexpand.c
index c0762da..8c15ade 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -192,6 +192,9 @@
static int compl_cont_mode = 0;
static expand_T compl_xp;
+static win_T *compl_curr_win = NULL; // win where completion is active
+static buf_T *compl_curr_buf = NULL; // buf where completion is active
+
// List of flags for method of completion.
static int compl_cont_status = 0;
# define CONT_ADDING 1 // "normal" or "adding" expansion
@@ -2014,6 +2017,8 @@
compl_matches = 0;
compl_selected_item = -1;
compl_ins_end_col = 0;
+ compl_curr_win = NULL;
+ compl_curr_buf = NULL;
VIM_CLEAR_STRING(compl_pattern);
VIM_CLEAR_STRING(compl_leader);
edit_submode_extra = NULL;
@@ -2039,17 +2044,10 @@
* Return True when wp is the actual completion window
*/
int
-ins_compl_win_active(win_T *wp UNUSED)
+ins_compl_win_active(win_T *wp)
{
- return ins_compl_active()
-#if defined(FEAT_QUICKFIX)
- && (!wp->w_p_pvw
-# ifdef FEAT_PROP_POPUP
- && !(wp->w_popup_flags & POPF_INFO)
-# endif
- )
-#endif
- ;
+ return ins_compl_active() && wp == compl_curr_win
+ && wp->w_buffer == compl_curr_buf;
}
/*
@@ -2707,6 +2705,15 @@
}
/*
+ * Cancel completion.
+ */
+ int
+ins_compl_cancel(void)
+{
+ return ins_compl_stop(' ', ctrl_x_mode, TRUE);
+}
+
+/*
* Prepare for Insert mode completion, or stop it.
* Called just after typing a character in Insert mode.
* Returns TRUE when the character is not to be inserted;
@@ -6080,6 +6087,8 @@
else if (insert_match && stop_arrow() == FAIL)
return FAIL;
+ compl_curr_win = curwin;
+ compl_curr_buf = curwin->w_buffer;
compl_shown_match = compl_curr_match;
compl_shows_dir = compl_direction;