summaryrefslogtreecommitdiffstatshomepage
path: root/runtime/lua/vim/_extui/cmdline.lua
diff options
context:
space:
mode:
authorluukvbaal <luukvbaal@gmail.com>2025-06-15 12:55:01 +0200
committerGitHub <noreply@github.com>2025-06-15 12:55:01 +0200
commit5046ef4c8f8d738d90b220cf9a2e2a692bd266ba (patch)
treecad65e70c1815766cf515f12005ece96b69860f2 /runtime/lua/vim/_extui/cmdline.lua
parent0d658660c29e920e74c4dade3819d80dccad0dde (diff)
fix(extui): clear cmdline buffer for first message (#34490)
Problem: Cmdline buffer is not cleared for a new message (since c973c7ae), resulting in an incorrect spill indicator. When the cmdline buffer is cleared, "msg_row" is not invalidated, resulting in an error. The extui module is untested. Return value of `vim.ui_attach()->callback` is undocumented. Solution: Clear the cmdline buffer for the first message in an event loop iteration. Ensure msg_row passed as end_row does not exceed buffer length. Add `messages_spec2.lua` to test the extui module, keeping in mind that test coverage will greatly increase if this UI is made the default. As such, only tests for specific extui functionality unlikely to be covered by tests leveraging the current message grid. Document the return value of `vim.ui_attach()->callback`, it seems to make sense, and is also used to suppress remote UI events in `messages_spec2.lua`.
Diffstat (limited to 'runtime/lua/vim/_extui/cmdline.lua')
-rw-r--r--runtime/lua/vim/_extui/cmdline.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/lua/vim/_extui/cmdline.lua b/runtime/lua/vim/_extui/cmdline.lua
index 4b9198d11d..53f14ccb4b 100644
--- a/runtime/lua/vim/_extui/cmdline.lua
+++ b/runtime/lua/vim/_extui/cmdline.lua
@@ -110,11 +110,11 @@ end
--- Leaving the cmdline, restore 'cmdheight' and 'ruler'.
---
---@param level integer
+---@param level integer
---@param abort boolean
-function M.cmdline_hide(_, abort)
- if M.row > 0 then
- return -- No need to hide when still in cmdline_block.
+function M.cmdline_hide(level, abort)
+ if M.row > 0 or level > 1 then
+ return -- No need to hide when still in nested cmdline or cmdline_block.
end
fn.clearmatches(ext.wins.cmd) -- Clear matchparen highlights.
@@ -166,7 +166,7 @@ end
--- Clear cmdline buffer and leave the cmdline.
function M.cmdline_block_hide()
M.row = 0
- M.cmdline_hide(nil, true)
+ M.cmdline_hide(M.level, true)
end
return M