Skip to content

Commit 859f18c

Browse files
committed
Fix moved parent highlight logic
1 parent c9666dc commit 859f18c

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

lua/flog/highlight.lua

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,22 @@ function M.nvim_get_graph_hl_callback(buffer, instance_number)
172172

173173
-- Set highlight groups for merge
174174
if commit.moved_parent then
175+
local fork_col = vim.fn.virtcol2col(winid, line, 2 * commit.branch_index)
176+
177+
vim.api.nvim_buf_add_highlight(
178+
buffer,
179+
-1,
180+
hl_group_names[current_hl[commit.branch_index] or commit_hl_cache[commit.branch_index]],
181+
line - 1,
182+
merge_col - 1,
183+
fork_col - 1)
184+
175185
vim.api.nvim_buf_add_highlight(
176186
buffer,
177187
-1,
178188
hl_group_names[current_hl[commit.merge_end_branch_index] or commit_hl_cache[commit.merge_end_branch_index]],
179189
line - 1,
180-
vim.fn.virtcol2col(winid, line, 2 * commit.branch_index) - 1,
190+
fork_col - 1,
181191
end_merge_col)
182192
else
183193
vim.api.nvim_buf_add_highlight(

0 commit comments

Comments
 (0)