GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 09:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(extui): reset message state after "search_cmd" message (#34119)

Browse Source 
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'.
This commit is contained in:
luukvbaal
2025-05-21 23:34:09 +02:00
committed by GitHub
parent 2e0158650a
commit 7077c59295
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/lua/vim/_extui/messages.lua
View File

@ -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