mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert: show "g<" hint when message spills 'cmdheight'

Browse Source 
Problem:  Hint message to press "g<" for message that spills
          'cmdheight' is too intrusive.
Solution: Remove the hint message. Document the meaning of the spill
          indicator instead.
This commit is contained in:
Luuk van Baal
2025-05-14 12:28:05 +02:00
committed by luukvbaal
parent 4d56dc43c0
commit d25eb246ef
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/lua.txt
View File

@@ -2704,6 +2704,10 @@ These four windows are assigned the "cmdline", "msgbox", "msgmore" and
"msgprompt" 'filetype' respectively. Use a |FileType| autocommand to configure "msgprompt" 'filetype' respectively. Use a |FileType| autocommand to configure
any local options for these windows and their respective buffers. any local options for these windows and their respective buffers.
Rather than a |hit-enter-prompt|, messages shown in the cmdline area that do
not fit are appended with a `[+x]` "spill" indicator, where `x` indicates the
spilled lines. To see the full message, the |g<| command can be used.
============================================================================== ==============================================================================

4
runtime/lua/vim/_extui.lua
View File

@@ -30,6 +30,10 @@
---These four windows are assigned the "cmdline", "msgbox", "msgmore" and ---These four windows are assigned the "cmdline", "msgbox", "msgmore" and
---"msgprompt" 'filetype' respectively. Use a |FileType| autocommand to configure ---"msgprompt" 'filetype' respectively. Use a |FileType| autocommand to configure
---any local options for these windows and their respective buffers. ---any local options for these windows and their respective buffers.
---
---Rather than a |hit-enter-prompt|, messages shown in the cmdline area that do
---not fit are appended with a `[+x]` "spill" indicator, where `x` indicates the
---spilled lines. To see the full message, the |g<| command can be used.
local api = vim.api local api = vim.api
local ext = require('vim._extui.shared') local ext = require('vim._extui.shared')

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

@@ -290,13 +290,10 @@ function M.show_msg(tar, content, replace_last, more)
else else
api.nvim_win_set_cursor(ext.wins[ext.tab][tar], { 1, 0 }) api.nvim_win_set_cursor(ext.wins[ext.tab][tar], { 1, 0 })
ext.cmd.highlighter.active[ext.bufs.cmd] = nil ext.cmd.highlighter.active[ext.bufs.cmd] = nil
-- Show hint in box and place [+x] indicator for lines that spill over 'cmdheight'. -- Place [+x] indicator for lines that spill over 'cmdheight'.
M.cmd.lines, M.cmd.msg_row = h.all, h.end_row M.cmd.lines, M.cmd.msg_row = h.all, h.end_row
local spill = M.cmd.lines - ext.cmdheight local spill = M.cmd.lines > ext.cmdheight and ('[+%d]'):format(M.cmd.lines - ext.cmdheight)
M.virt.msg[M.virt.idx.spill][1] = spill > 0 and { 0, ('[+%d]'):format(spill) } or nil M.virt.msg[M.virt.idx.spill][1] = spill and { 0, spill } or nil
if spill > 0 then
M.msg_show('verbose', { { 0, ('Press g< to see %d more lines'):format(spill), 0 } })
end
end end
end end