From 1faea9ca457c206561f2d9df5a6a415881d15941 Mon Sep 17 00:00:00 2001
From: Sean D Gillespie <sean@mistersg.net>
Date: Tue, 20 Aug 2024 16:43:39 -0400
Subject: [PATCH] Improve error message for `--probe-tools`
When `getRuntimeGhcVersion'` throws an error, display that error
---
exe/Wrapper.hs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/exe/Wrapper.hs b/exe/Wrapper.hs
index 3b80f37c49..2c2401ab6a 100644
--- a/exe/Wrapper.hs
+++ b/exe/Wrapper.hs
@@ -9,7 +9,6 @@ module Main where
import Control.Monad.Extra
import Data.Default
-import Data.Either.Extra (eitherToMaybe)
import Data.Foldable
import Data.List
import Data.List.Extra (trimEnd)
@@ -76,8 +75,11 @@ main = do
putStrLn $ showProgramVersionOfInterest programsOfInterest
putStrLn "Tool versions in your project"
cradle <- findProjectCradle' recorder False
- ghcVersion <- runExceptT $ getRuntimeGhcVersion' cradle
- putStrLn $ showProgramVersion "ghc" $ mkVersion =<< eitherToMaybe ghcVersion
+ runExceptT (getRuntimeGhcVersion' cradle) >>= \case
+ Left err ->
+ T.hPutStrLn stderr (prettyError err NoShorten)
+ Right ghcVersion ->
+ putStrLn $ showProgramVersion "ghc" $ mkVersion ghcVersion
VersionMode PrintVersion ->
putStrLn hlsVer