git.iko.soy/elk
on master help sign in
Fix Report.toJson
4221bbcEvan Czaplicki
src/Reporting/Report.hs+12−5
compare with master
unifiedsplit
@@ -47,8 +47,8 @@ toJson extraFields (Report title subregion pre post) =
47 let
47 let
48 fields =
48 fields =
49 [ "tag" .= title
49 [ "tag" .= title
50− , "overview" .= displayS (renderPretty 1 80 pre) ""
50+ , "overview" .= nonAnsiRender pre
51− , "details" .= displayS (renderPretty 1 80 post) ""
51+ , "details" .= nonAnsiRender post
52 ]
52 ]
53 in
53 in
54 (subregion, fields ++ extraFields)
54 (subregion, fields ++ extraFields)
@@ -93,9 +93,16 @@ toHandle handle location region rprt source =
93
93
94toString :: String -> R.Region -> Report -> String -> String
94toString :: String -> R.Region -> Report -> String -> String
95toString location region rprt source =
95toString location region rprt source =
96− displayS
96+ nonAnsiRender (toDoc location region rprt source)
97+
98+
99+
100+-- DOC TO STRING WITH NO ANSI CODES
101+
102+
103+nonAnsiRender :: Doc -> String
104+nonAnsiRender doc =
97− (stripAnsi (renderPretty 1 80 (toDoc location region rprt source)))
105+ displayS (stripAnsi (renderPretty 1 80 doc)) ""
98− ""
99
106
100
107
101stripAnsi :: SimpleDoc -> SimpleDoc
108stripAnsi :: SimpleDoc -> SimpleDoc