From 5b6477be45c54ebac4dce6bda51028542167fd1f Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Tue, 28 May 2024 11:43:56 +0200
Subject: fix(ui): flush ext_cmdline events before doing cmdpreview #27950

Problem:  Unable to update the screen for external cmdline during cmdpreview.
Solution: Flush the cmdline UI before cmdpreview state.
---
 test/functional/lua/ui_event_spec.lua | 53 +++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'test/functional/lua')

diff --git a/test/functional/lua/ui_event_spec.lua b/test/functional/lua/ui_event_spec.lua
index 1e80c88403..0a6deaa41c 100644
--- a/test/functional/lua/ui_event_spec.lua
+++ b/test/functional/lua/ui_event_spec.lua
@@ -37,6 +37,9 @@ describe('vim.ui_attach', function()
       [2] = { bold = true },
       [3] = { background = Screen.colors.Grey },
       [4] = { background = Screen.colors.LightMagenta },
+      [5] = { reverse = true },
+      [6] = { reverse = true, bold = true },
+      [7] = { background = Screen.colors.Yellow1 },
     })
     screen:attach()
   end)
@@ -188,6 +191,56 @@ describe('vim.ui_attach', function()
     feed('version<CR><CR>v<Esc>')
     n.assert_alive()
   end)
+
+  it("preserved 'incsearch/command' screen state after :redraw from ext_cmdline", function()
+    exec_lua([[
+      vim.cmd.norm('ifoobar')
+      vim.cmd('1split cmdline')
+      local buf = vim.api.nvim_get_current_buf()
+      vim.cmd.wincmd('p')
+      vim.ui_attach(ns, { ext_cmdline = true }, function(event, ...)
+        if event == 'cmdline_show' then
+          local content = select(1, ...)
+          vim.api.nvim_buf_set_lines(buf, -2, -1, false, {content[1][2]})
+          vim.cmd('redraw')
+        end
+        return true
+      end)
+    ]])
+    -- Updates a cmdline window
+    feed(':cmdline')
+    screen:expect({
+      grid = [[
+        cmdline                                 |
+        {5:cmdline [+]                             }|
+        fooba^r                                  |
+        {6:[No Name] [+]                           }|
+                                                |
+      ]],
+    })
+    -- Does not clear 'incsearch' highlighting
+    feed('<Esc>/foo')
+    screen:expect({
+      grid = [[
+        foo                                     |
+        {5:cmdline [+]                             }|
+        {5:foo}ba^r                                  |
+        {6:[No Name] [+]                           }|
+                                                |
+      ]],
+    })
+    -- Shows new cmdline state during 'inccommand'
+    feed('<Esc>:%s/bar/baz')
+    screen:expect({
+      grid = [[
+        %s/bar/baz                              |
+        {5:cmdline [+]                             }|
+        foo{7:ba^z}                                  |
+        {6:[No Name] [+]                           }|
+                                                |
+      ]],
+    })
+  end)
 end)
 
 describe('vim.ui_attach', function()
-- 
cgit