git.iko.soy/elk
on master help sign in
Stop showing ANSI codes on unix-based OSes
4a39fdfEvan Czaplicki
src/Reporting/Report.hs+31−7
compare with master
unifiedsplit
@@ -13,7 +13,8 @@ import Data.Aeson ((.=))
13import qualified Data.Aeson.Types as Json
13import qualified Data.Aeson.Types as Json
14import System.IO (Handle)
14import System.IO (Handle)
15import Text.PrettyPrint.ANSI.Leijen
15import Text.PrettyPrint.ANSI.Leijen
16− ( Doc, (<>), displayS, displayIO, dullcyan, fillSep, hardline, renderPretty, text
16+ ( Doc, SimpleDoc(..), (<>), displayS, displayIO, dullcyan, fillSep
17+ , hardline, renderPretty, text
17 )
18 )
18
19
19import qualified Reporting.Region as R
20import qualified Reporting.Region as R
@@ -83,15 +84,38 @@ messageBar tag location =
83-- RENDER DOCS
84-- RENDER DOCS
84
85
85
86
87+toHandle :: Handle -> String -> R.Region -> Report -> String -> IO ()
88+toHandle handle location region rprt source =
89+ displayIO
90+ handle
91+ (renderPretty 1 80 (toDoc location region rprt source))
92+
93+
86toString :: String -> R.Region -> Report -> String -> String
94toString :: String -> R.Region -> Report -> String -> String
87toString location region rprt source =
95toString location region rprt source =
88 displayS
96 displayS
89− (renderPretty 1 80 (toDoc location region rprt source))
97+ (stripAnsi (renderPretty 1 80 (toDoc location region rprt source)))
90 ""
98 ""
91
99
92
100
93−toHandle :: Handle -> String -> R.Region -> Report -> String -> IO ()
101+stripAnsi :: SimpleDoc -> SimpleDoc
94−toHandle handle location region rprt source =
102+stripAnsi simpleDoc =
95− displayIO
103+ case simpleDoc of
96− handle
104+ SFail ->
97− (renderPretty 1 80 (toDoc location region rprt source))
105+ SFail
106+
107+ SEmpty ->
108+ SEmpty
109+
110+ SChar chr subDoc ->
111+ SChar chr (stripAnsi subDoc)
112+
113+ SText n str subDoc ->
114+ SText n str (stripAnsi subDoc)
115+
116+ SLine n subDoc ->
117+ SLine n (stripAnsi subDoc)
118+
119+ SSGR _ subDoc ->
120+ stripAnsi subDoc
121+