summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Roeser <le.petit.fou@web.de>2019-09-10 14:37:08 +0200
committerGitHub <noreply@github.com>2019-09-10 14:37:08 +0200
commitbc71cdb7d3f806ca5eeee2a9782ec6e2e5cf6bff (patch)
treec28c7b88dd9ccf2813b24cfb066abe88a70e3649
parentf9a9991687d6aa70e50ff2ec5ad4d9e039b7f723 (diff)
downloadmill-bc71cdb7d3f806ca5eeee2a9782ec6e2e5cf6bff.tar.gz
mill-bc71cdb7d3f806ca5eeee2a9782ec6e2e5cf6bff.tar.bz2
mill-bc71cdb7d3f806ca5eeee2a9782ec6e2e5cf6bff.zip
Changed JSON encoding for StackTraceElement (filename is nullable) (#691)
Fixes https://github.com/lihaoyi/mill/issues/690
-rw-r--r--main/api/src/mill/api/JsonFormatters.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/api/src/mill/api/JsonFormatters.scala b/main/api/src/mill/api/JsonFormatters.scala
index 23d7fad0..e5a3f682 100644
--- a/main/api/src/mill/api/JsonFormatters.scala
+++ b/main/api/src/mill/api/JsonFormatters.scala
@@ -33,7 +33,7 @@ trait JsonFormatters {
ste => ujson.Obj(
"declaringClass" -> ujson.Str(ste.getClassName),
"methodName" -> ujson.Str(ste.getMethodName),
- "fileName" -> ujson.Str(ste.getFileName),
+ "fileName" -> ujson.Arr(Option(ste.getFileName()).map(ujson.Str(_)).toSeq :_*),
"lineNumber" -> ujson.Num(ste.getLineNumber)
),
{
@@ -41,7 +41,7 @@ trait JsonFormatters {
new StackTraceElement(
json("declaringClass").str.toString,
json("methodName").str.toString,
- json("fileName").str.toString,
+ json("fileName").arr.headOption.map(_.str.toString).orNull,
json("lineNumber").num.toInt
)
}