From 27ab6707be65cf41fe8567132a65f3cae3db4bea Mon Sep 17 00:00:00 2001
From: Trung Lam <lam@lamtrung.com>
Date: Thu, 12 Feb 2026 15:04:02 -0800
Subject: [PATCH] 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.
---
 lua/jj/diff/codediff.lua |  8 ++++++++
 lua/jj/utils.lua         | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/lua/jj/diff/codediff.lua b/lua/jj/diff/codediff.lua
index 6783508..b71d6d8 100644
--- a/lua/jj/diff/codediff.lua
+++ b/lua/jj/diff/codediff.lua
@@ -17,6 +17,14 @@ local function diff_two_changes(left, right)
 		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
 
diff --git a/lua/jj/utils.lua b/lua/jj/utils.lua
index ff1f7a9..e380eb9 100644
--- a/lua/jj/utils.lua
+++ b/lua/jj/utils.lua
@@ -370,6 +370,24 @@ function M.get_commit_id(revset)
 	return vim.trim(output)
 end
 
+---
+--- Get the commit id of the current revision
+--- @return string|nil
+function M.get_current_commit_id()
+	local output, success = runner.execute_command(
+		"jj log --no-graph -r '@' -T 'commit_id' --quiet",
+		"Error extracting current revision's commit id",
+		nil,
+		true
+	)
+
+	if not success or not output then
+		return nil
+	end
+
+	return vim.trim(output)
+end
+
 --- Extract the description from the describe text
 --- @param lines string[] The lines of a described change
 --- @return string|nil