Files
jj.nvim/lua/jj/diff/codediff.lua
Trung LamandNicolas GB 27ab6707be Use the real files when diffing against current revision
This allows users to get lsp functionalities and run `gf` to navigate to
the file in a different tab.
2026-02-13 10:08:15 +01:00

71 lines
1.7 KiB
Lua

local utils = require("jj.utils")
---@type jj.diff
local diff = require("jj.diff")
--- Givewn two changes, show their diff using codediff
--- @param left string
--- @param right string
local function diff_two_changes(left, right)
local commit_id_left = utils.get_commit_id(left)
if commit_id_left == nil then
return
end
local commit_id_right = utils.get_commit_id(right)
if commit_id_right == nil then
return
end
--- Omit the commit id when left is the current revision,
--- allowing codediff to use the actual file instead of a virtual buffer.
local commit_id_current = utils.get_current_commit_id()
if commit_id_current == commit_id_left then
vim.cmd(string.format("CodeDiff %s", commit_id_right))
return
end
vim.cmd(string.format("CodeDiff %s %s", commit_id_right, commit_id_left))
end
-----------------------------------------------------------------------
-- Codediff Backend
-----------------------------------------------------------------------
diff.register_backend("codediff", {
diff_current = function(opts)
if not utils.has_dependency("codediff") then
return
end
-- Extract the commit id from opts.rev
local revset = opts.rev or "@-"
local commit_id = utils.get_commit_id(revset)
if not commit_id then
return
end
vim.cmd(string.format("CodeDiff file %s", commit_id))
end,
show_revision = function(opts)
if not utils.has_dependency("codediff") then
return
end
-- When comparing a revision we always compare it to it's parent to get the diff
local right = string.format("%s-", opts.rev)
diff_two_changes(opts.rev, right)
end,
diff_revisions = function(opts)
if not utils.has_dependency("codediff") then
return
end
diff_two_changes(opts.left, opts.right)
end,
})