mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-31 04:39:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui2): preserve Visual mode messages #40828

Browse Source 
Problem:
The existing `showmode` overlay can immediately cover messages emitted while
Visual mode is active, including the `g CTRL-G` word count.

Solution:
Protect Visual mode messages with the existing message delay and temporarily
hide the previous last-line overlay until it is restored.
This commit is contained in:
Barrett Ruth
2026-07-20 14:44:37 -05:00
committed by GitHub
parent d343a1e230
commit 16c145d240
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/lua/vim/_core/ui2/messages.lua
View File

@@ -25,7 +25,7 @@ local M = {
ids = {}, ---@type table<string|integer, Msg> List of visible messages.
msg_row = -1, -- Last row of message to distinguish for placing virt_text.
last_col = o.columns, -- Crop text to start column of 'last' virt_text.
last_emsg = 0, -- Time an error was printed that should not be overwritten.
last_msg = 0, -- Time an important message was printed that should not be overwritten.
prev_msg = '', -- Concatenated content of the previous message.
prev_id = 0, ---@type string|integer Message id of the previous message.
dupe = 0, -- Number of times message is repeated.
@@ -168,7 +168,12 @@ local function set_virttext(type, tgt)
else
if scol > M.cmd.last_col then
-- Give the user some time to read an important message.
if os.time() - M.cmd.last_emsg < 2 then
if os.time() - M.cmd.last_msg < 2 then
-- The existing overlay may already cover the message, so hide it during the delay.
if M.virt.ids.last then
api.nvim_buf_del_extmark(ui.bufs.cmd, ui.ns, M.virt.ids.last)
M.virt.ids.last = nil
end
M.virt.delayed = true
vim.defer_fn(function()
M.virt.delayed = false
@@ -467,7 +472,9 @@ function M.msg_show(kind, content, replace_last, _, append, id, trigger)
if tgt == 'cmd' then
-- Store the time when an important message was emitted in order to not overwrite
-- it with 'last' virt_text in the cmdline so that the user has a chance to read it.
M.cmd.last_emsg = (kind == 'emsg' or kind == 'wmsg') and os.time() or M.cmd.last_emsg
local mode = api.nvim_get_mode().mode
local visual = mode:match('^[vV\22]') ~= nil
M.cmd.last_msg = (kind == 'emsg' or kind == 'wmsg' or visual) and os.time() or M.cmd.last_msg
-- Should clear the search count now, mark itself is cleared by invalidate.
M.virt.last[M.virt.idx.search][1] = nil
M.virt.last[M.virt.idx.cmd] = {}