Skip to content

refactor(diff): clarify path parameter names in show_diff (#55) #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AzarAI-TOP wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(diff): clarify path parameter names in show_diff (#55) #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions lua/code-preview/diff.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@ end
-- (e.g. ApplyPatch passes "delete" for `*** Delete File:` directives). We
-- only emit "deleted" when explicitly told — inferring it from an empty
-- proposed file would misclassify legitimate truncations to zero bytes.
local function mark_change_and_reveal(abs_file_path, action)
if not abs_file_path or abs_file_path == "" then
local function mark_change_and_reveal(file_path, action)
if not file_path or file_path == "" then
return
end

local status
if action == "delete" then
status = "deleted"
elseif vim.uv.fs_stat(abs_file_path) then
elseif vim.uv.fs_stat(file_path) then
status = "modified"
else
status = "created"
end
log.debug(log.fmt("mark_change_and_reveal: %s → %s", abs_file_path, status))
pcall(function() require("code-preview.changes").set(abs_file_path, status) end)
log.debug(log.fmt("mark_change_and_reveal: %s → %s", file_path, status))
pcall(function() require("code-preview.changes").set(file_path, status) end)
pcall(function() require("code-preview.neo_tree").refresh() end)

local cfg = require("code-preview").config
Expand All @@ -56,7 +56,7 @@ local function mark_change_and_reveal(abs_file_path, action)

local reveal_dir = nil
if cfg.neo_tree.reveal_root == "git" then
local parent = vim.fn.fnamemodify(abs_file_path, ":h")
local parent = vim.fn.fnamemodify(file_path, ":h")
-- List-form (no shell): avoids the POSIX-only `2>/dev/null` redirect, which
-- misbehaves under Windows cmd. `shell_error` still gates the result, so a
-- non-repo parent (git's stderr + non-zero exit) simply leaves reveal_dir nil.
Expand All @@ -66,9 +66,9 @@ local function mark_change_and_reveal(abs_file_path, action)
end
end

local reveal_target = abs_file_path
local reveal_target = file_path
if status == "created" then
local parent = vim.fn.fnamemodify(abs_file_path, ":h")
local parent = vim.fn.fnamemodify(file_path, ":h")
while parent ~= "/" and vim.fn.isdirectory(parent) == 0 do
parent = vim.fn.fnamemodify(parent, ":h")
end
Expand Down Expand Up @@ -226,9 +226,9 @@ local function char_diff_ranges(old_line, new_line)
return prefix, #old_line - suffix, #new_line - suffix
end

local function build_inline_diff(original_path, proposed_path)
local orig_lines = read_file_lines(original_path)
local prop_lines = read_file_lines(proposed_path)
local function build_inline_diff(original_source_path, proposed_source_path)
local orig_lines = read_file_lines(original_source_path)
local prop_lines = read_file_lines(proposed_source_path)
local orig_text = #orig_lines > 0 and (table.concat(orig_lines, "\n") .. "\n") or ""
local prop_text = #prop_lines > 0 and (table.concat(prop_lines, "\n") .. "\n") or ""

Expand Down Expand Up @@ -340,13 +340,13 @@ local function build_inline_diff(original_path, proposed_path)
end

--- Create an inline diff tab and return {tab, bufs, inline_win}.
local function show_inline_diff(original_path, proposed_path, real_file_path, cfg)
local function show_inline_diff(original_source_path, proposed_source_path, display_path, cfg)
apply_inline_highlights(cfg)

local display_name = real_file_path or "unknown"
local ft = vim.filetype.match({ filename = real_file_path }) or ""
local display_name = display_path or "unknown"
local ft = vim.filetype.match({ filename = display_path }) or ""
local display_lines, line_highlights, char_highlights, line_numbers, line_types =
build_inline_diff(original_path, proposed_path)
build_inline_diff(original_source_path, proposed_source_path)

vim.cmd("tabnew")
local tab = vim.api.nvim_get_current_tabpage()
Expand Down Expand Up @@ -447,8 +447,8 @@ local function show_inline_diff(original_path, proposed_path, real_file_path, cf
return { tab = tab, bufs = { buf }, inline_win = win }
end

function M.show_diff(original_path, proposed_path, real_file_path, abs_file_path, action, backend)
local file_key = abs_file_path or real_file_path
function M.show_diff(original_source_path, proposed_source_path, display_path, file_path, action, backend)
local file_key = file_path or display_path
local cfg = require("code-preview").config
local layout = layout_for_backend(cfg, backend)
log.info(log.fmt("show_diff: file=%s layout=%s backend=%s active=%d",
Expand All @@ -464,11 +464,11 @@ function M.show_diff(original_path, proposed_path, real_file_path, abs_file_path
end

-- Set the neo-tree indicator + reveal
mark_change_and_reveal(abs_file_path, action)
mark_change_and_reveal(file_path, action)

-- Inline layout
if layout == "inline" then
local result = show_inline_diff(original_path, proposed_path, real_file_path, cfg)
local result = show_inline_diff(original_source_path, proposed_source_path, display_path, cfg)
active_diffs[file_key] = result
-- Force terminal redraw so RPC-triggered tab creation is visible (see force_redraw).
force_redraw()
Expand All @@ -478,9 +478,9 @@ function M.show_diff(original_path, proposed_path, real_file_path, abs_file_path
-- Side-by-side / tab layout
apply_highlights(cfg)

local display_name = real_file_path or "unknown"
local display_name = display_path or "unknown"
local labels = cfg.diff.labels or { current = "CURRENT", proposed = "PROPOSED" }
local ft = vim.filetype.match({ filename = real_file_path }) or ""
local ft = vim.filetype.match({ filename = display_path }) or ""

if layout == "vsplit" then
vim.cmd("vsplit")
Expand All @@ -491,7 +491,7 @@ function M.show_diff(original_path, proposed_path, real_file_path, abs_file_path

-- Left side: CURRENT
local orig_buf = vim.api.nvim_get_current_buf()
vim.api.nvim_buf_set_lines(orig_buf, 0, -1, false, read_file_lines(original_path))
vim.api.nvim_buf_set_lines(orig_buf, 0, -1, false, read_file_lines(original_source_path))
vim.bo[orig_buf].buftype = "nofile"
vim.bo[orig_buf].bufhidden = "wipe"
vim.bo[orig_buf].swapfile = false
Expand All @@ -511,7 +511,7 @@ function M.show_diff(original_path, proposed_path, real_file_path, abs_file_path
vim.cmd("rightbelow vsplit")
local prop_buf = vim.api.nvim_create_buf(false, true)
vim.api.nvim_win_set_buf(0, prop_buf)
vim.api.nvim_buf_set_lines(prop_buf, 0, -1, false, read_file_lines(proposed_path))
vim.api.nvim_buf_set_lines(prop_buf, 0, -1, false, read_file_lines(proposed_source_path))
vim.bo[prop_buf].buftype = "nofile"
vim.bo[prop_buf].bufhidden = "wipe"
vim.bo[prop_buf].swapfile = false
Expand Down
4 changes: 2 additions & 2 deletions tests/plugin/diff_lifecycle_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ describe("diff lifecycle", function()
local orig = tmp_file("tag_orig.txt", "aaa")
local prop = tmp_file("tag_prop.txt", "bbb")

-- Pass abs_file_path as 4th arg to tag the diff
-- Pass file_path as 4th arg to tag the diff
diff.show_diff(orig, prop, "tag.txt", "/abs/path/tag.txt")

assert.is_true(diff.is_open()) -- no arg: any diff is open
Expand Down Expand Up @@ -160,7 +160,7 @@ describe("diff lifecycle", function()
local orig = tmp_file("del_orig.txt", "to be removed\n")
local prop = tmp_file("del_prop.txt", "")

-- abs_file_path must point to a real on-disk file — `mark_change_and_reveal`
-- file_path must point to a real on-disk file — `mark_change_and_reveal`
-- only honors the delete hint for files that currently exist.
local abs = tmp_file("del_abs.txt", "to be removed\n")

Expand Down
Loading