diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartDaemonParserUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartDaemonParserUtil.java index d14ad4569..ae0120261 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartDaemonParserUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartDaemonParserUtil.java @@ -16,8 +16,7 @@ public final class DartDaemonParserUtil { if (!text.startsWith("[{")) { return null; } - final JsonParser jsonParser = new JsonParser(); - final JsonElement jsonElement = jsonParser.parse(text); + final JsonElement jsonElement = JsonParser.parseString(text); if (jsonElement instanceof JsonArray && !jsonElement.getAsJsonArray().isEmpty()) { return jsonElement.getAsJsonArray().get(0).getAsJsonObject(); } diff --git a/third_party/thirdPartySrc/analysisServer/com/google/dart/server/internal/remote/ByteResponseStream.java b/third_party/thirdPartySrc/analysisServer/com/google/dart/server/internal/remote/ByteResponseStream.java index 15e442993..a01fd5db7 100644 --- a/third_party/thirdPartySrc/analysisServer/com/google/dart/server/internal/remote/ByteResponseStream.java +++ b/third_party/thirdPartySrc/analysisServer/com/google/dart/server/internal/remote/ByteResponseStream.java @@ -111,7 +111,7 @@ public JsonObject take() throws Exception { return null; } try { - return (JsonObject) new JsonParser().parse(line); + return (JsonObject) JsonParser.parseString(line); } catch (JsonSyntaxException e) { // Include the line in the message so that we can better diagnose the problem throw new JsonSyntaxException("Parse server message failed: " + line, e); diff --git a/third_party/thirdPartySrc/vmServiceDrivers/org/dartlang/vm/service/VmServiceBase.java b/third_party/thirdPartySrc/vmServiceDrivers/org/dartlang/vm/service/VmServiceBase.java index cf058e03c..b10104ec1 100644 --- a/third_party/thirdPartySrc/vmServiceDrivers/org/dartlang/vm/service/VmServiceBase.java +++ b/third_party/thirdPartySrc/vmServiceDrivers/org/dartlang/vm/service/VmServiceBase.java @@ -394,7 +394,7 @@ void processMessage(String jsonText) { // Decode the JSON JsonObject json; try { - json = (JsonObject) new JsonParser().parse(jsonText); + json = (JsonObject) JsonParser.parseString(jsonText); } catch (Exception e) { Logging.getLogger().logError("Parse message failed: " + jsonText, e); return;