Skip to content

Fix commit highlighting in single-file history mode #213

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

Merged
esmuellert merged 2 commits into from
Jan 30, 2026
Merged

Fix commit highlighting in single-file history mode #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2b2ed4
fix(history): highlight selected commit in single-file mode when navi…
marcomayer Jan 29, 2026
bd2c19b
Fix full-line highlight for selected commits
esmuellert Jan 30, 2026
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
16 changes: 13 additions & 3 deletions lua/codediff/ui/history/nodes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ end

-- Prepare node for rendering (format display)
-- Match diffview format: [fold] [file count] | [adds] [dels] | hash subject author, date
function M.prepare_node(node, max_width, selected_commit, selected_file)
function M.prepare_node(node, max_width, selected_commit, selected_file, is_single_file_mode)
local line = NuiLine()
local data = node.data or {}

Expand All @@ -226,7 +226,9 @@ function M.prepare_node(node, max_width, selected_commit, selected_file)
elseif data.type == "commit" then
-- Commit node format (diffview style):
-- [fold icon] N file(s) | +adds -dels | hash subject author, date
local is_selected = data.hash == selected_commit and not selected_file
-- In single-file mode, highlight commit when hash matches (no file nodes exist)
-- In multi-file mode, highlight commit only when no file is selected
local is_selected = data.hash == selected_commit and (is_single_file_mode or not selected_file)
local is_expanded = node:is_expanded()

-- Get selected background color once
Expand Down Expand Up @@ -273,7 +275,7 @@ function M.prepare_node(node, max_width, selected_commit, selected_file)

line:append("| ", get_hl("NonText"))
line:append(ins_str, get_hl("DiagnosticOk"))
line:append(" ")
line:append(" ", get_hl("Normal"))
line:append(del_str, get_hl("DiagnosticError"))
line:append(" | ", get_hl("NonText"))

Expand Down Expand Up @@ -301,6 +303,14 @@ function M.prepare_node(node, max_width, selected_commit, selected_file)

-- Author, date at end (dimmed)
line:append(" " .. data.author .. ", " .. data.date_relative, get_hl("Comment"))

-- Pad with spaces to fill full line width when selected
if is_selected and max_width then
local current_len = #line:content()
if current_len < max_width then
line:append(string.rep(" ", max_width - current_len), get_hl("Normal"))
end
end
elseif data.type == "file" then
-- File node format (diffview style):
-- [tree char] [status] [icon] [path/]filename
Expand Down
2 changes: 1 addition & 1 deletion lua/codediff/ui/history/render.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function M.create(commits, git_root, tabpage, width, opts)
if split.winid and vim.api.nvim_win_is_valid(split.winid) then
current_width = vim.api.nvim_win_get_width(split.winid)
end
return nodes_module.prepare_node(node, current_width, selected_commit, selected_file)
return nodes_module.prepare_node(node, current_width, selected_commit, selected_file, is_single_file_mode)
end,
})

Expand Down