Skip to content

Commit bf77caa

Browse files
phanenlewis6991
authored andcommitted
fix(blame): not stale if enter popup before result popup.update
1 parent 3f5ffea commit bf77caa

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lua/gitsigns/actions/blame_line.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,12 @@ return function(opts)
171171

172172
local fileformat = vim.bo[bufnr].fileformat
173173
local lnum = api.nvim_win_get_cursor(0)[1]
174+
local popup_winid, popup_bufnr
174175
---@async
175176
local function is_stale()
176177
return not bcache:schedule()
177-
or api.nvim_get_current_buf() ~= bufnr
178-
or api.nvim_win_get_cursor(0)[1] ~= lnum
178+
or api.nvim_get_current_buf() ~= popup_bufnr
179+
and (api.nvim_get_current_buf() ~= bufnr or api.nvim_win_get_cursor(0)[1] ~= lnum)
179180
end
180181
local info = bcache:get_blame(lnum, opts)
181182
pcall(function()
@@ -195,7 +196,7 @@ return function(opts)
195196
return
196197
end
197198

198-
local popup_winid, popup_bufnr = popup.create(blame_linespec, config.preview_config, 'blame')
199+
popup_winid, popup_bufnr = popup.create(blame_linespec, config.preview_config, 'blame')
199200

200201
blame_linespec = create_blame_linespec(opts.full, result, bcache.git_obj.repo, fileformat, true)
201202

0 commit comments

Comments
 (0)