IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0042: if omni completion opens a window Insert mode is stopped

Browse Source 
Problem:    If omni completion opens a window Insert mode is stopped.
            (Hirohito Higashi)
Solution:   Only set stop_insert_mode in a prompt buffer window.
f98b845dd1

popupmenu_spec.lua fails without this.
This commit is contained in:
Sean Dewar 2021-11-07 14:50:01 +00:00
parent d6ea0741c9
commit b9ab4c1dea
No known key found for this signature in database
GPG Key ID: 08CC2C83AD41B581
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/window.c
View File

@ -2232,16 +2232,22 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
static void leaving_window(win_T *const win) static void leaving_window(win_T *const win)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
// Only matters for a prompt window.
if (!bt_prompt(win->w_buffer)) {
return;
}
// When leaving a prompt window stop Insert mode and perhaps restart // When leaving a prompt window stop Insert mode and perhaps restart
// it when entering that window again. // it when entering that window again.
win->w_buffer->b_prompt_insert = restart_edit; win->w_buffer->b_prompt_insert = restart_edit;
restart_edit = NUL; restart_edit = NUL;
// When leaving the window (or closing the window) was done from a // When leaving the window (or closing the window) was done from a
// callback we need to break out of the Insert mode loop. // callback we need to break out of the Insert mode loop and restart Insert
// mode when entering the window again.
if (State & INSERT) { if (State & INSERT) {
stop_insert_mode = true; stop_insert_mode = true;
if (bt_prompt(win->w_buffer) && win->w_buffer->b_prompt_insert == NUL) { if (win->w_buffer->b_prompt_insert == NUL) {
win->w_buffer->b_prompt_insert = 'A'; win->w_buffer->b_prompt_insert = 'A';
} }
} }
@ -2250,13 +2256,19 @@ static void leaving_window(win_T *const win)
static void entering_window(win_T *const win) static void entering_window(win_T *const win)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
// Only matters for a prompt window.
if (!bt_prompt(win->w_buffer)) {
return;
}
// When switching to a prompt buffer that was in Insert mode, don't stop // When switching to a prompt buffer that was in Insert mode, don't stop
// Insert mode, it may have been set in leaving_window(). // Insert mode, it may have been set in leaving_window().
if (bt_prompt(win->w_buffer) && win->w_buffer->b_prompt_insert != NUL) { if (win->w_buffer->b_prompt_insert != NUL) {
stop_insert_mode = false; stop_insert_mode = false;
} }
// When entering the prompt window may restart Insert mode. // When entering the prompt window restart Insert mode if we were in Insert
// mode when we left it.
restart_edit = win->w_buffer->b_prompt_insert; restart_edit = win->w_buffer->b_prompt_insert;
} }