hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

exe:ghc-mod: some output formatting changes

Browse Source
This commit is contained in:
Daniel Gröber 2015-03-05 16:51:38 +01:00
parent 01dde80385
commit bee3ec35ec
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/GHCMod.hs
View File

@ -73,7 +73,7 @@ usage =
-- TODO: Generate the stuff below automatically -- TODO: Generate the stuff below automatically
ghcModUsage :: String ghcModUsage :: String
ghcModUsage = ghcModUsage =
"Usage: ghc-mod [OPTIONS...] COMMAND [OPTIONS...] \n\ "Usage: ghc-mod [OPTIONS...] COMMAND [CMD_ARGS...] \n\
\*Global Options (OPTIONS)*\n\ \*Global Options (OPTIONS)*\n\
\ Global options can be specified before and after the command and\n\ \ Global options can be specified before and after the command and\n\
\ interspersed with command specific options\n\ \ interspersed with command specific options\n\
@ -383,7 +383,8 @@ progMain (globalOptions,cmdArgs) = do
(res,_) <- runGhcModT globalOptions $ ghcCommands cmdArgs (res,_) <- runGhcModT globalOptions $ ghcCommands cmdArgs
case res of case res of
Right s -> putStr s Right s -> putStr s
Left e -> exitError $ render (gmeDoc e) Left e -> exitError $
renderStyle style { ribbonsPerLine = 1.2 } (gmeDoc e)
-- Obtain ghc options by letting ourselfs be executed by -- Obtain ghc options by letting ourselfs be executed by
-- @cabal repl@ -- @cabal repl@
@ -524,7 +525,7 @@ newtype InvalidCommandLine = InvalidCommandLine (Either String String)
instance Exception InvalidCommandLine instance Exception InvalidCommandLine
exitError :: String -> IO a exitError :: String -> IO a
exitError msg = hPutStrLn stderr msg >> exitFailure exitError msg = hPutStrLn stderr (dropWhileEnd (=='\n') msg) >> exitFailure
fatalError :: String -> a fatalError :: String -> a
fatalError s = throw $ FatalError $ progName ++ ": " ++ s fatalError s = throw $ FatalError $ progName ++ ": " ++ s