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

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

Issue 1388783003: Spec change: include covering expressions into Extract Local protocol. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 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 7cd663785f5ff950c6a010770253133deb3732e0..1eb000c202f5a48ab890be5bd3460be6433030fe 100644
--- a/pkg/analysis_server/lib/src/generated_protocol.dart
+++ b/pkg/analysis_server/lib/src/generated_protocol.dart
@@ -14681,12 +14681,18 @@ class ConvertMethodToGetterOptions {
* extractLocalVariable feedback
*
* {
+ * "coveringExpressionOffsets": List<int>
+ * "coveringExpressionLengths": List<int>
* "names": List<String>
* "offsets": List<int>
* "lengths": List<int>
* }
*/
class ExtractLocalVariableFeedback extends RefactoringFeedback implements HasToJson {
+ List<int> _coveringExpressionOffsets;
+
+ List<int> _coveringExpressionLengths;
+
List<String> _names;
List<int> _offsets;
@@ -14694,6 +14700,36 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback implements HasToJ
List<int> _lengths;
/**
+ * The offsets of the expressions that cover the specified selection, from
+ * the down most to the up most.
+ */
+ List<int> get coveringExpressionOffsets => _coveringExpressionOffsets;
+
+ /**
+ * The offsets of the expressions that cover the specified selection, from
+ * the down most to the up most.
+ */
+ void set coveringExpressionOffsets(List<int> value) {
+ assert(value != null);
+ this._coveringExpressionOffsets = value;
+ }
+
+ /**
+ * The lengths of the expressions that cover the specified selection, from
+ * the down most to the up most.
+ */
+ List<int> get coveringExpressionLengths => _coveringExpressionLengths;
+
+ /**
+ * The lengths of the expressions that cover the specified selection, from
+ * the down most to the up most.
+ */
+ void set coveringExpressionLengths(List<int> value) {
+ assert(value != null);
+ this._coveringExpressionLengths = value;
+ }
+
+ /**
* The proposed names for the local variable.
*/
List<String> get names => _names;
@@ -14740,7 +14776,9 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback implements HasToJ
this._lengths = value;
}
- ExtractLocalVariableFeedback(List<String> names, List<int> offsets, List<int> lengths) {
+ ExtractLocalVariableFeedback(List<int> coveringExpressionOffsets, List<int> coveringExpressionLengths, List<String> names, List<int> offsets, List<int> lengths) {
+ this.coveringExpressionOffsets = coveringExpressionOffsets;
+ this.coveringExpressionLengths = coveringExpressionLengths;
this.names = names;
this.offsets = offsets;
this.lengths = lengths;
@@ -14751,6 +14789,18 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback implements HasToJ
json = {};
}
if (json is Map) {
+ List<int> coveringExpressionOffsets;
+ if (json.containsKey("coveringExpressionOffsets")) {
+ coveringExpressionOffsets = jsonDecoder._decodeList(jsonPath + ".coveringExpressionOffsets", json["coveringExpressionOffsets"], jsonDecoder._decodeInt);
+ } else {
+ throw jsonDecoder.missingKey(jsonPath, "coveringExpressionOffsets");
+ }
+ List<int> coveringExpressionLengths;
+ if (json.containsKey("coveringExpressionLengths")) {
+ coveringExpressionLengths = jsonDecoder._decodeList(jsonPath + ".coveringExpressionLengths", json["coveringExpressionLengths"], jsonDecoder._decodeInt);
+ } else {
+ throw jsonDecoder.missingKey(jsonPath, "coveringExpressionLengths");
+ }
List<String> names;
if (json.containsKey("names")) {
names = jsonDecoder._decodeList(jsonPath + ".names", json["names"], jsonDecoder._decodeString);
@@ -14769,7 +14819,7 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback implements HasToJ
} else {
throw jsonDecoder.missingKey(jsonPath, "lengths");
}
- return new ExtractLocalVariableFeedback(names, offsets, lengths);
+ return new ExtractLocalVariableFeedback(coveringExpressionOffsets, coveringExpressionLengths, names, offsets, lengths);
} else {
throw jsonDecoder.mismatch(jsonPath, "extractLocalVariable feedback", json);
}
@@ -14777,6 +14827,8 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback implements HasToJ
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
+ result["coveringExpressionOffsets"] = coveringExpressionOffsets;
+ result["coveringExpressionLengths"] = coveringExpressionLengths;
result["names"] = names;
result["offsets"] = offsets;
result["lengths"] = lengths;
@@ -14789,7 +14841,9 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback implements HasToJ
@override
bool operator==(other) {
if (other is ExtractLocalVariableFeedback) {
- return _listEqual(names, other.names, (String a, String b) => a == b) &&
+ return _listEqual(coveringExpressionOffsets, other.coveringExpressionOffsets, (int a, int b) => a == b) &&
+ _listEqual(coveringExpressionLengths, other.coveringExpressionLengths, (int a, int b) => a == b) &&
+ _listEqual(names, other.names, (String a, String b) => a == b) &&
_listEqual(offsets, other.offsets, (int a, int b) => a == b) &&
_listEqual(lengths, other.lengths, (int a, int b) => a == b);
}
@@ -14799,6 +14853,8 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback implements HasToJ
@override
int get hashCode {
int hash = 0;
+ hash = _JenkinsSmiHash.combine(hash, coveringExpressionOffsets.hashCode);
+ hash = _JenkinsSmiHash.combine(hash, coveringExpressionLengths.hashCode);
hash = _JenkinsSmiHash.combine(hash, names.hashCode);
hash = _JenkinsSmiHash.combine(hash, offsets.hashCode);
hash = _JenkinsSmiHash.combine(hash, lengths.hashCode);

Powered by Google App Engine
This is Rietveld 408576698