@@ -51,8 +51,7 @@ import Ide.Logger (Doc, Logger (Logger),
51
51
Recorder (logger_ ),
52
52
WithPriority (WithPriority ),
53
53
cmapWithPrio ,
54
- makeDefaultStderrRecorder ,
55
- toCologActionWithPrio )
54
+ makeDefaultStderrRecorder )
56
55
import Ide.Plugin.Config (Config )
57
56
import Ide.Types (IdePlugins (IdePlugins ))
58
57
import Language.LSP.Protocol.Message (Method (Method_Initialize ),
@@ -84,7 +83,7 @@ main = do
84
83
putStrLn $ showProgramVersionOfInterest programsOfInterest
85
84
putStrLn " Tool versions in your project"
86
85
cradle <- findProjectCradle' recorder False
87
- ghcVersion <- runExceptT $ getRuntimeGhcVersion' recorder cradle
86
+ ghcVersion <- runExceptT $ getRuntimeGhcVersion' cradle
88
87
putStrLn $ showProgramVersion " ghc" $ mkVersion =<< eitherToMaybe ghcVersion
89
88
90
89
VersionMode PrintVersion ->
@@ -124,7 +123,7 @@ launchHaskellLanguageServer recorder parsedArgs = do
124
123
case parsedArgs of
125
124
Ghcide GhcideArguments {.. } ->
126
125
when argsProjectGhcVersion $ do
127
- runExceptT (getRuntimeGhcVersion' recorder cradle) >>= \ case
126
+ runExceptT (getRuntimeGhcVersion' cradle) >>= \ case
128
127
Right ghcVersion -> putStrLn ghcVersion >> exitSuccess
129
128
Left err -> T. putStrLn (prettyError err NoShorten ) >> exitFailure
130
129
_ -> pure ()
@@ -147,7 +146,7 @@ launchHaskellLanguageServer recorder parsedArgs = do
147
146
hPutStrLn stderr " Consulting the cradle to get project GHC version..."
148
147
149
148
runExceptT $ do
150
- ghcVersion <- getRuntimeGhcVersion' recorder cradle
149
+ ghcVersion <- getRuntimeGhcVersion' cradle
151
150
liftIO $ hPutStrLn stderr $ " Project GHC version: " ++ ghcVersion
152
151
153
152
let
@@ -192,8 +191,8 @@ cradleResult cradleName CradleNone = throwE $ NoneCradleGhcVersion cradleName
192
191
193
192
-- | Version of 'getRuntimeGhcVersion' that dies if we can't get it, and also
194
193
-- checks to see if the tool is missing if it is one of
195
- getRuntimeGhcVersion' :: Recorder ( WithPriority ( Doc () )) -> Cradle Void -> ExceptT WrapperSetupError IO String
196
- getRuntimeGhcVersion' recorder cradle = do
194
+ getRuntimeGhcVersion' :: Cradle Void -> ExceptT WrapperSetupError IO String
195
+ getRuntimeGhcVersion' cradle = do
197
196
let cradleName = actionName (cradleOptsProg cradle)
198
197
199
198
-- See if the tool is installed
0 commit comments