editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/SourceFileEdit.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/SourceFileEdit.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/SourceChange.java ('k') | editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/generated/types/TypeHierarchyItem.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/SourceFileEdit.java

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

index 842d15c77860e0b630773c1844428916c547c8b0..a896f280c98b347dd702d4a18d224aa9a9e2f6b3 100644

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

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

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

public static SourceFileEdit fromJson(JsonObject jsonObject) {

String file = jsonObject.get("file").getAsString();

- List<SourceEdit> edits = SourceEdit.fromJsonArray(jsonObject.get("edits").getAsJsonArray());

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

return new SourceFileEdit(file, edits);

}

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

public JsonObject toJson() {

JsonObject jsonObject = new JsonObject();

jsonObject.addProperty("file", file);

- JsonArray jsonArrayEdits = new JsonArray();

- for(SourceEdit elt : edits) {

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

+ if (edits != null) {

+ JsonArray jsonArrayEdits = new JsonArray();

+ for(SourceEdit elt : edits) {

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

+ }

+ jsonObject.add("edits", jsonArrayEdits);

}

- jsonObject.add("edits", jsonArrayEdits);

return jsonObject;

}