Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Probe-tools: Print stack ghc version #3093

Merged
merged 5 commits into from
Aug 12, 2022
Merged

Probe-tools: Print stack ghc version #3093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9636f23
Probe-tools: Print stack ghc version
andys8 Aug 11, 2022
49bde68
Probetools: cradle ghc version added to wrapper
andys8 Aug 12, 2022
f66e9e8
Revert stack ghc changes to Ide.Main
andys8 Aug 12, 2022
13b0e15
Update exe/Wrapper.hs
andys8 Aug 12, 2022
6cfb608
Probe tools: Print version with padded spaces
andys8 Aug 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions exe/Wrapper.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module Main where
import Control.Monad.Extra
import Data.Char (isSpace)
import Data.Default
import Data.Either.Extra (eitherToMaybe)
import Data.Foldable
import Data.List
import Data.Void
Expand Down Expand Up @@ -79,6 +80,10 @@ main = do
putStrLn hlsVer
putStrLn "Tool versions found on the $PATH"
putStrLn $ showProgramVersionOfInterest programsOfInterest
putStrLn "Tool versions in your project"
cradle <- findProjectCradle' False
ghcVersion <- runExceptT $ getRuntimeGhcVersion' cradle
putStrLn $ showProgramVersion "ghc" $ mkVersion =<< eitherToMaybe ghcVersion

VersionMode PrintVersion ->
putStrLn hlsVer
Expand Down
20 changes: 14 additions & 6 deletions src/Ide/Version.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,17 @@ data ProgramsOfInterest = ProgramsOfInterest
showProgramVersionOfInterest :: ProgramsOfInterest -> String
showProgramVersionOfInterest ProgramsOfInterest {..} =
unlines
[ "cabal:\t\t" ++ showVersionWithDefault cabalVersion
, "stack:\t\t" ++ showVersionWithDefault stackVersion
, "ghc:\t\t" ++ showVersionWithDefault ghcVersion
[ showProgramVersion "cabal" cabalVersion
, showProgramVersion "stack" stackVersion
, showProgramVersion "ghc" ghcVersion
]

showProgramVersion :: String -> Maybe Version -> String
showProgramVersion name version =
pad 16 (name ++ ":") ++ showVersionWithDefault version
where
showVersionWithDefault :: Maybe Version -> String
showVersionWithDefault = maybe "Not found" showVersion
pad n s = s ++ replicate (n - length s) ' '

findProgramVersions :: IO ProgramsOfInterest
findProgramVersions = ProgramsOfInterest
Expand All @@ -69,8 +73,11 @@ findVersionOf tool =
Nothing -> pure Nothing
Just path ->
readProcessWithExitCode path ["--numeric-version"] "" >>= \case
(ExitSuccess, sout, _) -> pure $ consumeParser myVersionParser sout
(ExitSuccess, sout, _) -> pure $ mkVersion sout
_ -> pure Nothing

mkVersion :: String -> Maybe Version
mkVersion = consumeParser myVersionParser
where
myVersionParser = do
skipSpaces
Expand All @@ -79,4 +86,5 @@ findVersionOf tool =
pure version

consumeParser :: ReadP a -> String -> Maybe a
consumeParser p input = listToMaybe $ map fst . filter (null . snd) $ readP_to_S p input
consumeParser p input =
listToMaybe $ map fst . filter (null . snd) $ readP_to_S p input