Oscar/nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(git): remove inline and side-window blame, keep popup + drill actions

Browse Source
This commit is contained in:
Oscar Wallberg
2026-05-26 16:05:48 +02:00
parent db0b2d2527
commit 9e8a838059
3 changed files with 37 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/git/blame.lua
+4 -379
View File
@@ -4,16 +4,9 @@ local util = require("git.core.util")
local M = {}
local NS_INLINE = vim.api.nvim_create_namespace("ow.git.blame.inline")
local NS_POPUP = vim.api.nvim_create_namespace("ow.git.blame.popup")
local NS_VIEW = vim.api.nvim_create_namespace("ow.git.blame.view")
local ZERO_SHA = string.rep("0", 40)
local SHA_W = 8
local AUTHOR_W = 20
local DATE_W = 10
local GAP = " "
local VIEW_WIDTH = SHA_W + #GAP + AUTHOR_W + #GAP + DATE_W
---@class ow.Git.Blame.Commit
---@field sha string
@@ -41,8 +34,6 @@ local VIEW_WIDTH = SHA_W + #GAP + AUTHOR_W + #GAP + DATE_W
---@field tick integer?
---@field epoch integer
---@field pending fun()[]
---@field inline boolean
---@field autocmds integer[]
---@type table<integer, ow.Git.Blame.BufState>
local states = {}
@@ -59,41 +50,6 @@ function M.state(buf)
return states[buf]
end
---@param unix_ts integer
---@return string
local function relative_time(unix_ts)
local diff = os.time() - unix_ts
if diff < 0 then
diff = 0
end
local function fmt(n, unit)
return string.format("%d %s%s ago", n, unit, n == 1 and "" or "s")
end
if diff < 45 then
return "just now"
elseif diff < 90 then
return "a minute ago"
elseif diff < 45 * 60 then
return fmt(math.floor(diff / 60 + 0.5), "minute")
elseif diff < 90 * 60 then
return "an hour ago"
elseif diff < 22 * 3600 then
return fmt(math.floor(diff / 3600 + 0.5), "hour")
elseif diff < 36 * 3600 then
return "a day ago"
elseif diff < 7 * 86400 then
return fmt(math.floor(diff / 86400 + 0.5), "day")
elseif diff < 30 * 86400 then
return fmt(math.floor(diff / (7 * 86400) + 0.5), "week")
elseif diff < 365 * 86400 then
return fmt(math.floor(diff / (30 * 86400) + 0.5), "month")
end
return fmt(math.floor(diff / (365 * 86400) + 0.5), "year")
end
---@param ts integer
---@param tz string
---@return string
@@ -269,8 +225,6 @@ local function ensure_state(buf)
tick = nil,
epoch = 0,
pending = {},
inline = false,
autocmds = {},
}
states[buf] = state
return state
@@ -327,327 +281,6 @@ local function run_blame(state, buf, done)
end)
end
---@param buf integer
local function render_inline(buf)
if not vim.api.nvim_buf_is_valid(buf) then
return
end
vim.api.nvim_buf_clear_namespace(buf, NS_INLINE, 0, -1)
local state = states[buf]
if not state or not state.inline then
return
end
local win = vim.api.nvim_get_current_buf() == buf
and vim.api.nvim_get_current_win()
or vim.fn.bufwinid(buf)
if win == -1 then
return
end
local lnum = vim.api.nvim_win_get_cursor(win)[1]
local sha = state.line_sha[lnum]
local commit = sha and state.commits[sha]
if not commit then
return
end
local text
if util.is_zero_sha(sha) then
text = " You - Not Committed Yet"
else
text = string.format(
" %s, %s - %s",
commit.author,
relative_time(commit.author_time),
commit.summary
)
end
pcall(vim.api.nvim_buf_set_extmark, buf, NS_INLINE, lnum - 1, 0, {
virt_text = { { text, "GitBlameInline" } },
virt_text_pos = "eol",
hl_mode = "combine",
})
end
---@param buf integer
local function reblame(buf)
local state = states[buf]
if not state or not state.inline then
return
end
run_blame(state, buf, function()
render_inline(buf)
end)
end
local schedule, sched_handle = util.keyed_debounce(reblame, 150)
---@param buf integer
function M._flush(buf)
sched_handle.flush(buf)
end
---@param buf integer
---@param state ow.Git.Blame.BufState
local function attach_autocmds(buf, state)
if #state.autocmds > 0 then
return
end
local group =
vim.api.nvim_create_augroup("ow.git.blame." .. buf, { clear = true })
state.autocmds = {
vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
group = group,
buffer = buf,
callback = function()
render_inline(buf)
end,
}),
vim.api.nvim_create_autocmd(
{ "TextChanged", "TextChangedI", "BufWritePost" },
{
group = group,
buffer = buf,
callback = function()
schedule(buf)
end,
}
),
}
end
---@param buf integer
---@param state ow.Git.Blame.BufState
local function detach_autocmds(buf, state)
for _, id in ipairs(state.autocmds) do
pcall(vim.api.nvim_del_autocmd, id)
end
state.autocmds = {}
pcall(vim.api.nvim_del_augroup_by_name, "ow.git.blame." .. buf)
sched_handle.cancel(buf)
end
---@param buf integer?
function M.toggle_inline(buf)
buf = resolve_buf(buf)
local state = ensure_state(buf)
if not state then
util.warning("git blame: nothing to blame in this buffer")
return
end
state.inline = not state.inline
if state.inline then
attach_autocmds(buf, state)
run_blame(state, buf, function()
render_inline(buf)
end)
else
if vim.api.nvim_buf_is_valid(buf) then
vim.api.nvim_buf_clear_namespace(buf, NS_INLINE, 0, -1)
end
detach_autocmds(buf, state)
end
end
---@class ow.Git.Blame.View
---@field source_buf integer
---@field source_win integer
---@field view_buf integer
---@field view_win integer
---@field group integer
---@type table<integer, ow.Git.Blame.View>
local views = {}
---@param s string
---@param w integer
---@return string
local function pad_w(s, w)
local sw = vim.api.nvim_strwidth(s)
if sw > w then
return vim.fn.strcharpart(s, 0, w)
end
return s .. string.rep(" ", w - sw)
end
---@param state ow.Git.Blame.BufState
---@param line_count integer
---@return string[]
local function build_view_lines(state, line_count)
local lines = {}
for lnum = 1, line_count do
local sha = state.line_sha[lnum]
local commit = sha and state.commits[sha]
if commit and not util.is_zero_sha(sha) then
local author = pad_w(commit.author, AUTHOR_W)
local date = os.date("%Y-%m-%d", commit.author_time)
lines[lnum] = sha:sub(1, SHA_W) .. GAP .. author .. GAP .. date
else
lines[lnum] = pad_w("Uncommitted", VIEW_WIDTH)
end
end
return lines
end
---@param view ow.Git.Blame.View
---@param state ow.Git.Blame.BufState
local function render_view(view, state)
if not vim.api.nvim_buf_is_valid(view.view_buf) then
return
end
local line_count = vim.api.nvim_buf_line_count(view.source_buf)
local lines = build_view_lines(state, line_count)
util.set_buf_lines(view.view_buf, 0, -1, lines)
vim.api.nvim_buf_clear_namespace(view.view_buf, NS_VIEW, 0, -1)
local author_col = SHA_W + #GAP
local date_col = author_col + AUTHOR_W + #GAP
for lnum = 1, #lines do
local sha = state.line_sha[lnum]
if sha and not util.is_zero_sha(sha) then
pcall(vim.api.nvim_buf_set_extmark, view.view_buf, NS_VIEW, lnum - 1, 0, {
end_col = SHA_W,
hl_group = "GitBlameSha",
})
pcall(vim.api.nvim_buf_set_extmark, view.view_buf, NS_VIEW, lnum - 1, author_col, {
end_col = author_col + AUTHOR_W,
hl_group = "GitBlameAuthor",
})
pcall(vim.api.nvim_buf_set_extmark, view.view_buf, NS_VIEW, lnum - 1, date_col, {
end_col = date_col + DATE_W,
hl_group = "GitBlameDate",
})
end
end
end
---@param source_buf integer
local function close_view(source_buf)
local view = views[source_buf]
if not view then
return
end
views[source_buf] = nil
pcall(vim.api.nvim_del_augroup_by_id, view.group)
if vim.api.nvim_win_is_valid(view.source_win) then
vim.wo[view.source_win].scrollbind = false
vim.wo[view.source_win].cursorbind = false
end
if vim.api.nvim_win_is_valid(view.view_win) then
pcall(vim.api.nvim_win_close, view.view_win, true)
end
end
---@param source_buf integer
---@param state ow.Git.Blame.BufState
---@param source_win integer
local function open_view(source_buf, state, source_win)
local view_buf = vim.api.nvim_create_buf(false, true)
util.setup_scratch(view_buf, { buftype = "nofile", bufhidden = "wipe" })
vim.bo[view_buf].filetype = "gitblame"
local view_win = vim.api.nvim_open_win(view_buf, false, {
split = "left",
width = VIEW_WIDTH,
win = source_win,
})
vim.api.nvim_set_option_value("number", false, { win = view_win, scope = "local" })
vim.api.nvim_set_option_value("relativenumber", false, { win = view_win, scope = "local" })
vim.api.nvim_set_option_value("signcolumn", "no", { win = view_win, scope = "local" })
vim.api.nvim_set_option_value("foldcolumn", "0", { win = view_win, scope = "local" })
vim.api.nvim_set_option_value("wrap", false, { win = view_win, scope = "local" })
vim.api.nvim_set_option_value("cursorline", true, { win = view_win, scope = "local" })
vim.api.nvim_set_option_value("winfixwidth", true, { win = view_win, scope = "local" })
vim.api.nvim_set_option_value("statuscolumn", "", { win = view_win, scope = "local" })
if not vim.tbl_contains(vim.opt.scrollopt:get(), "ver") then
vim.opt.scrollopt:append("ver")
end
vim.wo[source_win].scrollbind = true
vim.wo[source_win].cursorbind = true
vim.wo[view_win].scrollbind = true
vim.wo[view_win].cursorbind = true
local group = vim.api.nvim_create_augroup(
"ow.git.blame.view." .. source_buf,
{ clear = true }
)
---@type ow.Git.Blame.View
local view = {
source_buf = source_buf,
source_win = source_win,
view_buf = view_buf,
view_win = view_win,
group = group,
}
views[source_buf] = view
render_view(view, state)
vim.api.nvim_win_call(view_win, function()
vim.cmd("syncbind")
end)
vim.api.nvim_create_autocmd("WinClosed", {
group = group,
callback = function(args)
local closed = tonumber(args.match)
if closed == view_win or closed == source_win then
vim.schedule(function()
close_view(source_buf)
end)
end
end,
})
vim.api.nvim_create_autocmd({ "BufWipeout", "BufDelete" }, {
group = group,
buffer = view_buf,
callback = function()
vim.schedule(function()
close_view(source_buf)
end)
end,
})
vim.keymap.set("n", "<CR>", function()
local lnum = vim.api.nvim_win_get_cursor(view_win)[1]
local sha = state.line_sha[lnum]
if not sha or util.is_zero_sha(sha) then
util.warning("git blame: line is not committed yet")
return
end
object.open(state.repo, sha, { split = false })
end, { buffer = view_buf, silent = true, desc = "Open the commit" })
vim.keymap.set("n", "q", function()
close_view(source_buf)
end, { buffer = view_buf, silent = true, desc = "Close the blame view" })
end
---@param buf integer?
function M.toggle_view(buf)
buf = resolve_buf(buf)
if views[buf] then
close_view(buf)
return
end
local state = ensure_state(buf)
if not state then
util.warning("git blame: nothing to blame in this buffer")
return
end
local source_win = vim.api.nvim_get_current_win()
if vim.api.nvim_win_get_buf(source_win) ~= buf then
source_win = vim.fn.bufwinid(buf)
end
if source_win == -1 then
return
end
run_blame(state, buf, function()
if
not vim.api.nvim_buf_is_valid(buf)
or not vim.api.nvim_win_is_valid(source_win)
then
return
end
open_view(buf, state, source_win)
end)
end
---@param lines string[]
---@return integer width
---@return integer height
@@ -884,34 +517,26 @@ end
---@param buf integer
function M.detach(buf)
close_view(buf)
local state = states[buf]
if not state then
return
end
if vim.api.nvim_buf_is_valid(buf) then
vim.api.nvim_buf_clear_namespace(buf, NS_INLINE, 0, -1)
end
detach_autocmds(buf, state)
state.epoch = state.epoch + 1
states[buf] = nil
end
-- The blame cache is keyed by `changedtick`, which a commit / checkout /
-- rebase does not bump. Drop the cache for affected worktree buffers on
-- a repo change so the next blame re-fetches; re-blame eagerly if a mode
-- is showing. `git://` buffers blame a fixed revision and are skipped.
-- rebase does not bump. Drop the cache for affected worktree buffers on a
-- repo change so the next popup re-fetches. `git://` buffers blame a
-- fixed revision and are skipped.
repo.on("change", function(r, change)
for buf, state in pairs(states) do
for _, state in pairs(states) do
if
state.repo == r
and not state.revision
and (change.paths[state.rel] or change.branch_changed)
then
state.tick = nil
if state.inline then
schedule(buf)
end
end
end
end)