Revert stack ghc changes to Ide.Main

Author: andys8

src/Ide/Version.hs

@@ -38,10 +38,9 @@ hlsVersion =
     hlsGhcDisplayVersion = compilerName ++ "-" ++ VERSION_ghc
 
 data ProgramsOfInterest = ProgramsOfInterest
-  { cabalVersion    :: Maybe Version
-  , stackVersion    :: Maybe Version
-  , ghcVersion      :: Maybe Version
-  , stackGhcVersion :: Maybe Version
+  { cabalVersion :: Maybe Version
+  , stackVersion :: Maybe Version
+  , ghcVersion   :: Maybe Version
   }
 
 showProgramVersionOfInterest :: ProgramsOfInterest -> String
@@ -50,27 +49,26 @@ showProgramVersionOfInterest ProgramsOfInterest {..} =
     [ "cabal:\t\t" ++ showVersionWithDefault cabalVersion
     , "stack:\t\t" ++ showVersionWithDefault stackVersion
     , "ghc:\t\t" ++ showVersionWithDefault ghcVersion
-    , "stack ghc:\t" ++ showVersionWithDefault stackGhcVersion
     ]
   where
     showVersionWithDefault :: Maybe Version -> String
     showVersionWithDefault = maybe "Not found" showVersion
 
 findProgramVersions :: IO ProgramsOfInterest
 findProgramVersions = ProgramsOfInterest
-  <$> findVersionOf "cabal" ["--numeric-version"]
-  <*> findVersionOf "stack" ["--numeric-version"]
-  <*> findVersionOf "ghc" ["--numeric-version"]
-  <*> findVersionOf "stack" ["ghc", "--", "--numeric-version"]
+  <$> findVersionOf "cabal"
+  <*> findVersionOf "stack"
+  <*> findVersionOf "ghc"
 
 -- | Find the version of the given program.
+-- Assumes the program accepts the cli argument "--numeric-version".
 -- If the invocation has a non-zero exit-code, we return 'Nothing'
-findVersionOf :: FilePath -> [String] -> IO (Maybe Version)
-findVersionOf tool args =
+findVersionOf :: FilePath -> IO (Maybe Version)
+findVersionOf tool =
   findExecutable tool >>= \case
     Nothing -> pure Nothing
     Just path ->
-      readProcessWithExitCode path args "" >>= \case
+      readProcessWithExitCode path ["--numeric-version"] "" >>= \case
         (ExitSuccess, sout, _) -> pure $ consumeParser myVersionParser sout
         _                      -> pure Nothing
   where