mirror of
https://github.com/zoriya/jj.nvim.git
synced 2026-08-05 10:46:08 +00:00
Jonas ElhsandGitHub
46141a282e
- add terminal.window.type support (hsplit, vsplit, floating, tab) - add terminal.window.split_size for split-based layouts - rename floating size options to terminal.window.floating_width/floating_height - validate terminal window ratios during setup - make terminal.run/run_floating merge default keymaps internally - remove cmd.split width/height sizing in favor of terminal.window config - improve floating/log buffer state handling and refresh behavior - update README examples and configuration docs BREAKING CHANGE: terminal sizing/config moved to terminal.window.*. Removed cmd.split.width/cmd.split.height. Renamed terminal.window.width/height to terminal.window.floating_width/floating_height
111 lines
3.0 KiB
Lua
111 lines
3.0 KiB
Lua
--- @class jj.cmd.status
|
|
local M = {}
|
|
|
|
local utils = require("jj.utils")
|
|
local runner = require("jj.core.runner")
|
|
local parser = require("jj.core.parser")
|
|
local terminal = require("jj.ui.terminal")
|
|
|
|
--- Handle restoring a file from the jj status buffer
|
|
--- Supports both renamed and non-renamed files
|
|
function M.handle_status_restore()
|
|
local file_info = parser.parse_file_info_from_status_line(vim.api.nvim_get_current_line())
|
|
if not file_info then
|
|
return
|
|
end
|
|
|
|
if file_info.is_rename then
|
|
-- For renamed files, remove the new file and restore the old one from parent revision
|
|
local rm_cmd = "rm " .. vim.fn.shellescape(file_info.new_path)
|
|
local restore_cmd = "jj restore --from @- " .. vim.fn.shellescape(file_info.old_path)
|
|
|
|
local _, rm_success = runner.execute_command(rm_cmd, "Failed to remove renamed file")
|
|
if rm_success then
|
|
local _, restore_success = runner.execute_command(restore_cmd, "Failed to restore original file")
|
|
if restore_success then
|
|
utils.notify(
|
|
"Reverted rename: " .. file_info.new_path .. " -> " .. file_info.old_path,
|
|
vim.log.levels.INFO
|
|
)
|
|
require("jj.cmd").status()
|
|
end
|
|
end
|
|
else
|
|
-- For non-renamed files, use regular restore
|
|
local restore_cmd = "jj restore " .. vim.fn.shellescape(file_info.old_path)
|
|
|
|
local _, success = runner.execute_command(restore_cmd, "Failed to restore")
|
|
if success then
|
|
utils.notify("Restored: " .. file_info.old_path, vim.log.levels.INFO)
|
|
require("jj.cmd").status()
|
|
end
|
|
end
|
|
end
|
|
|
|
--- Handle opening a file from the jj status buffer
|
|
function M.handle_status_enter()
|
|
local file_info = parser.parse_file_info_from_status_line(vim.api.nvim_get_current_line())
|
|
|
|
if not file_info then
|
|
return
|
|
end
|
|
|
|
if require("jj").config.terminal.window.type == "floating" then
|
|
terminal.close_floating_buffer()
|
|
end
|
|
|
|
local filepath = file_info.new_path
|
|
local stat = vim.uv.fs_stat(filepath)
|
|
if not stat then
|
|
utils.notify("File not found: " .. filepath, vim.log.levels.ERROR)
|
|
return
|
|
end
|
|
|
|
-- Go to the previous window (split above)
|
|
vim.cmd("wincmd p")
|
|
|
|
-- Open the file in that window, replacing current buffer
|
|
vim.cmd("edit " .. vim.fn.fnameescape(filepath))
|
|
end
|
|
|
|
--- Resolve status keymaps from config
|
|
--- @return jj.core.buffer.keymap[]
|
|
function M.status_keymaps()
|
|
local cmd = require("jj.cmd")
|
|
local cfg = cmd.config.keymaps.status or {}
|
|
local specs = {
|
|
open_file = {
|
|
desc = "Open file under cursor",
|
|
handler = M.handle_status_enter,
|
|
},
|
|
restore_file = {
|
|
desc = "Restore file under cursor",
|
|
handler = M.handle_status_restore,
|
|
},
|
|
}
|
|
|
|
return cmd.resolve_keymaps_from_specs(cfg, specs)
|
|
end
|
|
|
|
--- Jujutsu status
|
|
--- @param opts? table Options for the status command
|
|
function M.status(opts)
|
|
if not utils.ensure_jj() then
|
|
return
|
|
end
|
|
|
|
local cmd_str = "jj status"
|
|
|
|
if opts and opts.notify then
|
|
local output, success = runner.execute_command(cmd_str, "Failed to get status")
|
|
if success then
|
|
utils.notify(output and output or "", vim.log.levels.INFO)
|
|
end
|
|
else
|
|
-- Default behavior: show in buffer
|
|
terminal.run(cmd_str, M.status_keymaps())
|
|
end
|
|
end
|
|
|
|
return M
|