From 361f548437a0a9b620db620356fdd405d24a7b34 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Thu, 25 Nov 2021 22:53:14 +0000
Subject: vim-patch:8.2.3671: restarting Insert mode in prompt buffer too often

Problem:    Restarting Insert mode in prompt buffer too often when a callback
            switches windows and comes back. (Sean Dewar)
Solution:   Do not set "restart_edit" when already in Insert mode.
https://github.com/vim/vim/commit/34c20ff85b87be587ea5d0398812441b502ee6a5

As Test_prompt_switch_windows is skipped, implement it in prompt_buffer_spec.

Replace the 50ms term_wait calls with poke_eventloop (test seems to work anyway
without them, so maybe they're not required?)

The new test does include a duplicate screen test that may generate a "screen
test succeeded immediately" warning, but this is done to match the Vim test.
---
 test/functional/legacy/prompt_buffer_spec.lua | 49 +++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'test/functional/legacy/prompt_buffer_spec.lua')

diff --git a/test/functional/legacy/prompt_buffer_spec.lua b/test/functional/legacy/prompt_buffer_spec.lua
index e689c29dfd..47eca19de3 100644
--- a/test/functional/legacy/prompt_buffer_spec.lua
+++ b/test/functional/legacy/prompt_buffer_spec.lua
@@ -31,6 +31,10 @@ describe('prompt buffer', function()
       func TimerFunc(text)
         call append(line("$") - 1, 'Result: "' . a:text .'"')
       endfunc
+
+      func SwitchWindows()
+        call timer_start(0, {-> execute("wincmd p|wincmd p", "")})
+      endfunc
     ]])
     feed_command("set noshowmode | set laststatus=0")
     feed_command("call setline(1, 'other buffer')")
@@ -167,6 +171,51 @@ describe('prompt buffer', function()
     ]])
   end)
 
+  it('switch windows', function()
+    feed_command("set showmode")
+    feed("i")
+    screen:expect([[
+      cmd: ^                    |
+      ~                        |
+      ~                        |
+      ~                        |
+      [Prompt] [+]             |
+      other buffer             |
+      ~                        |
+      ~                        |
+      ~                        |
+      -- INSERT --             |
+    ]])
+    feed("<C-O>:call SwitchWindows()<CR>")
+    poke_eventloop()
+    screen:expect([[
+      cmd: ^                    |
+      ~                        |
+      ~                        |
+      ~                        |
+      [Prompt] [+]             |
+      other buffer             |
+      ~                        |
+      ~                        |
+      ~                        |
+      -- INSERT --             |
+    ]])
+    feed("<Esc>")
+    poke_eventloop()
+    screen:expect([[
+      cmd:^                     |
+      ~                        |
+      ~                        |
+      ~                        |
+      [Prompt] [+]             |
+      other buffer             |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]])
+  end)
+
   it('keeps insert mode after aucmd_restbuf in callback', function()
     source [[
       let s:buf = nvim_create_buf(1, 1)
-- 
cgit