Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: pkg/analysis_server/lib/src/generated_protocol.dart

Issue 1375163003: Specification change for the 'libraryName' and 'partOfLibraryName' fields in Outline. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 3 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
Index: pkg/analysis_server/lib/src/generated_protocol.dart
diff --git a/pkg/analysis_server/lib/src/generated_protocol.dart b/pkg/analysis_server/lib/src/generated_protocol.dart
index c396864e5774c7daff206676fea733c8cccd9d5d..d76b62b67134984cdf6c724c64f5c6812cfd2024 100644
--- a/pkg/analysis_server/lib/src/generated_protocol.dart
+++ b/pkg/analysis_server/lib/src/generated_protocol.dart
@@ -3158,14 +3158,20 @@ class AnalysisOccurrencesParams implements HasToJson {
*
* {
* "file": FilePath
+ * "libraryName": String
* "outline": Outline
+ * "partOfLibraryName": String
* }
*/
class AnalysisOutlineParams implements HasToJson {
String _file;
+ String _libraryName;
+
Outline _outline;
+ String _partOfLibraryName;
+
/**
* The file with which the outline is associated.
*/
@@ -3180,6 +3186,19 @@ class AnalysisOutlineParams implements HasToJson {
}
/**
+ * The name of the library defined by the file.
+ */
+ String get libraryName => _libraryName;
+
+ /**
+ * The name of the library defined by the file.
+ */
+ void set libraryName(String value) {
+ assert(value != null);
+ this._libraryName = value;
+ }
+
+ /**
* The outline associated with the file.
*/
Outline get outline => _outline;
@@ -3192,9 +3211,24 @@ class AnalysisOutlineParams implements HasToJson {
this._outline = value;
}
- AnalysisOutlineParams(String file, Outline outline) {
+ /**
+ * The name of the library the file in a part of.
+ */
+ String get partOfLibraryName => _partOfLibraryName;
+
+ /**
+ * The name of the library the file in a part of.
+ */
+ void set partOfLibraryName(String value) {
+ assert(value != null);
+ this._partOfLibraryName = value;
+ }
+
+ AnalysisOutlineParams(String file, String libraryName, Outline outline, String partOfLibraryName) {
this.file = file;
+ this.libraryName = libraryName;
this.outline = outline;
+ this.partOfLibraryName = partOfLibraryName;
}
factory AnalysisOutlineParams.fromJson(JsonDecoder jsonDecoder, String jsonPath, Object json) {
@@ -3208,13 +3242,25 @@ class AnalysisOutlineParams implements HasToJson {
} else {
throw jsonDecoder.missingKey(jsonPath, "file");
}
+ String libraryName;
+ if (json.containsKey("libraryName")) {
+ libraryName = jsonDecoder._decodeString(jsonPath + ".libraryName", json["libraryName"]);
+ } else {
+ throw jsonDecoder.missingKey(jsonPath, "libraryName");
+ }
Outline outline;
if (json.containsKey("outline")) {
outline = new Outline.fromJson(jsonDecoder, jsonPath + ".outline", json["outline"]);
} else {
throw jsonDecoder.missingKey(jsonPath, "outline");
}
- return new AnalysisOutlineParams(file, outline);
+ String partOfLibraryName;
+ if (json.containsKey("partOfLibraryName")) {
+ partOfLibraryName = jsonDecoder._decodeString(jsonPath + ".partOfLibraryName", json["partOfLibraryName"]);
+ } else {
+ throw jsonDecoder.missingKey(jsonPath, "partOfLibraryName");
+ }
+ return new AnalysisOutlineParams(file, libraryName, outline, partOfLibraryName);
} else {
throw jsonDecoder.mismatch(jsonPath, "analysis.outline params", json);
}
@@ -3228,7 +3274,9 @@ class AnalysisOutlineParams implements HasToJson {
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
result["file"] = file;
+ result["libraryName"] = libraryName;
result["outline"] = outline.toJson();
+ result["partOfLibraryName"] = partOfLibraryName;
return result;
}
@@ -3243,7 +3291,9 @@ class AnalysisOutlineParams implements HasToJson {
bool operator==(other) {
if (other is AnalysisOutlineParams) {
return file == other.file &&
- outline == other.outline;
+ libraryName == other.libraryName &&
+ outline == other.outline &&
+ partOfLibraryName == other.partOfLibraryName;
}
return false;
}
@@ -3252,7 +3302,9 @@ class AnalysisOutlineParams implements HasToJson {
int get hashCode {
int hash = 0;
hash = _JenkinsSmiHash.combine(hash, file.hashCode);
+ hash = _JenkinsSmiHash.combine(hash, libraryName.hashCode);
hash = _JenkinsSmiHash.combine(hash, outline.hashCode);
+ hash = _JenkinsSmiHash.combine(hash, partOfLibraryName.hashCode);
return _JenkinsSmiHash.finish(hash);
}
}

Powered by Google App Engine
This is Rietveld 408576698