From 180b77f1666da1ba8b4d95f0a043a09231333add Mon Sep 17 00:00:00 2001 From: TorchedSammy <38820196+TorchedSammy@users.noreply.github.com> Date: Sat, 28 May 2022 18:47:08 -0400 Subject: [PATCH] fix: replicate default runners for runnerHandler.exec to work --- nature/runner.lua | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/nature/runner.lua b/nature/runner.lua index 3bb2f9c..da64b5e 100644 --- a/nature/runner.lua +++ b/nature/runner.lua @@ -48,19 +48,9 @@ function runnerHandler.exec(cmd, runnerName) return r.run(cmd) end - +-- lsp shut up +hilbish = hilbish function runnerHandler.setCurrent(name) - local defaultRunners = { - hybrid = true, - hybridRev = true, - lua = true, - sh = true - } - if defaultRunners[name] then - hilbish.runner.setMode(name) - return - end - local r = runnerHandler.get(name) currentRunner = name @@ -70,3 +60,33 @@ end -- add functions to hilbish.runner for k, v in pairs(runnerHandler) do hilbish.runner[k] = v end +runnerHandler.add('hybrid', function(input) + local cmdStr = hilbish.aliases.resolve(input) + + local _, _, err = hilbish.runner.lua(cmdStr) + if not err then + return input, 0, nil + end + + return hilbish.runner.sh(input) +end) + +runnerHandler.add('hybridRev', function(input) + local _, _, err = hilbish.runner.sh(input) + if not err then + return input, 0, nil + end + + local cmdStr = hilbish.aliases.resolve(input) + return hilbish.runner.lua(cmdStr) +end) + +runnerHandler.add('lua', function(input) + local cmdStr = hilbish.aliases.resolve(input) + return hilbish.runner.lua(cmdStr) +end) + +runnerHandler.add('sh', function(input) + return hilbish.runner.sh(input) +end) +