52073d1 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Make --quiet imply --nocolour

This keeps ANSI colour codes from interfering with things like test scripts and editor support.

commit52073d161d5ebf426e7f10be988339ae5bac4704 authorDavid Christiansen <david@davidchristiansen.dk> dateWed 4 Sep 2013, 17:00 (13 years ago) parentc0342c7

2 files changed+5−4

compare with master

unifiedsplit

src/Idris/AbsSyntax.hs+4 src/Idris/REPL.hs+1−4

src/Idris/AbsSyntax.hs+4

@@ -485,6 +485,10 @@ colourise :: Idris Bool

485485colourise = do i <- getIState

486486 return $ idris_colourRepl i

487487

488+setColourise :: Bool -> Idris ()

489+setColourise b = do i <- getIState

490+ putIState $ i { idris_colourRepl = b }

491+

488492impShow :: Idris Bool

489493impShow = do i <- getIState

490494 return (opt_showimp (idris_options i))

src/Idris/REPL.hs+1−4

@@ -750,10 +750,7 @@ idrisMain opts =

750750 [expr] -> return (Just expr)

751751 when (DefaultTotal `elem` opts) $ do i <- getIState

752752 putIState (i { default_total = True })

753− case opt getColour opts of

754− [] -> return ()

755− xs -> do i <- getIState

756− putIState (i { idris_colourRepl = last xs })

753+ setColourise $ not quiet && last (True : opt getColour opts)

757754 mapM_ addLangExt (opt getLanguageExt opts)

758755 setREPL runrepl

759756 setQuiet (quiet || isJust script)