fix: describe command reopening log buffer without flicker

- Close terminal buffer before opening describe editor
  - Capture log state before closing to detect if we should reopen
  - Add on_unload callback to editor to handle log reopening
  - Suppress redraws during buffer transitions with lazyredraw
  - Remove duplicate hardcoded status keymaps from terminal.lua (were referencing undefined functions)
  - Fix resolve_keymaps_from_specs to validate handlers exist before creating keymaps
This commit is contained in:
NicolasGB
2025-11-23 16:34:42 +01:00
committed by Nicolas GB
parent f06b23326e
commit b34e08d815
4 changed files with 59 additions and 25 deletions
+12 -1
View File
@@ -51,8 +51,9 @@ end
---@param initial_text string[] Lines to initialize the buffer with
---@param on_done fun(buf: string[])? Optional callback called with user text on buffer write
---@param on_unload? fun()? Optional callback called when the buffer is closed
---@param keymaps? jj.core.buffer.keymap[] Optional keymaps for the buffer
function M.open_editor(initial_text, on_done, keymaps)
function M.open_editor(initial_text, on_done, on_unload, keymaps)
-- Initialize highlight groups once
init_highlights()
@@ -156,6 +157,16 @@ function M.open_editor(initial_text, on_done, keymaps)
vim.bo[buf].modified = false
end,
})
-- Register the on_close callback
if on_unload then
vim.api.nvim_create_autocmd("BufWipeout", {
buffer = buf,
callback = function()
on_unload()
end,
})
end
end
return M
+4 -8
View File
@@ -158,6 +158,7 @@ function M.run_floating(cmd)
{ modes = { "n", "v" }, lhs = "i", rhs = function() end },
{ modes = { "n", "v" }, lhs = "c", rhs = function() end },
{ modes = { "n", "v" }, lhs = "a", rhs = function() end },
{ modes = { "n", "v" }, lhs = "u", rhs = function() end },
{
modes = { "n", "v" },
lhs = "q",
@@ -291,6 +292,7 @@ function M.run(cmd, keymaps)
{ modes = { "n", "v" }, lhs = "i", rhs = function() end },
{ modes = { "n", "v" }, lhs = "c", rhs = function() end },
{ modes = { "n", "v" }, lhs = "a", rhs = function() end },
{ modes = { "n", "v" }, lhs = "u", rhs = function() end },
-- Close terminal buffer
{
modes = { "n", "v" },
@@ -327,14 +329,8 @@ function M.run(cmd, keymaps)
end
end
-- Add Enter key mapping for status buffers to open files
if cmd[2] == "st" or cmd[2] == "status" then
new_command_keymaps = {
{ modes = "n", lhs = "<CR>", rhs = handle_status_enter, opts = { desc = "Open file under cursor" } },
{ modes = "n", lhs = "X", rhs = handle_status_restore, opts = { desc = "Restore file under cursor" } },
}
end
-- Status keymaps are already handled in cmd.lua via status_keymaps()
-- No need to duplicate them here
if #new_command_keymaps > 0 then
buffer.set_keymaps(state.buf, new_command_keymaps)
vim.b[state.buf].jj_command_keymaps = new_command_keymaps