Skip to content

Commit

Permalink
fix(process): deal with process errors
Browse files Browse the repository at this point in the history
  • Loading branch information
folke committed Jun 29, 2024
1 parent 332a7ff commit a75d950
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
9 changes: 3 additions & 6 deletions lua/lazy/manage/process.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ function Process.new(cmd, opts)
opts = opts or {}
opts.args = opts.args or {}
if type(cmd) == "table" then
self.cmd = table.remove(cmd, 1)
vim.list_extend(opts.args, cmd)
self.cmd = cmd[1]
vim.list_extend(opts.args, vim.list_slice(cmd, 2))
else
self.cmd = cmd
end
Expand Down Expand Up @@ -233,10 +233,7 @@ function M.exec(cmd, opts)
opts = opts or {}
local proc = M.spawn(cmd, opts)
proc:wait()
if proc.code ~= 0 then
error("Process failed with code " .. proc.code)
end
return vim.split(proc.data, "\n")
return vim.split(proc.data, "\n"), proc.code
end

return M
13 changes: 11 additions & 2 deletions lua/lazy/util.lua
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,21 @@ end
---@param opts? LazyCmdOptions|{filetype?:string}
function M.float_cmd(cmd, opts)
opts = opts or {}
local Process = require("lazy.manage.process")
local lines, code = Process.exec(cmd, { cwd = opts.cwd })
if code ~= 0 then
M.error({
"`" .. table.concat(cmd, " ") .. "`",
"",
"## Error",
table.concat(lines, "\n"),
}, { title = "Command Failed (" .. code .. ")" })
return
end
local float = M.float(opts)
if opts.filetype then
vim.bo[float.buf].filetype = opts.filetype
end
local Process = require("lazy.manage.process")
local lines = Process.exec(cmd, { cwd = opts.cwd })
vim.api.nvim_buf_set_lines(float.buf, 0, -1, false, lines)
vim.bo[float.buf].modifiable = false
return float
Expand Down

0 comments on commit a75d950

Please sign in to comment.