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

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

index 17ebdfc9b52769e7497fb391526041defe4c75ae..ca3d6792b333d90a198fa2c9111f788587053276 100644

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

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

@@ -80,7 +80,7 @@ public class Occurrences {

public static Occurrences fromJson(JsonObject jsonObject) {

Element element = Element.fromJson(jsonObject.get("element").getAsJsonObject());

- Integer[] offsets = JsonUtilities.decodeIntegerArray(jsonObject.get("offsets").getAsJsonArray());

+ Integer[] offsets = jsonObject.get("offsets") == null ? null : JsonUtilities.decodeIntegerArray(jsonObject.get("offsets").getAsJsonArray());

Integer length = jsonObject.get("length").getAsInt();

return new Occurrences(element, offsets, length);

}

@@ -121,11 +121,13 @@ public class Occurrences {

public JsonObject toJson() {

JsonObject jsonObject = new JsonObject();

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

- JsonArray jsonArrayOffsets = new JsonArray();

- for(Integer elt : offsets) {

- jsonArrayOffsets.add(new JsonPrimitive(elt));

+ if (offsets != null) {

+ JsonArray jsonArrayOffsets = new JsonArray();

+ for(Integer elt : offsets) {

+ jsonArrayOffsets.add(new JsonPrimitive(elt));

+ }

+ jsonObject.add("offsets", jsonArrayOffsets);

}

- jsonObject.add("offsets", jsonArrayOffsets);

jsonObject.addProperty("length", length);

return jsonObject;

}