From 7077c5929529b3ab8e64eb7f59244699e090f70b Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Wed, 21 May 2025 23:34:09 +0200
Subject: [PATCH] fix(extui): reset message state after "search_cmd" message
 (#34119)

Problem:  A "search_cmd" message alters the message state (since 8e8f4523),
          unnecessarily affecting logic for messages that follow.
Solution: Reset the appropriate variables after a "search_cmd" message.
          Don't show "search_cmd" message with zero 'cmdheight'.
---
 runtime/lua/vim/_extui/messages.lua | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/runtime/lua/vim/_extui/messages.lua b/runtime/lua/vim/_extui/messages.lua
index 1d587827aa..23a449bbd8 100644
--- a/runtime/lua/vim/_extui/messages.lua
+++ b/runtime/lua/vim/_extui/messages.lua
@@ -254,7 +254,7 @@ function M.show_msg(tar, content, replace_last, more)
 
   if tar == 'box' then
     api.nvim_win_set_width(ext.wins[ext.tab].box, width)
-    local h = api.nvim_win_text_height(ext.wins[ext.tab].box, {})
+    local h = api.nvim_win_text_height(ext.wins[ext.tab].box, { start_row = start_row })
     if h.all > (more and 1 or math.ceil(o.lines * 0.5)) then
       api.nvim_buf_set_lines(ext.bufs.box, start_row, -1, false, {})
       api.nvim_win_set_width(ext.wins[ext.tab].box, M.box.width)
@@ -332,8 +332,12 @@ function M.msg_show(kind, content)
     M.show_msg('prompt', content, true)
     M.set_pos('prompt')
   else
-    -- Set the entered search command in the cmdline.
+    -- Set the entered search command in the cmdline (if available).
     local tar = kind == 'search_cmd' and 'cmd' or ext.cfg.msg.pos
+    if tar == 'cmd' and ext.cmdheight == 0 then
+      return
+    end
+
     if tar == 'cmd' then
       if ext.cmd.level > 0 then
         return -- Do not overwrite an active cmdline.
@@ -349,8 +353,10 @@ function M.msg_show(kind, content)
     M.show_msg(tar, content, replace_bufwrite, more)
     -- Replace message for every second bufwrite message.
     replace_bufwrite = not replace_bufwrite and kind == 'bufwrite'
-    -- Don't remember search_cmd message as actual mesage.
-    M.prev_msg = kind == 'search_cmd' and '' or M.prev_msg
+    -- Don't remember search_cmd message as actual message.
+    if kind == 'search_cmd' then
+      M.cmd.lines, M.cmd.count, M.prev_msg = 0, 0, ''
+    end
   end
 end