fix(statusline): special bufs sometimes clearing statusline components

Author: chrisgrieser

lua/tinygit/statusline/blame.lua

@@ -4,17 +4,18 @@ local u = require("tinygit.shared.utils")
 --------------------------------------------------------------------------------
 
 ---@param bufnr? number
----@return string blame lualine stringifys result, so need to return empty string instead of nil
+---@return string? blame lualine stringifys result, so need to return empty string instead of nil
 ---@nodiscard
 local function getBlame(bufnr)
 	bufnr = bufnr or 0
-	local config = require("tinygit.config").config.statusline.blame
+	local bufPath = vim.api.nvim_buf_get_name(bufnr)
 
 	-- GUARD valid buffer
-	if not vim.api.nvim_buf_is_valid(bufnr) then return "" end
-	if vim.api.nvim_get_option_value("buftype", { buf = bufnr }) ~= "" then return "" end
+	if not vim.api.nvim_buf_is_valid(bufnr) then return end
+	if vim.bo[bufnr].buftype ~= "" then return end
+	if vim.uv.fs_stat(bufPath) == nil then return end -- non-existing file
 
-	local bufPath = vim.api.nvim_buf_get_name(bufnr)
+	local config = require("tinygit.config").config.statusline.blame
 	local gitLogCmd = { "git", "log", "--max-count=1", "--format=%H\t%an\t%cr\t%s", "--", bufPath }
 	local gitLogResult = vim.system(gitLogCmd):wait()
 
@@ -48,12 +49,16 @@ end
 --------------------------------------------------------------------------------
 
 ---@param bufnr? number
-function M.refreshBlame(bufnr) vim.b["tinygit_blame"] = getBlame(bufnr) end
+function M.refreshBlame(bufnr)
+	bufnr = bufnr or 0
+	if not vim.api.nvim_buf_is_valid(bufnr) then return end
+	vim.b[bufnr].tinygit_blame = getBlame(bufnr)
+end
 
 vim.api.nvim_create_autocmd({ "BufEnter", "DirChanged", "FocusGained" }, {
 	group = vim.api.nvim_create_augroup("tinygit_blame", { clear = true }),
 	callback = function(ctx)
-		-- so buftype is set before checking the buffer
+		-- defer so buftype is set before checking the buffer
 		vim.defer_fn(function() M.refreshBlame(ctx.buf) end, 1)
 	end,
 })

lua/tinygit/statusline/branch-state.lua

@@ -1,11 +1,11 @@
 local M = {}
 --------------------------------------------------------------------------------
 
----@return string state lualine stringifys result, so need to return empty string instead of nil
+---@return string? state lualine stringifys result, so need to return empty string instead of nil
 ---@nodiscard
 local function getBranchState()
 	local cwd = vim.uv.cwd()
-	if not cwd then return "" end -- file without cwd
+	if not cwd then return end -- file without cwd
 
 	local allBranchInfo = vim.system({ "git", "-C", cwd, "branch", "--verbose" }):wait()
 	if allBranchInfo.code ~= 0 then return "" end -- not in git repo
@@ -34,15 +34,21 @@ end
 
 --------------------------------------------------------------------------------
 
-function M.refreshBranchState() vim.b.tinygit_branchState = getBranchState() end
+function M.refreshBranchState()
+	local state = getBranchState()
+	if state then vim.b.tinygit_branchState = state end
+end
 
 function M.getBranchState() return vim.b.tinygit_branchState or "" end
 
 vim.api.nvim_create_autocmd({ "BufEnter", "DirChanged", "FocusGained" }, {
 	group = vim.api.nvim_create_augroup("tinygit_branchState", { clear = true }),
-	callback = M.refreshBranchState,
+	callback = function()
+		-- defer so cwd changes take place before checking
+		vim.defer_fn(M.refreshBranchState, 1)
+	end,
 })
-M.refreshBranchState() -- initialize in case of lazy-loading
+vim.defer_fn(M.refreshBranchState, 1) -- initialize in case of lazy-loading
 
 --------------------------------------------------------------------------------
 return M

lua/tinygit/statusline/file-state.lua

@@ -1,11 +1,12 @@
 local M = {}
 --------------------------------------------------------------------------------
 
----@return string state lualine stringifys result, so need to return empty string instead of nil
+---@return string? state lualine stringifys result, so need to return empty string instead of nil
 ---@nodiscard
 local function getFileState()
-	local u = require("tinygit.shared.utils")
+	if not vim.uv.cwd() then return end -- file without cwd
 
+	local u = require("tinygit.shared.utils")
 	local gitroot = u.syncShellCmd { "git", "rev-parse", "--show-toplevel" }
 	if not gitroot then return "" end
 	local gitStatus = vim.system({ "git", "-C", gitroot, "status", "--porcelain" }):wait()
@@ -45,15 +46,21 @@ end
 
 --------------------------------------------------------------------------------
 
-function M.refreshFileState() vim.b.tinygit_fileState = getFileState() end
+function M.refreshFileState()
+	local state = getFileState()
+	if state then vim.b.tinygit_fileState = state end
+end
 
 function M.getFileState() return vim.b.tinygit_fileState or "" end
 
 vim.api.nvim_create_autocmd({ "BufEnter", "DirChanged", "FocusGained" }, {
-	group = vim.api.nvim_create_augroup("tinygit_branchState", { clear = true }),
-	callback = M.refreshFileState,
+	group = vim.api.nvim_create_augroup("tinygit_fileState", { clear = true }),
+	callback = function()
+		-- defer so cwd changes take place before checking
+		vim.defer_fn(M.refreshFileState, 1)
+	end,
 })
-M.refreshFileState() -- initialize in case of lazy-loading
+vim.defer_fn(M.refreshFileState, 1) -- initialize in case of lazy-loading
 
 --------------------------------------------------------------------------------
 return M