languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 02:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update generators to not produce type annotations for variable declarations

Browse source 
Change-Id: Ia19c94b430192c606d12449011503d5ca8172feb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/133380
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Brian Wilkerson 2020-01-25 16:31:15 +00:00 committed by commit-bot@chromium.org
parent 9918987c59
commit 9609975262
6 changed files with 804 additions and 804 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

660
pkg/analysis_server/lib/protocol/protocol_generated.dart
View file

File diff suppressed because it is too large Load diff

4
pkg/analysis_server/tool/spec/codegen_dart_protocol.dart
View file

@ -738,7 +738,7 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator {
if (type == null) {
writeln('return ${className.hashCode};');
} else {
writeln('int hash = 0;');
writeln('var hash = 0;');
for (TypeObjectField field in type.fields) {
String valueToCombine;
if (field.value != null) {
@ -916,7 +916,7 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator {
writeln('@override');
writeln('Map<String, dynamic> toJson() {');
indent(() {
writeln('Map<String, dynamic> result = {};');
writeln('var result = <String, dynamic>{};');
for (TypeObjectField field in type.fields) {
String fieldNameString = literalString(field.name);
if (field.value != null) {

660
pkg/analysis_server_client/lib/src/protocol/protocol_generated.dart
View file

File diff suppressed because it is too large Load diff

100
pkg/analyzer_plugin/lib/protocol/protocol_common.dart
View file

@ -58,7 +58,7 @@ class AddContentOverlay implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['type'] = 'add';
result['content'] = content;
return result;
@ -77,7 +77,7 @@ class AddContentOverlay implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, 704418402);
hash = JenkinsSmiHash.combine(hash, content.hashCode);
return JenkinsSmiHash.finish(hash);
@ -307,7 +307,7 @@ class AnalysisError implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['severity'] = severity.toJson();
result['type'] = type.toJson();
result['location'] = location.toJson();
@ -352,7 +352,7 @@ class AnalysisError implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, severity.hashCode);
hash = JenkinsSmiHash.combine(hash, type.hashCode);
hash = JenkinsSmiHash.combine(hash, location.hashCode);
@ -567,7 +567,7 @@ class ChangeContentOverlay implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['type'] = 'change';
result['edits'] = edits.map((SourceEdit value) => value.toJson()).toList();
return result;
@ -587,7 +587,7 @@ class ChangeContentOverlay implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, 873118866);
hash = JenkinsSmiHash.combine(hash, edits.hashCode);
return JenkinsSmiHash.finish(hash);
@ -1090,7 +1090,7 @@ class CompletionSuggestion implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['relevance'] = relevance;
result['completion'] = completion;
@ -1179,7 +1179,7 @@ class CompletionSuggestion implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, relevance.hashCode);
hash = JenkinsSmiHash.combine(hash, completion.hashCode);
@ -1391,7 +1391,7 @@ class DiagnosticMessage implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['message'] = message;
result['location'] = location.toJson();
return result;
@ -1410,7 +1410,7 @@ class DiagnosticMessage implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, message.hashCode);
hash = JenkinsSmiHash.combine(hash, location.hashCode);
return JenkinsSmiHash.finish(hash);
@ -1634,7 +1634,7 @@ class Element implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['name'] = name;
if (location != null) {
@ -1672,7 +1672,7 @@ class Element implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, location.hashCode);
@ -2059,7 +2059,7 @@ class FoldingRegion implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['offset'] = offset;
result['length'] = length;
@ -2081,7 +2081,7 @@ class FoldingRegion implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@ -2169,7 +2169,7 @@ class HighlightRegion implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['type'] = type.toJson();
result['offset'] = offset;
result['length'] = length;
@ -2191,7 +2191,7 @@ class HighlightRegion implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, type.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@ -2903,7 +2903,7 @@ class KytheEntry implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['source'] = source.toJson();
if (kind != null) {
result['kind'] = kind;
@ -2935,7 +2935,7 @@ class KytheEntry implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, source.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, target.hashCode);
@ -3075,7 +3075,7 @@ class KytheVName implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['signature'] = signature;
result['corpus'] = corpus;
result['root'] = root;
@ -3101,7 +3101,7 @@ class KytheVName implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, signature.hashCode);
hash = JenkinsSmiHash.combine(hash, corpus.hashCode);
hash = JenkinsSmiHash.combine(hash, root.hashCode);
@ -3204,7 +3204,7 @@ class LinkedEditGroup implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['positions'] =
positions.map((Position value) => value.toJson()).toList();
result['length'] = length;
@ -3242,7 +3242,7 @@ class LinkedEditGroup implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, positions.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
hash = JenkinsSmiHash.combine(hash, suggestions.hashCode);
@ -3311,7 +3311,7 @@ class LinkedEditSuggestion implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['value'] = value;
result['kind'] = kind.toJson();
return result;
@ -3330,7 +3330,7 @@ class LinkedEditSuggestion implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, value.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
return JenkinsSmiHash.finish(hash);
@ -3525,7 +3525,7 @@ class Location implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['offset'] = offset;
result['length'] = length;
@ -3551,7 +3551,7 @@ class Location implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@ -3645,7 +3645,7 @@ class NavigationRegion implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['offset'] = offset;
result['length'] = length;
result['targets'] = targets;
@ -3667,7 +3667,7 @@ class NavigationRegion implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
hash = JenkinsSmiHash.combine(hash, targets.hashCode);
@ -3823,7 +3823,7 @@ class NavigationTarget implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['fileIndex'] = fileIndex;
result['offset'] = offset;
@ -3851,7 +3851,7 @@ class NavigationTarget implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, fileIndex.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
@ -3943,7 +3943,7 @@ class Occurrences implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['element'] = element.toJson();
result['offsets'] = offsets;
result['length'] = length;
@ -3965,7 +3965,7 @@ class Occurrences implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, element.hashCode);
hash = JenkinsSmiHash.combine(hash, offsets.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@ -4126,7 +4126,7 @@ class Outline implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['element'] = element.toJson();
result['offset'] = offset;
result['length'] = length;
@ -4157,7 +4157,7 @@ class Outline implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, element.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@ -4268,7 +4268,7 @@ class ParameterInfo implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['name'] = name;
result['type'] = type;
@ -4294,7 +4294,7 @@ class ParameterInfo implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, type.hashCode);
@ -4424,7 +4424,7 @@ class Position implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['offset'] = offset;
return result;
@ -4443,7 +4443,7 @@ class Position implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
return JenkinsSmiHash.finish(hash);
@ -4675,7 +4675,7 @@ class RefactoringMethodParameter implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
if (id != null) {
result['id'] = id;
}
@ -4705,7 +4705,7 @@ class RefactoringMethodParameter implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, id.hashCode);
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, type.hashCode);
@ -4858,7 +4858,7 @@ class RefactoringProblem implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['severity'] = severity.toJson();
result['message'] = message;
if (location != null) {
@ -4882,7 +4882,7 @@ class RefactoringProblem implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, severity.hashCode);
hash = JenkinsSmiHash.combine(hash, message.hashCode);
hash = JenkinsSmiHash.combine(hash, location.hashCode);
@ -5001,7 +5001,7 @@ class RemoveContentOverlay implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['type'] = 'remove';
return result;
}
@ -5019,7 +5019,7 @@ class RemoveContentOverlay implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, 114870849);
return JenkinsSmiHash.finish(hash);
}
@ -5166,7 +5166,7 @@ class SourceChange implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['message'] = message;
result['edits'] =
edits.map((SourceFileEdit value) => value.toJson()).toList();
@ -5218,7 +5218,7 @@ class SourceChange implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, message.hashCode);
hash = JenkinsSmiHash.combine(hash, edits.hashCode);
hash = JenkinsSmiHash.combine(hash, linkedEditGroups.hashCode);
@ -5346,7 +5346,7 @@ class SourceEdit implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['offset'] = offset;
result['length'] = length;
result['replacement'] = replacement;
@ -5375,7 +5375,7 @@ class SourceEdit implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
hash = JenkinsSmiHash.combine(hash, replacement.hashCode);
@ -5480,7 +5480,7 @@ class SourceFileEdit implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['fileStamp'] = fileStamp;
result['edits'] = edits.map((SourceEdit value) => value.toJson()).toList();
@ -5508,7 +5508,7 @@ class SourceFileEdit implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, fileStamp.hashCode);
hash = JenkinsSmiHash.combine(hash, edits.hashCode);

180
pkg/analyzer_plugin/lib/protocol/protocol_generated.dart
View file

@ -83,7 +83,7 @@ class AnalysisErrorFixes implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['error'] = error.toJson();
result['fixes'] =
fixes.map((PrioritizedSourceChange value) => value.toJson()).toList();
@ -105,7 +105,7 @@ class AnalysisErrorFixes implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, error.hashCode);
hash = JenkinsSmiHash.combine(hash, fixes.hashCode);
return JenkinsSmiHash.finish(hash);
@ -181,7 +181,7 @@ class AnalysisErrorsParams implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['errors'] =
errors.map((AnalysisError value) => value.toJson()).toList();
@ -207,7 +207,7 @@ class AnalysisErrorsParams implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, errors.hashCode);
return JenkinsSmiHash.finish(hash);
@ -283,7 +283,7 @@ class AnalysisFoldingParams implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['regions'] =
regions.map((FoldingRegion value) => value.toJson()).toList();
@ -309,7 +309,7 @@ class AnalysisFoldingParams implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, regions.hashCode);
return JenkinsSmiHash.finish(hash);
@ -405,7 +405,7 @@ class AnalysisGetNavigationParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['offset'] = offset;
result['length'] = length;
@ -432,7 +432,7 @@ class AnalysisGetNavigationParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@ -541,7 +541,7 @@ class AnalysisGetNavigationResult implements ResponseResult {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['files'] = files;
result['targets'] =
targets.map((NavigationTarget value) => value.toJson()).toList();
@ -572,7 +572,7 @@ class AnalysisGetNavigationResult implements ResponseResult {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, files.hashCode);
hash = JenkinsSmiHash.combine(hash, targets.hashCode);
hash = JenkinsSmiHash.combine(hash, regions.hashCode);
@ -631,7 +631,7 @@ class AnalysisHandleWatchEventsParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['events'] =
events.map((WatchEvent value) => value.toJson()).toList();
return result;
@ -656,7 +656,7 @@ class AnalysisHandleWatchEventsParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, events.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -757,7 +757,7 @@ class AnalysisHighlightsParams implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['regions'] =
regions.map((HighlightRegion value) => value.toJson()).toList();
@ -783,7 +783,7 @@ class AnalysisHighlightsParams implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, regions.hashCode);
return JenkinsSmiHash.finish(hash);
@ -907,7 +907,7 @@ class AnalysisNavigationParams implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['regions'] =
regions.map((NavigationRegion value) => value.toJson()).toList();
@ -939,7 +939,7 @@ class AnalysisNavigationParams implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, regions.hashCode);
hash = JenkinsSmiHash.combine(hash, targets.hashCode);
@ -1018,7 +1018,7 @@ class AnalysisOccurrencesParams implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['occurrences'] =
occurrences.map((Occurrences value) => value.toJson()).toList();
@ -1044,7 +1044,7 @@ class AnalysisOccurrencesParams implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, occurrences.hashCode);
return JenkinsSmiHash.finish(hash);
@ -1120,7 +1120,7 @@ class AnalysisOutlineParams implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['outline'] = outline.map((Outline value) => value.toJson()).toList();
return result;
@ -1144,7 +1144,7 @@ class AnalysisOutlineParams implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, outline.hashCode);
return JenkinsSmiHash.finish(hash);
@ -1272,7 +1272,7 @@ class AnalysisSetContextRootsParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['roots'] = roots.map((ContextRoot value) => value.toJson()).toList();
return result;
}
@ -1296,7 +1296,7 @@ class AnalysisSetContextRootsParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, roots.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -1376,7 +1376,7 @@ class AnalysisSetPriorityFilesParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['files'] = files;
return result;
}
@ -1399,7 +1399,7 @@ class AnalysisSetPriorityFilesParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, files.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -1486,7 +1486,7 @@ class AnalysisSetSubscriptionsParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['subscriptions'] = mapMap(subscriptions,
keyCallback: (AnalysisService value) => value.toJson());
return result;
@ -1514,7 +1514,7 @@ class AnalysisSetSubscriptionsParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -1605,7 +1605,7 @@ class AnalysisUpdateContentParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['files'] =
mapMap(files, valueCallback: (dynamic value) => value.toJson());
return result;
@ -1629,7 +1629,7 @@ class AnalysisUpdateContentParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, files.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -1727,7 +1727,7 @@ class CompletionGetSuggestionsParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['offset'] = offset;
return result;
@ -1751,7 +1751,7 @@ class CompletionGetSuggestionsParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
return JenkinsSmiHash.finish(hash);
@ -1873,7 +1873,7 @@ class CompletionGetSuggestionsResult implements ResponseResult {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['replacementOffset'] = replacementOffset;
result['replacementLength'] = replacementLength;
result['results'] =
@ -1902,7 +1902,7 @@ class CompletionGetSuggestionsResult implements ResponseResult {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, replacementOffset.hashCode);
hash = JenkinsSmiHash.combine(hash, replacementLength.hashCode);
hash = JenkinsSmiHash.combine(hash, results.hashCode);
@ -1994,7 +1994,7 @@ class ContextRoot implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['root'] = root;
result['exclude'] = exclude;
if (optionsFile != null) {
@ -2018,7 +2018,7 @@ class ContextRoot implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, root.hashCode);
hash = JenkinsSmiHash.combine(hash, exclude.hashCode);
hash = JenkinsSmiHash.combine(hash, optionsFile.hashCode);
@ -2186,7 +2186,7 @@ class EditGetAssistsParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['offset'] = offset;
result['length'] = length;
@ -2213,7 +2213,7 @@ class EditGetAssistsParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@ -2273,7 +2273,7 @@ class EditGetAssistsResult implements ResponseResult {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['assists'] =
assists.map((PrioritizedSourceChange value) => value.toJson()).toList();
return result;
@ -2298,7 +2298,7 @@ class EditGetAssistsResult implements ResponseResult {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, assists.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -2389,7 +2389,7 @@ class EditGetAvailableRefactoringsParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['offset'] = offset;
result['length'] = length;
@ -2416,7 +2416,7 @@ class EditGetAvailableRefactoringsParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
@ -2487,7 +2487,7 @@ class EditGetAvailableRefactoringsResult implements ResponseResult {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['kinds'] =
kinds.map((RefactoringKind value) => value.toJson()).toList();
return result;
@ -2512,7 +2512,7 @@ class EditGetAvailableRefactoringsResult implements ResponseResult {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, kinds.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -2583,7 +2583,7 @@ class EditGetFixesParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
result['offset'] = offset;
return result;
@ -2607,7 +2607,7 @@ class EditGetFixesParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
return JenkinsSmiHash.finish(hash);
@ -2666,7 +2666,7 @@ class EditGetFixesResult implements ResponseResult {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['fixes'] =
fixes.map((AnalysisErrorFixes value) => value.toJson()).toList();
return result;
@ -2691,7 +2691,7 @@ class EditGetFixesResult implements ResponseResult {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, fixes.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -2853,7 +2853,7 @@ class EditGetRefactoringParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['kind'] = kind.toJson();
result['file'] = file;
result['offset'] = offset;
@ -2888,7 +2888,7 @@ class EditGetRefactoringParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, kind.hashCode);
hash = JenkinsSmiHash.combine(hash, file.hashCode);
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
@ -3090,7 +3090,7 @@ class EditGetRefactoringResult implements ResponseResult {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['initialProblems'] = initialProblems
.map((RefactoringProblem value) => value.toJson())
.toList();
@ -3139,7 +3139,7 @@ class EditGetRefactoringResult implements ResponseResult {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, initialProblems.hashCode);
hash = JenkinsSmiHash.combine(hash, optionsProblems.hashCode);
hash = JenkinsSmiHash.combine(hash, finalProblems.hashCode);
@ -3288,7 +3288,7 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
if (coveringExpressionOffsets != null) {
result['coveringExpressionOffsets'] = coveringExpressionOffsets;
}
@ -3320,7 +3320,7 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, coveringExpressionOffsets.hashCode);
hash = JenkinsSmiHash.combine(hash, coveringExpressionLengths.hashCode);
hash = JenkinsSmiHash.combine(hash, names.hashCode);
@ -3404,7 +3404,7 @@ class ExtractLocalVariableOptions extends RefactoringOptions {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['name'] = name;
result['extractAll'] = extractAll;
return result;
@ -3423,7 +3423,7 @@ class ExtractLocalVariableOptions extends RefactoringOptions {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, extractAll.hashCode);
return JenkinsSmiHash.finish(hash);
@ -3637,7 +3637,7 @@ class ExtractMethodFeedback extends RefactoringFeedback {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['offset'] = offset;
result['length'] = length;
result['returnType'] = returnType;
@ -3675,7 +3675,7 @@ class ExtractMethodFeedback extends RefactoringFeedback {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
@ -3845,7 +3845,7 @@ class ExtractMethodOptions extends RefactoringOptions {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['returnType'] = returnType;
result['createGetter'] = createGetter;
result['name'] = name;
@ -3877,7 +3877,7 @@ class ExtractMethodOptions extends RefactoringOptions {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, returnType.hashCode);
hash = JenkinsSmiHash.combine(hash, createGetter.hashCode);
hash = JenkinsSmiHash.combine(hash, name.hashCode);
@ -3949,7 +3949,7 @@ class InlineLocalVariableFeedback extends RefactoringFeedback {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['name'] = name;
result['occurrences'] = occurrences;
return result;
@ -3968,7 +3968,7 @@ class InlineLocalVariableFeedback extends RefactoringFeedback {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, occurrences.hashCode);
return JenkinsSmiHash.finish(hash);
@ -4079,7 +4079,7 @@ class InlineMethodFeedback extends RefactoringFeedback {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
if (className != null) {
result['className'] = className;
}
@ -4103,7 +4103,7 @@ class InlineMethodFeedback extends RefactoringFeedback {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, className.hashCode);
hash = JenkinsSmiHash.combine(hash, methodName.hashCode);
hash = JenkinsSmiHash.combine(hash, isDeclaration.hashCode);
@ -4183,7 +4183,7 @@ class InlineMethodOptions extends RefactoringOptions {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['deleteSource'] = deleteSource;
result['inlineAll'] = inlineAll;
return result;
@ -4202,7 +4202,7 @@ class InlineMethodOptions extends RefactoringOptions {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, deleteSource.hashCode);
hash = JenkinsSmiHash.combine(hash, inlineAll.hashCode);
return JenkinsSmiHash.finish(hash);
@ -4258,7 +4258,7 @@ class KytheGetKytheEntriesParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['file'] = file;
return result;
}
@ -4281,7 +4281,7 @@ class KytheGetKytheEntriesParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, file.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -4366,7 +4366,7 @@ class KytheGetKytheEntriesResult implements ResponseResult {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['entries'] =
entries.map((KytheEntry value) => value.toJson()).toList();
result['files'] = files;
@ -4393,7 +4393,7 @@ class KytheGetKytheEntriesResult implements ResponseResult {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, entries.hashCode);
hash = JenkinsSmiHash.combine(hash, files.hashCode);
return JenkinsSmiHash.finish(hash);
@ -4466,7 +4466,7 @@ class MoveFileOptions extends RefactoringOptions {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['newFile'] = newFile;
return result;
}
@ -4484,7 +4484,7 @@ class MoveFileOptions extends RefactoringOptions {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, newFile.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -4585,7 +4585,7 @@ class PluginErrorParams implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['isFatal'] = isFatal;
result['message'] = message;
result['stackTrace'] = stackTrace;
@ -4611,7 +4611,7 @@ class PluginErrorParams implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, isFatal.hashCode);
hash = JenkinsSmiHash.combine(hash, message.hashCode);
hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode);
@ -4765,7 +4765,7 @@ class PluginVersionCheckParams implements RequestParams {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['byteStorePath'] = byteStorePath;
result['sdkPath'] = sdkPath;
result['version'] = version;
@ -4792,7 +4792,7 @@ class PluginVersionCheckParams implements RequestParams {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, byteStorePath.hashCode);
hash = JenkinsSmiHash.combine(hash, sdkPath.hashCode);
hash = JenkinsSmiHash.combine(hash, version.hashCode);
@ -4947,7 +4947,7 @@ class PluginVersionCheckResult implements ResponseResult {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['isCompatible'] = isCompatible;
result['name'] = name;
result['version'] = version;
@ -4981,7 +4981,7 @@ class PluginVersionCheckResult implements ResponseResult {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, isCompatible.hashCode);
hash = JenkinsSmiHash.combine(hash, name.hashCode);
hash = JenkinsSmiHash.combine(hash, version.hashCode);
@ -5055,7 +5055,7 @@ class PrioritizedSourceChange implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['priority'] = priority;
result['change'] = change.toJson();
return result;
@ -5074,7 +5074,7 @@ class PrioritizedSourceChange implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, priority.hashCode);
hash = JenkinsSmiHash.combine(hash, change.hashCode);
return JenkinsSmiHash.finish(hash);
@ -5098,7 +5098,7 @@ class RefactoringFeedback implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
return result;
}
@ -5115,7 +5115,7 @@ class RefactoringFeedback implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
return JenkinsSmiHash.finish(hash);
}
}
@ -5136,7 +5136,7 @@ class RefactoringOptions implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
return result;
}
@ -5153,7 +5153,7 @@ class RefactoringOptions implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
return JenkinsSmiHash.finish(hash);
}
}
@ -5261,7 +5261,7 @@ class RenameFeedback extends RefactoringFeedback {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['offset'] = offset;
result['length'] = length;
result['elementKindName'] = elementKindName;
@ -5285,7 +5285,7 @@ class RenameFeedback extends RefactoringFeedback {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, offset.hashCode);
hash = JenkinsSmiHash.combine(hash, length.hashCode);
hash = JenkinsSmiHash.combine(hash, elementKindName.hashCode);
@ -5342,7 +5342,7 @@ class RenameOptions extends RefactoringOptions {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['newName'] = newName;
return result;
}
@ -5360,7 +5360,7 @@ class RenameOptions extends RefactoringOptions {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, newName.hashCode);
return JenkinsSmiHash.finish(hash);
}
@ -5447,7 +5447,7 @@ class RequestError implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['code'] = code.toJson();
result['message'] = message;
if (stackTrace != null) {
@ -5471,7 +5471,7 @@ class RequestError implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, code.hashCode);
hash = JenkinsSmiHash.combine(hash, message.hashCode);
hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode);
@ -5621,7 +5621,7 @@ class WatchEvent implements HasToJson {
@override
Map<String, dynamic> toJson() {
Map<String, dynamic> result = {};
var result = <String, dynamic>{};
result['type'] = type.toJson();
result['path'] = path;
return result;
@ -5640,7 +5640,7 @@ class WatchEvent implements HasToJson {
@override
int get hashCode {
int hash = 0;
var hash = 0;
hash = JenkinsSmiHash.combine(hash, type.hashCode);
hash = JenkinsSmiHash.combine(hash, path.hashCode);
return JenkinsSmiHash.finish(hash);

4
pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart
View file

@ -662,7 +662,7 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator {
if (type == null) {
writeln('return ${className.hashCode};');
} else {
writeln('int hash = 0;');
writeln('var hash = 0;');
for (TypeObjectField field in type.fields) {
String valueToCombine;
if (field.value != null) {
@ -830,7 +830,7 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator {
writeln('@override');
writeln('Map<String, dynamic> toJson() {');
indent(() {
writeln('Map<String, dynamic> result = {};');
writeln('var result = <String, dynamic>{};');
for (TypeObjectField field in type.fields) {
String fieldNameString = literalString(field.name);
if (field.value != null) {