editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/ErrorFixes.java - Issue 482573004: Change analysis server protocol to omit empty lists when optional.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/ErrorFixes.java

Issue 482573004: Change analysis server protocol to omit empty lists when optional. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/ChangeContentOverlay.java ('k') | editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/LinkedEditGroup.java » ('j') | pkg/analysis_server/tool/spec/spec_input.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/ErrorFixes.java

diff --git a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/ErrorFixes.java b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/ErrorFixes.java

index 1fd161993b15beedf6d796c679d13b8a3fff2974..1ab24c3ad2e7a6b0b7e1aa5fb40fc16dbc7ca134 100644

--- a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/ErrorFixes.java

+++ b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/ErrorFixes.java

@@ -73,7 +73,7 @@ public class ErrorFixes {

public static ErrorFixes fromJson(JsonObject jsonObject) {

AnalysisError error = AnalysisError.fromJson(jsonObject.get("error").getAsJsonObject());

- List<SourceChange> fixes = SourceChange.fromJsonArray(jsonObject.get("fixes").getAsJsonArray());

+ List<SourceChange> fixes = jsonObject.get("fixes") == null ? null : SourceChange.fromJsonArray(jsonObject.get("fixes").getAsJsonArray());

return new ErrorFixes(error, fixes);

}

@@ -106,11 +106,13 @@ public class ErrorFixes {

public JsonObject toJson() {

JsonObject jsonObject = new JsonObject();

jsonObject.add("error", error.toJson());

- JsonArray jsonArrayFixes = new JsonArray();

- for(SourceChange elt : fixes) {

- jsonArrayFixes.add(elt.toJson());

+ if (fixes != null) {

+ JsonArray jsonArrayFixes = new JsonArray();

+ for(SourceChange elt : fixes) {

+ jsonArrayFixes.add(elt.toJson());

+ }

+ jsonObject.add("fixes", jsonArrayFixes);

}

- jsonObject.add("fixes", jsonArrayFixes);

return jsonObject;

}