neovim

commit 6798f1fab0244ee535675fa9100945eec074e6e4
parent e6c71574a07662c44b83c6cb07bf9b61bc06e136
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Thu,  5 May 2022 06:58:20 +0800

vim-patch:8.2.4865: :startinsert right after :stopinsert may not work (#18418)

Problem:    :startinsert right after :stopinsert does not work when popup menu
            is still visible.
Solution:   Use ins_compl_active() instead of pum_visible(). (closes vim/vim#10352)
https://github.com/vim/vim/commit/cd5dbad184e8235beb13dcd8a22302da09db9766
Diffstat:
M
src/nvim/edit.c
 | 
2
+-
M
src/nvim/testdir/test_ins_complete.vim
 | 
9
+++++++++

2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
@@ -553,7 +553,7 @@ static int insert_check(VimState *state)
     Insstart_orig = Insstart;
   }
 
-  if (stop_insert_mode && !pum_visible()) {
+  if (stop_insert_mode && !compl_started) {
     // ":stopinsert" used or 'insertmode' reset
     s->count = 0;
     return 0;  // exit insert mode
diff --git a/src/nvim/testdir/test_ins_complete.vim b/src/nvim/testdir/test_ins_complete.vim
@@ -516,6 +516,15 @@ func Test_pum_stopped_by_timer()
   call delete('Xpumscript')
 endfunc
 
+func Test_complete_stopinsert_startinsert()
+  nnoremap <F2> <Cmd>startinsert<CR>
+  inoremap <F2> <Cmd>stopinsert<CR>
+  " This just checks if this causes an error
+  call feedkeys("i\<C-X>\<C-N>\<F2>\<F2>", 'x')
+  nunmap <F2>
+  iunmap <F2>
+endfunc
+
 func Test_pum_with_folds_two_tabs()
   CheckScreendump