Skip to content

Commit

Permalink
Cabal cradle: change error message on failure (#353)
Browse files Browse the repository at this point in the history
* Cabal cradle: change error message on failure

* Change wording of error msg
  • Loading branch information
smatting authored Jun 25, 2022
1 parent cf9a4bf commit 881f1e3
Showing 1 changed file with 21 additions and 9 deletions.
30 changes: 21 additions & 9 deletions src/HIE/Bios/Cradle.hs
Original file line number Diff line number Diff line change
Expand Up @@ -699,27 +699,39 @@ cabalAction
-> FilePath
-> CradleLoadResultT IO ComponentOptions
cabalAction workDir mc l fp = do
cabalProc <- cabalProcess workDir "v2-repl" [fromMaybe (fixTargetPath fp) mc] `modCradleError` \err -> do
let
cabalCommand = "v2-repl"
cabalArgs = [fromMaybe (fixTargetPath fp) mc]

cabalProc <- cabalProcess workDir cabalCommand cabalArgs `modCradleError` \err -> do
deps <- cabalCradleDependencies workDir workDir
pure $ err { cradleErrorDependencies = cradleErrorDependencies err ++ deps }

(ex, output, stde, [(_, maybeArgs)]) <- liftIO $ readProcessWithOutputs [hie_bios_output] l workDir cabalProc

let args = fromMaybe [] maybeArgs

let errorDetails =
["Failed command: " <> prettyCmdSpec (cmdspec cabalProc)
, unlines output
, unlines stde
, unlines $ args
, "Process Environment:"]
<> prettyProcessEnv cabalProc

when (ex /= ExitSuccess) $ do
deps <- liftIO $ cabalCradleDependencies workDir workDir
let cmd = show (["cabal", cabalCommand] <> cabalArgs)
let errorMsg = "Failed to run " <> cmd <> " in directory \"" <> workDir <> "\". Consult the logs for full command and error."
throwCE (CradleError deps ex ([errorMsg] <> errorDetails))

case processCabalWrapperArgs args of
Nothing -> do
-- Provide some dependencies an IDE can look for to trigger a reload.
-- Best effort. Assume the working directory is the
-- root of the component, so we are right in trivial cases at least.
deps <- liftIO $ cabalCradleDependencies workDir workDir
throwCE (CradleError deps ex $
[ "Failed to parse result of calling cabal"
, "Failed command: " <> prettyCmdSpec (cmdspec cabalProc)
, unlines output
, unlines stde
, unlines $ args
, "Process Environment:"]
<> prettyProcessEnv cabalProc)
(["Failed to parse result of calling cabal" ] <> errorDetails))
Just (componentDir, final_args) -> do
deps <- liftIO $ cabalCradleDependencies workDir componentDir
CradleLoadResultT $ pure $ makeCradleResult (ex, stde, componentDir, final_args) deps
Expand Down

0 comments on commit 881f1e3

Please sign in to comment.