luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-03 16:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make JSON parsing errors more consistent

Browse Source
This commit is contained in:
Eugene Yokota
2020-06-11 20:31:13 -04:00
parent cad84afc6d
commit 033ff1d8a5
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/src/main/scala/sbt/protocol/Serialization.scala
+7 -6
View File
@@ -175,22 +175,23 @@ object Serialization {
if ((fields find { _.field == "id" }).isDefined)
Converter.fromJson[JsonRpcRequestMessage](json) match {
case Success(request) => Right(request)
case Failure(e) => Left(s"Conversion error: ${e.getMessage}")
case Failure(e) => Left(s"conversion error: ${e.getMessage}")
}
else
Converter.fromJson[JsonRpcNotificationMessage](json) match {
case Success(notification) => Right(notification)
case Failure(e) => Left(s"Conversion error: ${e.getMessage}")
case Failure(e) => Left(s"conversion error: ${e.getMessage}")
}
} else
} else if ((fields find { _.field == "id" }).isDefined)
Converter.fromJson[JsonRpcResponseMessage](json) match {
case Success(res) => Right(res)
case Failure(e) => Left(s"Conversion error: ${e.getMessage}")
case Failure(e) => Left(s"conversion error: ${e.getMessage}")
}
else Left(s"expected JSON-RPC object but found ${new String(bytes.toArray, "UTF-8")}")
case Success(json) =>
Left(s"Expected JSON object but found $json")
Left(s"expected JSON object but found ${new String(bytes.toArray, "UTF-8")}")
case Failure(e) =>
Left(s"Parse error: ${e.getMessage}")
Left(s"parse error: ${e.getMessage}")
}
}