refactor(iferr): use new runner
This commit is contained in:
parent
294c07c6aa
commit
ddf7d0c77b
2 changed files with 22 additions and 10 deletions
|
|
@ -23,4 +23,10 @@ function utils.notify(msg, lvl)
|
||||||
log.debug(msg)
|
log.debug(msg)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@param path string
|
||||||
|
---@return string
|
||||||
|
function utils.readfile_joined(path)
|
||||||
|
return vim.fn.join(vim.fn.readfile(path), "\n")
|
||||||
|
end
|
||||||
|
|
||||||
return utils
|
return utils
|
||||||
|
|
|
||||||
|
|
@ -4,27 +4,33 @@
|
||||||
---@usage Execute `:GoIfErr` near any `err` variable to insert the check
|
---@usage Execute `:GoIfErr` near any `err` variable to insert the check
|
||||||
|
|
||||||
local c = require "gopher.config"
|
local c = require "gopher.config"
|
||||||
|
local u = require "gopher._utils"
|
||||||
|
local r = require "gopher._utils.runner"
|
||||||
local log = require "gopher._utils.log"
|
local log = require "gopher._utils.log"
|
||||||
local iferr = {}
|
local iferr = {}
|
||||||
|
|
||||||
-- That's Lua implementation: github.com/koron/iferr
|
-- That's Lua implementation: https://github.com/koron/iferr
|
||||||
function iferr.iferr()
|
function iferr.iferr()
|
||||||
local boff = vim.fn.wordcount().cursor_bytes
|
local curb = vim.fn.wordcount().cursor_bytes
|
||||||
local pos = vim.fn.getcurpos()[2]
|
local pos = vim.fn.getcurpos()[2]
|
||||||
|
local fpath = vim.fn.expand "%"
|
||||||
|
|
||||||
local data = vim.fn.systemlist((c.commands.iferr .. " -pos " .. boff), vim.fn.bufnr "%")
|
local rs = r.sync({ c.commands.iferr, "-pos", curb }, {
|
||||||
if vim.v.shell_error ~= 0 then
|
stdin = u.readfile_joined(fpath),
|
||||||
if string.find(data[1], "no functions at") then
|
})
|
||||||
vim.print "no function found"
|
|
||||||
log.warn("iferr: no function at " .. boff)
|
if rs.code ~= 0 then
|
||||||
|
if string.find(rs.stderr, "no functions at") then
|
||||||
|
u.notify("iferr: no function at " .. curb, vim.log.levels.ERROR)
|
||||||
|
log.warn("iferr: no function at " .. curb)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
log.error("failed. output: " .. vim.inspect(data))
|
log.error("ferr: failed. output: " .. vim.inspect(rs.stderr))
|
||||||
error("iferr failed: " .. vim.inspect(data))
|
error("iferr failed: " .. rs.stderr)
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.fn.append(pos, data)
|
vim.fn.append(pos, vim.fn.split(rs.stdout, "\n"))
|
||||||
vim.cmd [[silent normal! j=2j]]
|
vim.cmd [[silent normal! j=2j]]
|
||||||
vim.fn.setpos(".", pos)
|
vim.fn.setpos(".", pos)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue