Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-01-23 13:10:04 +08:00
Code Issues Projects Releases Wiki Activity

fix(git): check buf exists before show commit

Browse Source
This commit is contained in:
Eric Wong 2024-03-09 23:51:36 +08:00
parent 256e72f5e4
commit f11ad921eb
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bundle/git.vim/lua/git/command/log.lua
View File

@ -11,6 +11,7 @@ local bufnr = -1
local jobid = -1 local jobid = -1
local commit_bufnr = -1 local commit_bufnr = -1
local show_lines = {} local show_lines = {}
local show_commit_jobid = -1
local function close_commit_win() local function close_commit_win()
if vim.api.nvim_buf_is_valid(commit_bufnr) then if vim.api.nvim_buf_is_valid(commit_bufnr) then
@ -49,28 +50,37 @@ local function openShowCommitBuffer()
end end
local function on_show_stdout(id, data) local function on_show_stdout(id, data)
for _,v in ipairs(data) do if id ~= show_commit_jobid then
return
end
for _, v in ipairs(data) do
log.debug('git-show stdout:' .. v) log.debug('git-show stdout:' .. v)
table.insert(show_lines, v) table.insert(show_lines, v)
end end
end end
local function on_show_stderr(id, data) local function on_show_stderr(id, data)
for _,v in ipairs(data) do if id ~= show_commit_jobid then
return
end
for _, v in ipairs(data) do
log.debug('git-show stderr:' .. v) log.debug('git-show stderr:' .. v)
table.insert(show_lines, v) table.insert(show_lines, v)
end end
end end
local function on_show_exit(id, code, single) local function on_show_exit(id, code, single)
if id ~= show_commit_jobid then
return
end
log.debug('git-show exit code:' .. code .. ' single:' .. single) log.debug('git-show exit code:' .. code .. ' single:' .. single)
vim.api.nvim_buf_set_option(commit_bufnr, 'modifiable', true) if vim.api.nvim_buf_is_valid(commit_bufnr) then
vim.api.nvim_buf_set_lines(commit_bufnr, 0, -1, false, show_lines) vim.api.nvim_buf_set_option(commit_bufnr, 'modifiable', true)
vim.api.nvim_buf_set_option(commit_bufnr, 'modifiable', false) vim.api.nvim_buf_set_lines(commit_bufnr, 0, -1, false, show_lines)
vim.api.nvim_buf_set_option(commit_bufnr, 'modifiable', false)
end
end end
local function show_commit() local function show_commit()
local commit = vim.fn.matchstr(vim.fn.getline('.'), [[^[* |\\\/_]\+\zs[a-z0-9A-Z]\+]]) local commit = vim.fn.matchstr(vim.fn.getline('.'), [[^[* |\\\/_]\+\zs[a-z0-9A-Z]\+]])
if vim.fn.empty(commit) == 1 then if vim.fn.empty(commit) == 1 then
@ -81,7 +91,7 @@ local function show_commit()
end end
local cmd = { 'git', 'show', commit } local cmd = { 'git', 'show', commit }
show_lines = {} show_lines = {}
job.start(cmd, { show_commit_jobid = job.start(cmd, {
on_stdout = on_show_stdout, on_stdout = on_show_stdout,
on_stderr = on_show_stderr, on_stderr = on_show_stderr,
on_exit = on_show_exit, on_exit = on_show_exit,