From 4cc50c6bcdf754bf87da2d7ce68c11dad4d3ebb9 Mon Sep 17 00:00:00 2001
From: rhiannon morris <rhi@rhiannon.website>
Date: Wed, 1 Nov 2023 14:16:03 +0100
Subject: [PATCH] highlight errors even if real output is to a file

(unless told not to)
---
 exe/Main.idr    | 12 +++++++-----
 exe/Options.idr |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/exe/Main.idr b/exe/Main.idr
index f8b29ae..2ee4c6d 100644
--- a/exe/Main.idr
+++ b/exe/Main.idr
@@ -30,7 +30,7 @@ die opts err = do
 private
 runPretty : Options -> Eff Pretty a -> a
 runPretty opts act =
-  let doColor = opts.color && opts.outFile == Stdout
+  let doColor = opts.color && opts.outFile == Console
       hl      = if doColor then highlightSGR else noHighlight
   in
   runPrettyWith Outer opts.flavor hl 2 act
@@ -133,9 +133,9 @@ private
 outputStr : Lazy String -> Eff Compile ()
 outputStr str =
   case !(asksAt OPTS outFile) of
-    None   => pure ()
-    Stdout => putStr str
-    File f => do
+    None    => pure ()
+    Console => putStr str
+    File f  => do
       res <- withFile f WriteTruncate pure $ \h => fPutStr h str
       rethrow $ mapFst (WriteError f) res
 
@@ -221,7 +221,9 @@ main = do
   (_, opts, files) <- options
   case !(runCompile opts !newState $ traverse_ processFile files) of
     Right () => pure ()
-    Left  e  => die (Opts opts.width) $ runPretty opts $ prettyError e
+    Left  e  => die (Opts opts.width) $
+                runPretty ({outFile := Console} opts) $
+                prettyError e
 
 
 -----------------------------------
diff --git a/exe/Options.idr b/exe/Options.idr
index 8707fe3..299ce98 100644
--- a/exe/Options.idr
+++ b/exe/Options.idr
@@ -11,7 +11,7 @@ import Derive.Prelude
 %language ElabReflection
 
 public export
-data OutFile = File String | Stdout | None
+data OutFile = File String | Console | None
 %name OutFile f
 %runElab derive "OutFile" [Eq, Ord, Show]
 
@@ -44,7 +44,7 @@ export
 defaultOpts : IO Options
 defaultOpts = pure $ MkOpts {
   color   = True,
-  outFile = Stdout,
+  outFile = Console,
   until   = Nothing,
   flavor  = Unicode,
   width   = cast !getTermCols,
@@ -61,7 +61,7 @@ data OptAction = ShowHelp HelpType | Err String | Ok (Options -> Options)
 private
 toOutFile : String -> OptAction
 toOutFile ""  = Ok {outFile := None}
-toOutFile "-" = Ok {outFile := Stdout}
+toOutFile "-" = Ok {outFile := Console}
 toOutFile f   = Ok {outFile := File f}
 
 private