diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 9ba9c1ecd90..6a44192e62e 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -11,7 +11,7 @@ "constraint, update this by running tools/generate_package_config.dart." ], "configVersion": 2, - "generated": "2021-09-10T11:44:31.694550", + "generated": "2021-09-21T21:00:34.058842", "generator": "tools/generate_package_config.dart", "packages": [ { @@ -82,7 +82,7 @@ "name": "analyzer", "rootUri": "../pkg/analyzer", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "analyzer_cli", @@ -476,7 +476,7 @@ "name": "nnbd_migration", "rootUri": "../pkg/nnbd_migration", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "oauth2", diff --git a/pkg/analysis_server/lib/lsp_protocol/protocol_special.dart b/pkg/analysis_server/lib/lsp_protocol/protocol_special.dart index 8f88db8780d..65c951344ed 100644 --- a/pkg/analysis_server/lib/lsp_protocol/protocol_special.dart +++ b/pkg/analysis_server/lib/lsp_protocol/protocol_special.dart @@ -7,7 +7,6 @@ import 'dart:async'; import 'package:analysis_server/lsp_protocol/protocol_generated.dart'; import 'package:analysis_server/src/lsp/json_parsing.dart'; import 'package:analysis_server/src/protocol/protocol_internal.dart'; -import 'package:analyzer/src/generated/utilities_general.dart'; const jsonRpcVersion = '2.0'; @@ -36,20 +35,15 @@ bool lspEquals(dynamic obj1, dynamic obj2) { /// Returns an objects hash code, recursively combining hashes for items in /// Maps/Lists. int lspHashCode(dynamic obj) { - var hash = 0; if (obj is List) { - for (var element in obj) { - hash = JenkinsSmiHash.combine(hash, lspHashCode(element)); - } + return Object.hashAll(obj.map(lspHashCode)); } else if (obj is Map) { - for (var key in obj.keys) { - hash = JenkinsSmiHash.combine(hash, lspHashCode(key)); - hash = JenkinsSmiHash.combine(hash, lspHashCode(obj[key])); - } + return Object.hashAll(obj.entries + .expand((element) => [element.key, element.value]) + .map(lspHashCode)); } else { - hash = obj.hashCode; + return obj.hashCode; } - return JenkinsSmiHash.finish(hash); } Object? specToJson(Object? obj) { diff --git a/pkg/analysis_server/lib/protocol/protocol_generated.dart b/pkg/analysis_server/lib/protocol/protocol_generated.dart index dcb4e02c6f0..118aac8e6ab 100644 --- a/pkg/analysis_server/lib/protocol/protocol_generated.dart +++ b/pkg/analysis_server/lib/protocol/protocol_generated.dart @@ -8,7 +8,6 @@ import 'dart:convert' hide JsonDecoder; -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:analysis_server/protocol/protocol.dart'; import 'package:analysis_server/src/protocol/protocol_internal.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; @@ -74,11 +73,7 @@ class AnalysisAnalyzedFilesParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, directories.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => directories.hashCode; } /// analysis.closingLabels params @@ -164,12 +159,10 @@ class AnalysisClosingLabelsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, labels.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + labels.hashCode, + ); } /// AnalysisErrorFixes @@ -240,12 +233,10 @@ class AnalysisErrorFixes implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, error.hashCode); - hash = JenkinsSmiHash.combine(hash, fixes.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + error.hashCode, + fixes.hashCode, + ); } /// analysis.errors params @@ -323,12 +314,10 @@ class AnalysisErrorsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, errors.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + errors.hashCode, + ); } /// analysis.flushResults params @@ -391,11 +380,7 @@ class AnalysisFlushResultsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => files.hashCode; } /// analysis.folding params @@ -473,12 +458,10 @@ class AnalysisFoldingParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + regions.hashCode, + ); } /// analysis.getErrors params @@ -539,11 +522,7 @@ class AnalysisGetErrorsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// analysis.getErrors result @@ -612,11 +591,7 @@ class AnalysisGetErrorsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, errors.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => errors.hashCode; } /// analysis.getHover params @@ -688,12 +663,10 @@ class AnalysisGetHoverParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// analysis.getHover result @@ -766,11 +739,7 @@ class AnalysisGetHoverResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, hovers.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => hovers.hashCode; } /// analysis.getImportedElements params @@ -856,13 +825,11 @@ class AnalysisGetImportedElementsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// analysis.getImportedElements result @@ -933,11 +900,7 @@ class AnalysisGetImportedElementsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => elements.hashCode; } /// analysis.getLibraryDependencies params @@ -961,9 +924,7 @@ class AnalysisGetLibraryDependenciesParams implements RequestParams { } @override - int get hashCode { - return 246577680; - } + int get hashCode => 246577680; } /// analysis.getLibraryDependencies result @@ -1057,12 +1018,10 @@ class AnalysisGetLibraryDependenciesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, libraries.hashCode); - hash = JenkinsSmiHash.combine(hash, packageMap.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + libraries.hashCode, + packageMap.hashCode, + ); } /// analysis.getNavigation params @@ -1150,13 +1109,11 @@ class AnalysisGetNavigationParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// analysis.getNavigation result @@ -1259,13 +1216,11 @@ class AnalysisGetNavigationResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - hash = JenkinsSmiHash.combine(hash, targets.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + files.hashCode, + targets.hashCode, + regions.hashCode, + ); } /// analysis.getReachableSources params @@ -1327,11 +1282,7 @@ class AnalysisGetReachableSourcesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// analysis.getReachableSources result @@ -1407,11 +1358,7 @@ class AnalysisGetReachableSourcesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, sources.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => sources.hashCode; } /// analysis.getSignature params @@ -1484,12 +1431,10 @@ class AnalysisGetSignatureParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// analysis.getSignature result @@ -1590,13 +1535,11 @@ class AnalysisGetSignatureResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, dartdoc.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + parameters.hashCode, + dartdoc.hashCode, + ); } /// analysis.highlights params @@ -1678,12 +1621,10 @@ class AnalysisHighlightsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + regions.hashCode, + ); } /// analysis.implemented params @@ -1780,13 +1721,11 @@ class AnalysisImplementedParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, classes.hashCode); - hash = JenkinsSmiHash.combine(hash, members.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + classes.hashCode, + members.hashCode, + ); } /// analysis.invalidate params @@ -1884,14 +1823,12 @@ class AnalysisInvalidateParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, delta.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + delta.hashCode, + ); } /// analysis.navigation params @@ -2008,14 +1945,12 @@ class AnalysisNavigationParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - hash = JenkinsSmiHash.combine(hash, targets.hashCode); - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + regions.hashCode, + targets.hashCode, + files.hashCode, + ); } /// analysis.occurrences params @@ -2094,12 +2029,10 @@ class AnalysisOccurrencesParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, occurrences.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + occurrences.hashCode, + ); } /// AnalysisOptions @@ -2282,18 +2215,16 @@ class AnalysisOptions implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, enableAsync.hashCode); - hash = JenkinsSmiHash.combine(hash, enableDeferredLoading.hashCode); - hash = JenkinsSmiHash.combine(hash, enableEnums.hashCode); - hash = JenkinsSmiHash.combine(hash, enableNullAwareOperators.hashCode); - hash = JenkinsSmiHash.combine(hash, enableSuperMixins.hashCode); - hash = JenkinsSmiHash.combine(hash, generateDart2jsHints.hashCode); - hash = JenkinsSmiHash.combine(hash, generateHints.hashCode); - hash = JenkinsSmiHash.combine(hash, generateLints.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + enableAsync.hashCode, + enableDeferredLoading.hashCode, + enableEnums.hashCode, + enableNullAwareOperators.hashCode, + enableSuperMixins.hashCode, + generateDart2jsHints.hashCode, + generateHints.hashCode, + generateLints.hashCode, + ); } /// analysis.outline params @@ -2397,14 +2328,12 @@ class AnalysisOutlineParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, libraryName.hashCode); - hash = JenkinsSmiHash.combine(hash, outline.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + kind.hashCode, + libraryName.hashCode, + outline.hashCode, + ); } /// analysis.overrides params @@ -2482,12 +2411,10 @@ class AnalysisOverridesParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, overrides.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + overrides.hashCode, + ); } /// analysis.reanalyze params @@ -2511,9 +2438,7 @@ class AnalysisReanalyzeParams implements RequestParams { } @override - int get hashCode { - return 613039876; - } + int get hashCode => 613039876; } /// analysis.reanalyze result @@ -2537,9 +2462,7 @@ class AnalysisReanalyzeResult implements ResponseResult { } @override - int get hashCode { - return 846803925; - } + int get hashCode => 846803925; } /// AnalysisService @@ -2743,13 +2666,11 @@ class AnalysisSetAnalysisRootsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, included.hashCode); - hash = JenkinsSmiHash.combine(hash, excluded.hashCode); - hash = JenkinsSmiHash.combine(hash, packageRoots.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + included.hashCode, + excluded.hashCode, + packageRoots.hashCode, + ); } /// analysis.setAnalysisRoots result @@ -2773,9 +2694,7 @@ class AnalysisSetAnalysisRootsResult implements ResponseResult { } @override - int get hashCode { - return 866004753; - } + int get hashCode => 866004753; } /// analysis.setGeneralSubscriptions params @@ -2844,11 +2763,7 @@ class AnalysisSetGeneralSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// analysis.setGeneralSubscriptions result @@ -2872,9 +2787,7 @@ class AnalysisSetGeneralSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 386759562; - } + int get hashCode => 386759562; } /// analysis.setPriorityFiles params @@ -2937,11 +2850,7 @@ class AnalysisSetPriorityFilesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => files.hashCode; } /// analysis.setPriorityFiles result @@ -2965,9 +2874,7 @@ class AnalysisSetPriorityFilesResult implements ResponseResult { } @override - int get hashCode { - return 330050055; - } + int get hashCode => 330050055; } /// analysis.setSubscriptions params @@ -3040,11 +2947,7 @@ class AnalysisSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// analysis.setSubscriptions result @@ -3068,9 +2971,7 @@ class AnalysisSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 218088493; - } + int get hashCode => 218088493; } /// AnalysisStatus @@ -3137,12 +3038,10 @@ class AnalysisStatus implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, isAnalyzing.hashCode); - hash = JenkinsSmiHash.combine(hash, analysisTarget.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + isAnalyzing.hashCode, + analysisTarget.hashCode, + ); } /// analysis.updateContent params @@ -3216,11 +3115,7 @@ class AnalysisUpdateContentParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => files.hashCode; } /// analysis.updateContent result @@ -3273,10 +3168,7 @@ class AnalysisUpdateContentResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// analysis.updateOptions params @@ -3339,11 +3231,7 @@ class AnalysisUpdateOptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, options.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => options.hashCode; } /// analysis.updateOptions result @@ -3367,9 +3255,7 @@ class AnalysisUpdateOptionsResult implements ResponseResult { } @override - int get hashCode { - return 179689467; - } + int get hashCode => 179689467; } /// analytics.enable params @@ -3430,11 +3316,7 @@ class AnalyticsEnableParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => value.hashCode; } /// analytics.enable result @@ -3458,9 +3340,7 @@ class AnalyticsEnableResult implements ResponseResult { } @override - int get hashCode { - return 237990792; - } + int get hashCode => 237990792; } /// analytics.isEnabled params @@ -3484,9 +3364,7 @@ class AnalyticsIsEnabledParams implements RequestParams { } @override - int get hashCode { - return 57215544; - } + int get hashCode => 57215544; } /// analytics.isEnabled result @@ -3550,11 +3428,7 @@ class AnalyticsIsEnabledResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, enabled.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => enabled.hashCode; } /// analytics.sendEvent params @@ -3615,11 +3489,7 @@ class AnalyticsSendEventParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, action.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => action.hashCode; } /// analytics.sendEvent result @@ -3643,9 +3513,7 @@ class AnalyticsSendEventResult implements ResponseResult { } @override - int get hashCode { - return 227063188; - } + int get hashCode => 227063188; } /// analytics.sendTiming params @@ -3717,12 +3585,10 @@ class AnalyticsSendTimingParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, event.hashCode); - hash = JenkinsSmiHash.combine(hash, millis.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + event.hashCode, + millis.hashCode, + ); } /// analytics.sendTiming result @@ -3746,9 +3612,7 @@ class AnalyticsSendTimingResult implements ResponseResult { } @override - int get hashCode { - return 875010924; - } + int get hashCode => 875010924; } /// AvailableSuggestion @@ -3941,19 +3805,17 @@ class AvailableSuggestion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, label.hashCode); - hash = JenkinsSmiHash.combine(hash, declaringLibraryUri.hashCode); - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultArgumentListString.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultArgumentListTextRanges.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterNames.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterTypes.hashCode); - hash = JenkinsSmiHash.combine(hash, relevanceTags.hashCode); - hash = JenkinsSmiHash.combine(hash, requiredParameterCount.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + label.hashCode, + declaringLibraryUri.hashCode, + element.hashCode, + defaultArgumentListString.hashCode, + defaultArgumentListTextRanges.hashCode, + parameterNames.hashCode, + parameterTypes.hashCode, + relevanceTags.hashCode, + requiredParameterCount.hashCode, + ); } /// AvailableSuggestionSet @@ -4033,13 +3895,11 @@ class AvailableSuggestionSet implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, uri.hashCode); - hash = JenkinsSmiHash.combine(hash, items.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + uri.hashCode, + items.hashCode, + ); } /// BulkFix @@ -4108,12 +3968,10 @@ class BulkFix implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, path.hashCode); - hash = JenkinsSmiHash.combine(hash, fixes.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + path.hashCode, + fixes.hashCode, + ); } /// BulkFixDetail @@ -4177,12 +4035,10 @@ class BulkFixDetail implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, code.hashCode); - hash = JenkinsSmiHash.combine(hash, occurrences.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + code.hashCode, + occurrences.hashCode, + ); } /// ClosingLabel @@ -4258,13 +4114,11 @@ class ClosingLabel implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, label.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + label.hashCode, + ); } /// completion.availableSuggestions params @@ -4355,12 +4209,10 @@ class CompletionAvailableSuggestionsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, changedLibraries.hashCode); - hash = JenkinsSmiHash.combine(hash, removedLibraries.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + changedLibraries.hashCode, + removedLibraries.hashCode, + ); } /// completion.existingImports params @@ -4434,12 +4286,10 @@ class CompletionExistingImportsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, imports.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + imports.hashCode, + ); } /// completion.getSuggestionDetails params @@ -4540,14 +4390,12 @@ class CompletionGetSuggestionDetailsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, label.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + id.hashCode, + label.hashCode, + offset.hashCode, + ); } /// completion.getSuggestionDetails result @@ -4627,12 +4475,10 @@ class CompletionGetSuggestionDetailsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, completion.hashCode); - hash = JenkinsSmiHash.combine(hash, change.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + completion.hashCode, + change.hashCode, + ); } /// completion.getSuggestions params @@ -4705,12 +4551,10 @@ class CompletionGetSuggestionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// completion.getSuggestions result @@ -4774,11 +4618,7 @@ class CompletionGetSuggestionsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// completion.registerLibraryPaths params @@ -4849,11 +4689,7 @@ class CompletionRegisterLibraryPathsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, paths.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => paths.hashCode; } /// completion.registerLibraryPaths result @@ -4877,9 +4713,7 @@ class CompletionRegisterLibraryPathsResult implements ResponseResult { } @override - int get hashCode { - return 104675661; - } + int get hashCode => 104675661; } /// completion.results params @@ -5111,20 +4945,17 @@ class CompletionResultsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, replacementOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, replacementLength.hashCode); - hash = JenkinsSmiHash.combine(hash, results.hashCode); - hash = JenkinsSmiHash.combine(hash, isLast.hashCode); - hash = JenkinsSmiHash.combine(hash, libraryFile.hashCode); - hash = JenkinsSmiHash.combine(hash, includedSuggestionSets.hashCode); - hash = JenkinsSmiHash.combine(hash, includedElementKinds.hashCode); - hash = - JenkinsSmiHash.combine(hash, includedSuggestionRelevanceTags.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + replacementOffset.hashCode, + replacementLength.hashCode, + results.hashCode, + isLast.hashCode, + libraryFile.hashCode, + includedSuggestionSets.hashCode, + includedElementKinds.hashCode, + includedSuggestionRelevanceTags.hashCode, + ); } /// CompletionService @@ -5246,11 +5077,7 @@ class CompletionSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// completion.setSubscriptions result @@ -5274,9 +5101,7 @@ class CompletionSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 2482770; - } + int get hashCode => 2482770; } /// ContextData @@ -5384,15 +5209,13 @@ class ContextData implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, explicitFileCount.hashCode); - hash = JenkinsSmiHash.combine(hash, implicitFileCount.hashCode); - hash = JenkinsSmiHash.combine(hash, workItemQueueLength.hashCode); - hash = JenkinsSmiHash.combine(hash, cacheEntryExceptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + explicitFileCount.hashCode, + implicitFileCount.hashCode, + workItemQueueLength.hashCode, + cacheEntryExceptions.hashCode, + ); } /// convertGetterToMethod feedback @@ -5409,9 +5232,7 @@ class ConvertGetterToMethodFeedback extends RefactoringFeedback } @override - int get hashCode { - return 616032599; - } + int get hashCode => 616032599; } /// convertGetterToMethod options @@ -5428,9 +5249,7 @@ class ConvertGetterToMethodOptions extends RefactoringOptions } @override - int get hashCode { - return 488848400; - } + int get hashCode => 488848400; } /// convertMethodToGetter feedback @@ -5447,9 +5266,7 @@ class ConvertMethodToGetterFeedback extends RefactoringFeedback } @override - int get hashCode { - return 165291526; - } + int get hashCode => 165291526; } /// convertMethodToGetter options @@ -5466,9 +5283,7 @@ class ConvertMethodToGetterOptions extends RefactoringOptions } @override - int get hashCode { - return 27952290; - } + int get hashCode => 27952290; } /// diagnostic.getDiagnostics params @@ -5492,9 +5307,7 @@ class DiagnosticGetDiagnosticsParams implements RequestParams { } @override - int get hashCode { - return 587526202; - } + int get hashCode => 587526202; } /// diagnostic.getDiagnostics result @@ -5564,11 +5377,7 @@ class DiagnosticGetDiagnosticsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, contexts.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => contexts.hashCode; } /// diagnostic.getServerPort params @@ -5592,9 +5401,7 @@ class DiagnosticGetServerPortParams implements RequestParams { } @override - int get hashCode { - return 367508704; - } + int get hashCode => 367508704; } /// diagnostic.getServerPort result @@ -5658,11 +5465,7 @@ class DiagnosticGetServerPortResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, port.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => port.hashCode; } /// edit.bulkFixes params @@ -5751,12 +5554,10 @@ class EditBulkFixesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, included.hashCode); - hash = JenkinsSmiHash.combine(hash, inTestMode.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + included.hashCode, + inTestMode.hashCode, + ); } /// edit.bulkFixes result @@ -5841,12 +5642,10 @@ class EditBulkFixesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - hash = JenkinsSmiHash.combine(hash, details.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + edits.hashCode, + details.hashCode, + ); } /// edit.format params @@ -5949,14 +5748,12 @@ class EditFormatParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode); - hash = JenkinsSmiHash.combine(hash, lineLength.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + selectionOffset.hashCode, + selectionLength.hashCode, + lineLength.hashCode, + ); } /// edit.format result @@ -6051,13 +5848,11 @@ class EditFormatResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + edits.hashCode, + selectionOffset.hashCode, + selectionLength.hashCode, + ); } /// edit.getAssists params @@ -6142,13 +5937,11 @@ class EditGetAssistsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// edit.getAssists result @@ -6217,11 +6010,7 @@ class EditGetAssistsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, assists.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => assists.hashCode; } /// edit.getAvailableRefactorings params @@ -6307,13 +6096,11 @@ class EditGetAvailableRefactoringsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// edit.getAvailableRefactorings result @@ -6383,11 +6170,7 @@ class EditGetAvailableRefactoringsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kinds.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => kinds.hashCode; } /// edit.getFixes params @@ -6459,12 +6242,10 @@ class EditGetFixesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// edit.getFixes result @@ -6533,11 +6314,7 @@ class EditGetFixesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, fixes.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => fixes.hashCode; } /// edit.getPostfixCompletion params @@ -6622,13 +6399,11 @@ class EditGetPostfixCompletionParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, key.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + key.hashCode, + offset.hashCode, + ); } /// edit.getPostfixCompletion result @@ -6693,11 +6468,7 @@ class EditGetPostfixCompletionResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, change.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => change.hashCode; } /// edit.getRefactoring params @@ -6832,16 +6603,14 @@ class EditGetRefactoringParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, validateOnly.hashCode); - hash = JenkinsSmiHash.combine(hash, options.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + file.hashCode, + offset.hashCode, + length.hashCode, + validateOnly.hashCode, + options.hashCode, + ); } /// edit.getRefactoring result @@ -7014,16 +6783,14 @@ class EditGetRefactoringResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, initialProblems.hashCode); - hash = JenkinsSmiHash.combine(hash, optionsProblems.hashCode); - hash = JenkinsSmiHash.combine(hash, finalProblems.hashCode); - hash = JenkinsSmiHash.combine(hash, feedback.hashCode); - hash = JenkinsSmiHash.combine(hash, change.hashCode); - hash = JenkinsSmiHash.combine(hash, potentialEdits.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + initialProblems.hashCode, + optionsProblems.hashCode, + finalProblems.hashCode, + feedback.hashCode, + change.hashCode, + potentialEdits.hashCode, + ); } /// edit.getStatementCompletion params @@ -7096,12 +6863,10 @@ class EditGetStatementCompletionParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// edit.getStatementCompletion result @@ -7179,12 +6944,10 @@ class EditGetStatementCompletionResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, change.hashCode); - hash = JenkinsSmiHash.combine(hash, whitespaceOnly.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + change.hashCode, + whitespaceOnly.hashCode, + ); } /// edit.importElements params @@ -7279,13 +7042,11 @@ class EditImportElementsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + elements.hashCode, + offset.hashCode, + ); } /// edit.importElements result @@ -7355,11 +7116,7 @@ class EditImportElementsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edit.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => edit.hashCode; } /// edit.isPostfixCompletionApplicable params @@ -7444,13 +7201,11 @@ class EditIsPostfixCompletionApplicableParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, key.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + key.hashCode, + offset.hashCode, + ); } /// edit.isPostfixCompletionApplicable result @@ -7515,11 +7270,7 @@ class EditIsPostfixCompletionApplicableResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => value.hashCode; } /// edit.listPostfixCompletionTemplates params @@ -7543,9 +7294,7 @@ class EditListPostfixCompletionTemplatesParams implements RequestParams { } @override - int get hashCode { - return 690713107; - } + int get hashCode => 690713107; } /// edit.listPostfixCompletionTemplates result @@ -7618,11 +7367,7 @@ class EditListPostfixCompletionTemplatesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, templates.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => templates.hashCode; } /// edit.organizeDirectives params @@ -7684,11 +7429,7 @@ class EditOrganizeDirectivesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// edit.organizeDirectives result @@ -7754,11 +7495,7 @@ class EditOrganizeDirectivesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edit.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => edit.hashCode; } /// edit.sortMembers params @@ -7819,11 +7556,7 @@ class EditSortMembersParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// edit.sortMembers result @@ -7888,11 +7621,7 @@ class EditSortMembersResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edit.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => edit.hashCode; } /// ElementDeclaration @@ -8084,21 +7813,19 @@ class ElementDeclaration implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, fileIndex.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, line.hashCode); - hash = JenkinsSmiHash.combine(hash, column.hashCode); - hash = JenkinsSmiHash.combine(hash, codeOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, codeLength.hashCode); - hash = JenkinsSmiHash.combine(hash, className.hashCode); - hash = JenkinsSmiHash.combine(hash, mixinName.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + kind.hashCode, + fileIndex.hashCode, + offset.hashCode, + line.hashCode, + column.hashCode, + codeOffset.hashCode, + codeLength.hashCode, + className.hashCode, + mixinName.hashCode, + parameters.hashCode, + ); } /// ExecutableFile @@ -8161,12 +7888,10 @@ class ExecutableFile implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + kind.hashCode, + ); } /// ExecutableKind @@ -8295,11 +8020,7 @@ class ExecutionCreateContextParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, contextRoot.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => contextRoot.hashCode; } /// execution.createContext result @@ -8363,11 +8084,7 @@ class ExecutionCreateContextResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// execution.deleteContext params @@ -8429,11 +8146,7 @@ class ExecutionDeleteContextParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// execution.deleteContext result @@ -8457,9 +8170,7 @@ class ExecutionDeleteContextResult implements ResponseResult { } @override - int get hashCode { - return 479954425; - } + int get hashCode => 479954425; } /// execution.getSuggestions params @@ -8623,16 +8334,14 @@ class ExecutionGetSuggestionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, code.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, contextFile.hashCode); - hash = JenkinsSmiHash.combine(hash, contextOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, variables.hashCode); - hash = JenkinsSmiHash.combine(hash, expressions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + code.hashCode, + offset.hashCode, + contextFile.hashCode, + contextOffset.hashCode, + variables.hashCode, + expressions.hashCode, + ); } /// execution.getSuggestions result @@ -8739,12 +8448,10 @@ class ExecutionGetSuggestionsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, suggestions.hashCode); - hash = JenkinsSmiHash.combine(hash, expressions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + suggestions.hashCode, + expressions.hashCode, + ); } /// execution.launchData params @@ -8838,13 +8545,11 @@ class ExecutionLaunchDataParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, referencedFiles.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + kind.hashCode, + referencedFiles.hashCode, + ); } /// execution.mapUri params @@ -8929,13 +8634,11 @@ class ExecutionMapUriParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, uri.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + file.hashCode, + uri.hashCode, + ); } /// execution.mapUri result @@ -9013,12 +8716,10 @@ class ExecutionMapUriResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, uri.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + uri.hashCode, + ); } /// ExecutionService @@ -9130,11 +8831,7 @@ class ExecutionSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// execution.setSubscriptions result @@ -9158,9 +8855,7 @@ class ExecutionSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 287678780; - } + int get hashCode => 287678780; } /// ExistingImport @@ -9225,12 +8920,10 @@ class ExistingImport implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, uri.hashCode); - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + uri.hashCode, + elements.hashCode, + ); } /// ExistingImports @@ -9300,12 +8993,10 @@ class ExistingImports implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - hash = JenkinsSmiHash.combine(hash, imports.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + elements.hashCode, + imports.hashCode, + ); } /// extractLocalVariable feedback @@ -9427,15 +9118,13 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback { } @override - int get hashCode { - var 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); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + coveringExpressionOffsets.hashCode, + coveringExpressionLengths.hashCode, + names.hashCode, + offsets.hashCode, + lengths.hashCode, + ); } /// extractLocalVariable options @@ -9508,12 +9197,10 @@ class ExtractLocalVariableOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, extractAll.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + extractAll.hashCode, + ); } /// extractMethod feedback @@ -9673,18 +9360,16 @@ class ExtractMethodFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, names.hashCode); - hash = JenkinsSmiHash.combine(hash, canCreateGetter.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, offsets.hashCode); - hash = JenkinsSmiHash.combine(hash, lengths.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + returnType.hashCode, + names.hashCode, + canCreateGetter.hashCode, + parameters.hashCode, + offsets.hashCode, + lengths.hashCode, + ); } /// extractMethod options @@ -9817,15 +9502,13 @@ class ExtractMethodOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, createGetter.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, extractAll.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + returnType.hashCode, + createGetter.hashCode, + name.hashCode, + parameters.hashCode, + extractAll.hashCode, + ); } /// extractWidget feedback @@ -9865,10 +9548,7 @@ class ExtractWidgetFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// extractWidget options @@ -9925,11 +9605,7 @@ class ExtractWidgetOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => name.hashCode; } /// FileKind @@ -10051,12 +9727,10 @@ class FlutterGetWidgetDescriptionParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// flutter.getWidgetDescription result @@ -10130,11 +9804,7 @@ class FlutterGetWidgetDescriptionResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, properties.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => properties.hashCode; } /// FlutterOutline @@ -10374,22 +10044,20 @@ class FlutterOutline implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, codeOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, codeLength.hashCode); - hash = JenkinsSmiHash.combine(hash, label.hashCode); - hash = JenkinsSmiHash.combine(hash, dartElement.hashCode); - hash = JenkinsSmiHash.combine(hash, attributes.hashCode); - hash = JenkinsSmiHash.combine(hash, className.hashCode); - hash = JenkinsSmiHash.combine(hash, parentAssociationLabel.hashCode); - hash = JenkinsSmiHash.combine(hash, variableName.hashCode); - hash = JenkinsSmiHash.combine(hash, children.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + offset.hashCode, + length.hashCode, + codeOffset.hashCode, + codeLength.hashCode, + label.hashCode, + dartElement.hashCode, + attributes.hashCode, + className.hashCode, + parentAssociationLabel.hashCode, + variableName.hashCode, + children.hashCode, + ); } /// FlutterOutlineAttribute @@ -10540,17 +10208,15 @@ class FlutterOutlineAttribute implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, label.hashCode); - hash = JenkinsSmiHash.combine(hash, literalValueBoolean.hashCode); - hash = JenkinsSmiHash.combine(hash, literalValueInteger.hashCode); - hash = JenkinsSmiHash.combine(hash, literalValueString.hashCode); - hash = JenkinsSmiHash.combine(hash, nameLocation.hashCode); - hash = JenkinsSmiHash.combine(hash, valueLocation.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + label.hashCode, + literalValueBoolean.hashCode, + literalValueInteger.hashCode, + literalValueString.hashCode, + nameLocation.hashCode, + valueLocation.hashCode, + ); } /// FlutterOutlineKind @@ -10710,12 +10376,10 @@ class FlutterOutlineParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, outline.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + outline.hashCode, + ); } /// FlutterService @@ -10832,11 +10496,7 @@ class FlutterSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// flutter.setSubscriptions result @@ -10860,9 +10520,7 @@ class FlutterSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 628296315; - } + int get hashCode => 628296315; } /// flutter.setWidgetPropertyValue params @@ -10949,12 +10607,10 @@ class FlutterSetWidgetPropertyValueParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + value.hashCode, + ); } /// flutter.setWidgetPropertyValue result @@ -11019,11 +10675,7 @@ class FlutterSetWidgetPropertyValueResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, change.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => change.hashCode; } /// FlutterWidgetProperty @@ -11214,19 +10866,17 @@ class FlutterWidgetProperty implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, documentation.hashCode); - hash = JenkinsSmiHash.combine(hash, expression.hashCode); - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, isRequired.hashCode); - hash = JenkinsSmiHash.combine(hash, isSafeToUpdate.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, children.hashCode); - hash = JenkinsSmiHash.combine(hash, editor.hashCode); - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + documentation.hashCode, + expression.hashCode, + id.hashCode, + isRequired.hashCode, + isSafeToUpdate.hashCode, + name.hashCode, + children.hashCode, + editor.hashCode, + value.hashCode, + ); } /// FlutterWidgetPropertyEditor @@ -11301,12 +10951,10 @@ class FlutterWidgetPropertyEditor implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, enumItems.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + enumItems.hashCode, + ); } /// FlutterWidgetPropertyEditorKind @@ -11529,16 +11177,14 @@ class FlutterWidgetPropertyValue implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, boolValue.hashCode); - hash = JenkinsSmiHash.combine(hash, doubleValue.hashCode); - hash = JenkinsSmiHash.combine(hash, intValue.hashCode); - hash = JenkinsSmiHash.combine(hash, stringValue.hashCode); - hash = JenkinsSmiHash.combine(hash, enumValue.hashCode); - hash = JenkinsSmiHash.combine(hash, expression.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + boolValue.hashCode, + doubleValue.hashCode, + intValue.hashCode, + stringValue.hashCode, + enumValue.hashCode, + expression.hashCode, + ); } /// FlutterWidgetPropertyValueEnumItem @@ -11637,14 +11283,12 @@ class FlutterWidgetPropertyValueEnumItem implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, libraryUri.hashCode); - hash = JenkinsSmiHash.combine(hash, className.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, documentation.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + libraryUri.hashCode, + className.hashCode, + name.hashCode, + documentation.hashCode, + ); } /// GeneralAnalysisService @@ -11935,22 +11579,20 @@ class HoverInformation implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, containingLibraryPath.hashCode); - hash = JenkinsSmiHash.combine(hash, containingLibraryName.hashCode); - hash = JenkinsSmiHash.combine(hash, containingClassDescription.hashCode); - hash = JenkinsSmiHash.combine(hash, dartdoc.hashCode); - hash = JenkinsSmiHash.combine(hash, elementDescription.hashCode); - hash = JenkinsSmiHash.combine(hash, elementKind.hashCode); - hash = JenkinsSmiHash.combine(hash, isDeprecated.hashCode); - hash = JenkinsSmiHash.combine(hash, parameter.hashCode); - hash = JenkinsSmiHash.combine(hash, propagatedType.hashCode); - hash = JenkinsSmiHash.combine(hash, staticType.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + containingLibraryPath.hashCode, + containingLibraryName.hashCode, + containingClassDescription.hashCode, + dartdoc.hashCode, + elementDescription.hashCode, + elementKind.hashCode, + isDeprecated.hashCode, + parameter.hashCode, + propagatedType.hashCode, + staticType.hashCode, + ); } /// ImplementedClass @@ -12012,12 +11654,10 @@ class ImplementedClass implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + ); } /// ImplementedMember @@ -12079,12 +11719,10 @@ class ImplementedMember implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + ); } /// ImportedElementSet @@ -12163,13 +11801,11 @@ class ImportedElementSet implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, strings.hashCode); - hash = JenkinsSmiHash.combine(hash, uris.hashCode); - hash = JenkinsSmiHash.combine(hash, names.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + strings.hashCode, + uris.hashCode, + names.hashCode, + ); } /// ImportedElements @@ -12246,13 +11882,11 @@ class ImportedElements implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, path.hashCode); - hash = JenkinsSmiHash.combine(hash, prefix.hashCode); - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + path.hashCode, + prefix.hashCode, + elements.hashCode, + ); } /// IncludedSuggestionRelevanceTag @@ -12318,12 +11952,10 @@ class IncludedSuggestionRelevanceTag implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, tag.hashCode); - hash = JenkinsSmiHash.combine(hash, relevanceBoost.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + tag.hashCode, + relevanceBoost.hashCode, + ); } /// IncludedSuggestionSet @@ -12409,13 +12041,11 @@ class IncludedSuggestionSet implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, relevance.hashCode); - hash = JenkinsSmiHash.combine(hash, displayUri.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + relevance.hashCode, + displayUri.hashCode, + ); } /// inlineLocalVariable feedback @@ -12479,12 +12109,10 @@ class InlineLocalVariableFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, occurrences.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + occurrences.hashCode, + ); } /// inlineLocalVariable options @@ -12501,9 +12129,7 @@ class InlineLocalVariableOptions extends RefactoringOptions } @override - int get hashCode { - return 540364977; - } + int get hashCode => 540364977; } /// inlineMethod feedback @@ -12585,13 +12211,11 @@ class InlineMethodFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, className.hashCode); - hash = JenkinsSmiHash.combine(hash, methodName.hashCode); - hash = JenkinsSmiHash.combine(hash, isDeclaration.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + className.hashCode, + methodName.hashCode, + isDeclaration.hashCode, + ); } /// inlineMethod options @@ -12663,12 +12287,10 @@ class InlineMethodOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, deleteSource.hashCode); - hash = JenkinsSmiHash.combine(hash, inlineAll.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + deleteSource.hashCode, + inlineAll.hashCode, + ); } /// kythe.getKytheEntries params @@ -12731,11 +12353,7 @@ class KytheGetKytheEntriesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// kythe.getKytheEntries result @@ -12821,12 +12439,10 @@ class KytheGetKytheEntriesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, entries.hashCode); - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + entries.hashCode, + files.hashCode, + ); } /// LibraryPathSet @@ -12894,12 +12510,10 @@ class LibraryPathSet implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, scope.hashCode); - hash = JenkinsSmiHash.combine(hash, libraryPaths.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + scope.hashCode, + libraryPaths.hashCode, + ); } /// moveFile feedback @@ -12915,9 +12529,7 @@ class MoveFileFeedback extends RefactoringFeedback implements HasToJson { } @override - int get hashCode { - return 438975893; - } + int get hashCode => 438975893; } /// moveFile options @@ -12975,11 +12587,7 @@ class MoveFileOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, newFile.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => newFile.hashCode; } /// OverriddenMember @@ -13043,12 +12651,10 @@ class OverriddenMember implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, className.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + element.hashCode, + className.hashCode, + ); } /// Override @@ -13152,14 +12758,12 @@ class Override implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, superclassMember.hashCode); - hash = JenkinsSmiHash.combine(hash, interfaceMembers.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + superclassMember.hashCode, + interfaceMembers.hashCode, + ); } /// PostfixTemplateDescriptor @@ -13234,13 +12838,11 @@ class PostfixTemplateDescriptor implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, key.hashCode); - hash = JenkinsSmiHash.combine(hash, example.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + key.hashCode, + example.hashCode, + ); } /// PubStatus @@ -13293,11 +12895,7 @@ class PubStatus implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, isListingPackageDirs.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => isListingPackageDirs.hashCode; } /// RefactoringFeedback @@ -13333,10 +12931,7 @@ class RefactoringFeedback implements HasToJson { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// RefactoringOptions @@ -13371,10 +12966,7 @@ class RefactoringOptions implements HasToJson { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// rename feedback @@ -13465,14 +13057,12 @@ class RenameFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, elementKindName.hashCode); - hash = JenkinsSmiHash.combine(hash, oldName.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + elementKindName.hashCode, + oldName.hashCode, + ); } /// rename options @@ -13530,11 +13120,7 @@ class RenameOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, newName.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => newName.hashCode; } /// RequestError @@ -13614,13 +13200,11 @@ class RequestError implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, code.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + code.hashCode, + message.hashCode, + stackTrace.hashCode, + ); } /// RequestErrorCode @@ -14048,13 +13632,11 @@ class RuntimeCompletionExpression implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + type.hashCode, + ); } /// RuntimeCompletionExpressionType @@ -14234,17 +13816,15 @@ class RuntimeCompletionExpressionType implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, libraryPath.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, typeArguments.hashCode); - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterTypes.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterNames.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + libraryPath.hashCode, + kind.hashCode, + name.hashCode, + typeArguments.hashCode, + returnType.hashCode, + parameterTypes.hashCode, + parameterNames.hashCode, + ); } /// RuntimeCompletionExpressionTypeKind @@ -14368,12 +13948,10 @@ class RuntimeCompletionVariable implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + type.hashCode, + ); } /// search.findElementReferences params @@ -14463,13 +14041,11 @@ class SearchFindElementReferencesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, includePotential.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + includePotential.hashCode, + ); } /// search.findElementReferences result @@ -14553,12 +14129,10 @@ class SearchFindElementReferencesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, element.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + element.hashCode, + ); } /// search.findMemberDeclarations params @@ -14620,11 +14194,7 @@ class SearchFindMemberDeclarationsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => name.hashCode; } /// search.findMemberDeclarations result @@ -14688,11 +14258,7 @@ class SearchFindMemberDeclarationsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// search.findMemberReferences params @@ -14754,11 +14320,7 @@ class SearchFindMemberReferencesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => name.hashCode; } /// search.findMemberReferences result @@ -14822,11 +14384,7 @@ class SearchFindMemberReferencesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// search.findTopLevelDeclarations params @@ -14890,11 +14448,7 @@ class SearchFindTopLevelDeclarationsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, pattern.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => pattern.hashCode; } /// search.findTopLevelDeclarations result @@ -14958,11 +14512,7 @@ class SearchFindTopLevelDeclarationsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// search.getElementDeclarations params @@ -15058,13 +14608,11 @@ class SearchGetElementDeclarationsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, pattern.hashCode); - hash = JenkinsSmiHash.combine(hash, maxResults.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + pattern.hashCode, + maxResults.hashCode, + ); } /// search.getElementDeclarations result @@ -15147,12 +14695,10 @@ class SearchGetElementDeclarationsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, declarations.hashCode); - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + declarations.hashCode, + files.hashCode, + ); } /// search.getTypeHierarchy params @@ -15242,13 +14788,11 @@ class SearchGetTypeHierarchyParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, superOnly.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + superOnly.hashCode, + ); } /// search.getTypeHierarchy result @@ -15328,11 +14872,7 @@ class SearchGetTypeHierarchyResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, hierarchyItems.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => hierarchyItems.hashCode; } /// SearchResult @@ -15431,14 +14971,12 @@ class SearchResult implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, location.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, isPotential.hashCode); - hash = JenkinsSmiHash.combine(hash, path.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + location.hashCode, + kind.hashCode, + isPotential.hashCode, + path.hashCode, + ); } /// SearchResultKind @@ -15619,13 +15157,11 @@ class SearchResultsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, results.hashCode); - hash = JenkinsSmiHash.combine(hash, isLast.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + results.hashCode, + isLast.hashCode, + ); } /// server.connected params @@ -15697,12 +15233,10 @@ class ServerConnectedParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, version.hashCode); - hash = JenkinsSmiHash.combine(hash, pid.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + version.hashCode, + pid.hashCode, + ); } /// server.error params @@ -15791,13 +15325,11 @@ class ServerErrorParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, isFatal.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + isFatal.hashCode, + message.hashCode, + stackTrace.hashCode, + ); } /// server.getVersion params @@ -15821,9 +15353,7 @@ class ServerGetVersionParams implements RequestParams { } @override - int get hashCode { - return 55877452; - } + int get hashCode => 55877452; } /// server.getVersion result @@ -15887,11 +15417,7 @@ class ServerGetVersionResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, version.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => version.hashCode; } /// ServerLogEntry @@ -15968,13 +15494,11 @@ class ServerLogEntry implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, time.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, data.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + time.hashCode, + kind.hashCode, + data.hashCode, + ); } /// ServerLogEntryKind @@ -16121,11 +15645,7 @@ class ServerLogParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, entry.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => entry.hashCode; } /// ServerService @@ -16242,11 +15762,7 @@ class ServerSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// server.setSubscriptions result @@ -16270,9 +15786,7 @@ class ServerSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 748820900; - } + int get hashCode => 748820900; } /// server.shutdown params @@ -16296,9 +15810,7 @@ class ServerShutdownParams implements RequestParams { } @override - int get hashCode { - return 366630911; - } + int get hashCode => 366630911; } /// server.shutdown result @@ -16322,9 +15834,7 @@ class ServerShutdownResult implements ResponseResult { } @override - int get hashCode { - return 193626532; - } + int get hashCode => 193626532; } /// server.status params @@ -16403,12 +15913,10 @@ class ServerStatusParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, analysis.hashCode); - hash = JenkinsSmiHash.combine(hash, pub.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + analysis.hashCode, + pub.hashCode, + ); } /// TypeHierarchyItem @@ -16568,15 +16076,13 @@ class TypeHierarchyItem implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, classElement.hashCode); - hash = JenkinsSmiHash.combine(hash, displayName.hashCode); - hash = JenkinsSmiHash.combine(hash, memberElement.hashCode); - hash = JenkinsSmiHash.combine(hash, superclass.hashCode); - hash = JenkinsSmiHash.combine(hash, interfaces.hashCode); - hash = JenkinsSmiHash.combine(hash, mixins.hashCode); - hash = JenkinsSmiHash.combine(hash, subclasses.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + classElement.hashCode, + displayName.hashCode, + memberElement.hashCode, + superclass.hashCode, + interfaces.hashCode, + mixins.hashCode, + subclasses.hashCode, + ); } diff --git a/pkg/analysis_server/pubspec.yaml b/pkg/analysis_server/pubspec.yaml index 0879e014fc2..bb60379b0f5 100644 --- a/pkg/analysis_server/pubspec.yaml +++ b/pkg/analysis_server/pubspec.yaml @@ -39,3 +39,11 @@ dev_dependencies: matcher: any pedantic: ^1.9.0 test_reflective_loader: any + +dependency_overrides: + _fe_analyzer_shared: + path: ../_fe_analyzer_shared + analyzer: + path: ../analyzer + meta: + path: ../meta diff --git a/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart b/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart index c17e46f2891..c3c4f3c3c89 100644 --- a/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart +++ b/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart @@ -384,8 +384,6 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator { writeln("import 'dart:convert' hide JsonDecoder;"); writeln(); if (isServer) { - writeln( - "import 'package:analyzer/src/generated/utilities_general.dart';"); writeln("import 'package:$packageName/protocol/protocol.dart';"); writeln( "import 'package:$packageName/src/protocol/protocol_internal.dart';"); @@ -400,7 +398,6 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator { "import 'package:$packageName/src/protocol/protocol_common.dart';"); writeln( "import 'package:$packageName/src/protocol/protocol_internal.dart';"); - writeln("import 'package:$packageName/src/protocol/protocol_util.dart';"); } } @@ -641,25 +638,33 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator { /// Emit the hashCode getter for an object class. void emitObjectHashCode(TypeObject? type, String className) { writeln('@override'); - writeln('int get hashCode {'); + writeln('int get hashCode => '); indent(() { if (type == null) { - writeln('return ${className.hashCode};'); + writeln(' ${className.hashCode}'); } else { - writeln('var hash = 0;'); - for (var field in type.fields) { - String valueToCombine; + final items = type.fields.map((field) { if (field.value != null) { - valueToCombine = field.value.hashCode.toString(); + return field.value.hashCode.toString(); } else { - valueToCombine = '${field.name}.hashCode'; + return '${field.name}.hashCode'; } - writeln('hash = JenkinsSmiHash.combine(hash, $valueToCombine);'); + }).toList(); + + if (items.isEmpty) { + writeln('0'); + } else if (items.length == 1) { + writeln(items.single); + } else { + writeln('Object.hash('); + for (var field in items) { + writeln('$field,'); + } + writeln(')'); } - writeln('return JenkinsSmiHash.finish(hash);'); } + writeln(';'); }); - writeln('}'); } /// If the class named [className] requires special constructors, emit them diff --git a/pkg/analysis_server_client/lib/src/protocol/protocol_common.dart b/pkg/analysis_server_client/lib/src/protocol/protocol_common.dart index 0675a7a5084..96c6d1ba370 100644 --- a/pkg/analysis_server_client/lib/src/protocol/protocol_common.dart +++ b/pkg/analysis_server_client/lib/src/protocol/protocol_common.dart @@ -8,7 +8,6 @@ import 'dart:convert' hide JsonDecoder; -import 'package:analysis_server_client/src/protocol/protocol_util.dart'; import 'package:analysis_server_client/src/protocol/protocol_base.dart'; import 'package:analysis_server_client/src/protocol/protocol_internal.dart'; @@ -66,12 +65,10 @@ class AddContentOverlay implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, 704418402); - hash = JenkinsSmiHash.combine(hash, content.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + 704418402, + content.hashCode, + ); } /// AnalysisError @@ -252,19 +249,17 @@ class AnalysisError implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, severity.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - hash = JenkinsSmiHash.combine(hash, location.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, correction.hashCode); - hash = JenkinsSmiHash.combine(hash, code.hashCode); - hash = JenkinsSmiHash.combine(hash, url.hashCode); - hash = JenkinsSmiHash.combine(hash, contextMessages.hashCode); - hash = JenkinsSmiHash.combine(hash, hasFix.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + severity.hashCode, + type.hashCode, + location.hashCode, + message.hashCode, + correction.hashCode, + code.hashCode, + url.hashCode, + contextMessages.hashCode, + hasFix.hashCode, + ); } /// AnalysisErrorSeverity @@ -477,12 +472,10 @@ class ChangeContentOverlay implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, 873118866); - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + 873118866, + edits.hashCode, + ); } /// CompletionSuggestion @@ -918,33 +911,31 @@ class CompletionSuggestion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, relevance.hashCode); - hash = JenkinsSmiHash.combine(hash, completion.hashCode); - hash = JenkinsSmiHash.combine(hash, displayText.hashCode); - hash = JenkinsSmiHash.combine(hash, replacementOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, replacementLength.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode); - hash = JenkinsSmiHash.combine(hash, isDeprecated.hashCode); - hash = JenkinsSmiHash.combine(hash, isPotential.hashCode); - hash = JenkinsSmiHash.combine(hash, docSummary.hashCode); - hash = JenkinsSmiHash.combine(hash, docComplete.hashCode); - hash = JenkinsSmiHash.combine(hash, declaringType.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultArgumentListString.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultArgumentListTextRanges.hashCode); - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterNames.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterTypes.hashCode); - hash = JenkinsSmiHash.combine(hash, requiredParameterCount.hashCode); - hash = JenkinsSmiHash.combine(hash, hasNamedParameters.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterName.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterType.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hashAll([ + kind.hashCode, + relevance.hashCode, + completion.hashCode, + displayText.hashCode, + replacementOffset.hashCode, + replacementLength.hashCode, + selectionOffset.hashCode, + selectionLength.hashCode, + isDeprecated.hashCode, + isPotential.hashCode, + docSummary.hashCode, + docComplete.hashCode, + declaringType.hashCode, + defaultArgumentListString.hashCode, + defaultArgumentListTextRanges.hashCode, + element.hashCode, + returnType.hashCode, + parameterNames.hashCode, + parameterTypes.hashCode, + requiredParameterCount.hashCode, + hasNamedParameters.hashCode, + parameterName.hashCode, + parameterType.hashCode, + ]); } /// CompletionSuggestionKind @@ -1139,12 +1130,10 @@ class DiagnosticMessage implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, location.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + message.hashCode, + location.hashCode, + ); } /// Element @@ -1347,18 +1336,16 @@ class Element implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, location.hashCode); - hash = JenkinsSmiHash.combine(hash, flags.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, typeParameters.hashCode); - hash = JenkinsSmiHash.combine(hash, aliasedType.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + name.hashCode, + location.hashCode, + flags.hashCode, + parameters.hashCode, + returnType.hashCode, + typeParameters.hashCode, + aliasedType.hashCode, + ); } /// ElementKind @@ -1753,13 +1740,11 @@ class FoldingRegion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + offset.hashCode, + length.hashCode, + ); } /// HighlightRegion @@ -1835,13 +1820,11 @@ class HighlightRegion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, type.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + type.hashCode, + offset.hashCode, + length.hashCode, + ); } /// HighlightRegionType @@ -2545,15 +2528,13 @@ class KytheEntry implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, source.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, target.hashCode); - hash = JenkinsSmiHash.combine(hash, fact.hashCode); - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + source.hashCode, + kind.hashCode, + target.hashCode, + fact.hashCode, + value.hashCode, + ); } /// KytheVName @@ -2659,15 +2640,13 @@ class KytheVName implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, signature.hashCode); - hash = JenkinsSmiHash.combine(hash, corpus.hashCode); - hash = JenkinsSmiHash.combine(hash, root.hashCode); - hash = JenkinsSmiHash.combine(hash, path.hashCode); - hash = JenkinsSmiHash.combine(hash, language.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + signature.hashCode, + corpus.hashCode, + root.hashCode, + path.hashCode, + language.hashCode, + ); } /// LinkedEditGroup @@ -2770,13 +2749,11 @@ class LinkedEditGroup implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, positions.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, suggestions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + positions.hashCode, + length.hashCode, + suggestions.hashCode, + ); } /// LinkedEditSuggestion @@ -2839,12 +2816,10 @@ class LinkedEditSuggestion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, value.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + value.hashCode, + kind.hashCode, + ); } /// LinkedEditSuggestionKind @@ -3043,17 +3018,15 @@ class Location implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, startLine.hashCode); - hash = JenkinsSmiHash.combine(hash, startColumn.hashCode); - hash = JenkinsSmiHash.combine(hash, endLine.hashCode); - hash = JenkinsSmiHash.combine(hash, endColumn.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + startLine.hashCode, + startColumn.hashCode, + endLine.hashCode, + endColumn.hashCode, + ); } /// NavigationRegion @@ -3131,13 +3104,11 @@ class NavigationRegion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, targets.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + targets.hashCode, + ); } /// NavigationTarget @@ -3287,18 +3258,16 @@ class NavigationTarget implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, fileIndex.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, startLine.hashCode); - hash = JenkinsSmiHash.combine(hash, startColumn.hashCode); - hash = JenkinsSmiHash.combine(hash, codeOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, codeLength.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + fileIndex.hashCode, + offset.hashCode, + length.hashCode, + startLine.hashCode, + startColumn.hashCode, + codeOffset.hashCode, + codeLength.hashCode, + ); } /// Occurrences @@ -3375,13 +3344,11 @@ class Occurrences implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, offsets.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + element.hashCode, + offsets.hashCode, + length.hashCode, + ); } /// Outline @@ -3509,16 +3476,14 @@ class Outline implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, codeOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, codeLength.hashCode); - hash = JenkinsSmiHash.combine(hash, children.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + element.hashCode, + offset.hashCode, + length.hashCode, + codeOffset.hashCode, + codeLength.hashCode, + children.hashCode, + ); } /// ParameterInfo @@ -3609,14 +3574,12 @@ class ParameterInfo implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultValue.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + name.hashCode, + type.hashCode, + defaultValue.hashCode, + ); } /// ParameterKind @@ -3748,12 +3711,10 @@ class Position implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// RefactoringKind @@ -3963,15 +3924,13 @@ class RefactoringMethodParameter implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + kind.hashCode, + type.hashCode, + name.hashCode, + parameters.hashCode, + ); } /// RefactoringMethodParameterKind @@ -4111,13 +4070,11 @@ class RefactoringProblem implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, severity.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, location.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + severity.hashCode, + message.hashCode, + location.hashCode, + ); } /// RefactoringProblemSeverity @@ -4248,11 +4205,7 @@ class RemoveContentOverlay implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, 114870849); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 114870849; } /// SourceChange @@ -4397,15 +4350,13 @@ class SourceChange implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - hash = JenkinsSmiHash.combine(hash, linkedEditGroups.hashCode); - hash = JenkinsSmiHash.combine(hash, selection.hashCode); - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + message.hashCode, + edits.hashCode, + linkedEditGroups.hashCode, + selection.hashCode, + id.hashCode, + ); } /// SourceEdit @@ -4512,14 +4463,12 @@ class SourceEdit implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, replacement.hashCode); - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + replacement.hashCode, + id.hashCode, + ); } /// SourceFileEdit @@ -4610,11 +4559,9 @@ class SourceFileEdit implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, fileStamp.hashCode); - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + fileStamp.hashCode, + edits.hashCode, + ); } diff --git a/pkg/analysis_server_client/lib/src/protocol/protocol_generated.dart b/pkg/analysis_server_client/lib/src/protocol/protocol_generated.dart index 470f8305c6a..ee185f6668b 100644 --- a/pkg/analysis_server_client/lib/src/protocol/protocol_generated.dart +++ b/pkg/analysis_server_client/lib/src/protocol/protocol_generated.dart @@ -11,7 +11,6 @@ import 'dart:convert' hide JsonDecoder; import 'package:analysis_server_client/src/protocol/protocol_base.dart'; import 'package:analysis_server_client/src/protocol/protocol_common.dart'; import 'package:analysis_server_client/src/protocol/protocol_internal.dart'; -import 'package:analysis_server_client/src/protocol/protocol_util.dart'; /// analysis.analyzedFiles params /// @@ -74,11 +73,7 @@ class AnalysisAnalyzedFilesParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, directories.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => directories.hashCode; } /// analysis.closingLabels params @@ -164,12 +159,10 @@ class AnalysisClosingLabelsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, labels.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + labels.hashCode, + ); } /// AnalysisErrorFixes @@ -240,12 +233,10 @@ class AnalysisErrorFixes implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, error.hashCode); - hash = JenkinsSmiHash.combine(hash, fixes.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + error.hashCode, + fixes.hashCode, + ); } /// analysis.errors params @@ -323,12 +314,10 @@ class AnalysisErrorsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, errors.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + errors.hashCode, + ); } /// analysis.flushResults params @@ -391,11 +380,7 @@ class AnalysisFlushResultsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => files.hashCode; } /// analysis.folding params @@ -473,12 +458,10 @@ class AnalysisFoldingParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + regions.hashCode, + ); } /// analysis.getErrors params @@ -539,11 +522,7 @@ class AnalysisGetErrorsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// analysis.getErrors result @@ -612,11 +591,7 @@ class AnalysisGetErrorsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, errors.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => errors.hashCode; } /// analysis.getHover params @@ -688,12 +663,10 @@ class AnalysisGetHoverParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// analysis.getHover result @@ -766,11 +739,7 @@ class AnalysisGetHoverResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, hovers.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => hovers.hashCode; } /// analysis.getImportedElements params @@ -856,13 +825,11 @@ class AnalysisGetImportedElementsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// analysis.getImportedElements result @@ -933,11 +900,7 @@ class AnalysisGetImportedElementsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => elements.hashCode; } /// analysis.getLibraryDependencies params @@ -961,9 +924,7 @@ class AnalysisGetLibraryDependenciesParams implements RequestParams { } @override - int get hashCode { - return 246577680; - } + int get hashCode => 246577680; } /// analysis.getLibraryDependencies result @@ -1057,12 +1018,10 @@ class AnalysisGetLibraryDependenciesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, libraries.hashCode); - hash = JenkinsSmiHash.combine(hash, packageMap.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + libraries.hashCode, + packageMap.hashCode, + ); } /// analysis.getNavigation params @@ -1150,13 +1109,11 @@ class AnalysisGetNavigationParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// analysis.getNavigation result @@ -1259,13 +1216,11 @@ class AnalysisGetNavigationResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - hash = JenkinsSmiHash.combine(hash, targets.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + files.hashCode, + targets.hashCode, + regions.hashCode, + ); } /// analysis.getReachableSources params @@ -1327,11 +1282,7 @@ class AnalysisGetReachableSourcesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// analysis.getReachableSources result @@ -1407,11 +1358,7 @@ class AnalysisGetReachableSourcesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, sources.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => sources.hashCode; } /// analysis.getSignature params @@ -1484,12 +1431,10 @@ class AnalysisGetSignatureParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// analysis.getSignature result @@ -1590,13 +1535,11 @@ class AnalysisGetSignatureResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, dartdoc.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + parameters.hashCode, + dartdoc.hashCode, + ); } /// analysis.highlights params @@ -1678,12 +1621,10 @@ class AnalysisHighlightsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + regions.hashCode, + ); } /// analysis.implemented params @@ -1780,13 +1721,11 @@ class AnalysisImplementedParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, classes.hashCode); - hash = JenkinsSmiHash.combine(hash, members.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + classes.hashCode, + members.hashCode, + ); } /// analysis.invalidate params @@ -1884,14 +1823,12 @@ class AnalysisInvalidateParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, delta.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + delta.hashCode, + ); } /// analysis.navigation params @@ -2008,14 +1945,12 @@ class AnalysisNavigationParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - hash = JenkinsSmiHash.combine(hash, targets.hashCode); - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + regions.hashCode, + targets.hashCode, + files.hashCode, + ); } /// analysis.occurrences params @@ -2094,12 +2029,10 @@ class AnalysisOccurrencesParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, occurrences.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + occurrences.hashCode, + ); } /// AnalysisOptions @@ -2282,18 +2215,16 @@ class AnalysisOptions implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, enableAsync.hashCode); - hash = JenkinsSmiHash.combine(hash, enableDeferredLoading.hashCode); - hash = JenkinsSmiHash.combine(hash, enableEnums.hashCode); - hash = JenkinsSmiHash.combine(hash, enableNullAwareOperators.hashCode); - hash = JenkinsSmiHash.combine(hash, enableSuperMixins.hashCode); - hash = JenkinsSmiHash.combine(hash, generateDart2jsHints.hashCode); - hash = JenkinsSmiHash.combine(hash, generateHints.hashCode); - hash = JenkinsSmiHash.combine(hash, generateLints.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + enableAsync.hashCode, + enableDeferredLoading.hashCode, + enableEnums.hashCode, + enableNullAwareOperators.hashCode, + enableSuperMixins.hashCode, + generateDart2jsHints.hashCode, + generateHints.hashCode, + generateLints.hashCode, + ); } /// analysis.outline params @@ -2397,14 +2328,12 @@ class AnalysisOutlineParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, libraryName.hashCode); - hash = JenkinsSmiHash.combine(hash, outline.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + kind.hashCode, + libraryName.hashCode, + outline.hashCode, + ); } /// analysis.overrides params @@ -2482,12 +2411,10 @@ class AnalysisOverridesParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, overrides.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + overrides.hashCode, + ); } /// analysis.reanalyze params @@ -2511,9 +2438,7 @@ class AnalysisReanalyzeParams implements RequestParams { } @override - int get hashCode { - return 613039876; - } + int get hashCode => 613039876; } /// analysis.reanalyze result @@ -2537,9 +2462,7 @@ class AnalysisReanalyzeResult implements ResponseResult { } @override - int get hashCode { - return 846803925; - } + int get hashCode => 846803925; } /// AnalysisService @@ -2743,13 +2666,11 @@ class AnalysisSetAnalysisRootsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, included.hashCode); - hash = JenkinsSmiHash.combine(hash, excluded.hashCode); - hash = JenkinsSmiHash.combine(hash, packageRoots.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + included.hashCode, + excluded.hashCode, + packageRoots.hashCode, + ); } /// analysis.setAnalysisRoots result @@ -2773,9 +2694,7 @@ class AnalysisSetAnalysisRootsResult implements ResponseResult { } @override - int get hashCode { - return 866004753; - } + int get hashCode => 866004753; } /// analysis.setGeneralSubscriptions params @@ -2844,11 +2763,7 @@ class AnalysisSetGeneralSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// analysis.setGeneralSubscriptions result @@ -2872,9 +2787,7 @@ class AnalysisSetGeneralSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 386759562; - } + int get hashCode => 386759562; } /// analysis.setPriorityFiles params @@ -2937,11 +2850,7 @@ class AnalysisSetPriorityFilesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => files.hashCode; } /// analysis.setPriorityFiles result @@ -2965,9 +2874,7 @@ class AnalysisSetPriorityFilesResult implements ResponseResult { } @override - int get hashCode { - return 330050055; - } + int get hashCode => 330050055; } /// analysis.setSubscriptions params @@ -3040,11 +2947,7 @@ class AnalysisSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// analysis.setSubscriptions result @@ -3068,9 +2971,7 @@ class AnalysisSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 218088493; - } + int get hashCode => 218088493; } /// AnalysisStatus @@ -3137,12 +3038,10 @@ class AnalysisStatus implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, isAnalyzing.hashCode); - hash = JenkinsSmiHash.combine(hash, analysisTarget.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + isAnalyzing.hashCode, + analysisTarget.hashCode, + ); } /// analysis.updateContent params @@ -3216,11 +3115,7 @@ class AnalysisUpdateContentParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => files.hashCode; } /// analysis.updateContent result @@ -3273,10 +3168,7 @@ class AnalysisUpdateContentResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// analysis.updateOptions params @@ -3339,11 +3231,7 @@ class AnalysisUpdateOptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, options.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => options.hashCode; } /// analysis.updateOptions result @@ -3367,9 +3255,7 @@ class AnalysisUpdateOptionsResult implements ResponseResult { } @override - int get hashCode { - return 179689467; - } + int get hashCode => 179689467; } /// analytics.enable params @@ -3430,11 +3316,7 @@ class AnalyticsEnableParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => value.hashCode; } /// analytics.enable result @@ -3458,9 +3340,7 @@ class AnalyticsEnableResult implements ResponseResult { } @override - int get hashCode { - return 237990792; - } + int get hashCode => 237990792; } /// analytics.isEnabled params @@ -3484,9 +3364,7 @@ class AnalyticsIsEnabledParams implements RequestParams { } @override - int get hashCode { - return 57215544; - } + int get hashCode => 57215544; } /// analytics.isEnabled result @@ -3550,11 +3428,7 @@ class AnalyticsIsEnabledResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, enabled.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => enabled.hashCode; } /// analytics.sendEvent params @@ -3615,11 +3489,7 @@ class AnalyticsSendEventParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, action.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => action.hashCode; } /// analytics.sendEvent result @@ -3643,9 +3513,7 @@ class AnalyticsSendEventResult implements ResponseResult { } @override - int get hashCode { - return 227063188; - } + int get hashCode => 227063188; } /// analytics.sendTiming params @@ -3717,12 +3585,10 @@ class AnalyticsSendTimingParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, event.hashCode); - hash = JenkinsSmiHash.combine(hash, millis.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + event.hashCode, + millis.hashCode, + ); } /// analytics.sendTiming result @@ -3746,9 +3612,7 @@ class AnalyticsSendTimingResult implements ResponseResult { } @override - int get hashCode { - return 875010924; - } + int get hashCode => 875010924; } /// AvailableSuggestion @@ -3941,19 +3805,17 @@ class AvailableSuggestion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, label.hashCode); - hash = JenkinsSmiHash.combine(hash, declaringLibraryUri.hashCode); - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultArgumentListString.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultArgumentListTextRanges.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterNames.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterTypes.hashCode); - hash = JenkinsSmiHash.combine(hash, relevanceTags.hashCode); - hash = JenkinsSmiHash.combine(hash, requiredParameterCount.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + label.hashCode, + declaringLibraryUri.hashCode, + element.hashCode, + defaultArgumentListString.hashCode, + defaultArgumentListTextRanges.hashCode, + parameterNames.hashCode, + parameterTypes.hashCode, + relevanceTags.hashCode, + requiredParameterCount.hashCode, + ); } /// AvailableSuggestionSet @@ -4033,13 +3895,11 @@ class AvailableSuggestionSet implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, uri.hashCode); - hash = JenkinsSmiHash.combine(hash, items.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + uri.hashCode, + items.hashCode, + ); } /// BulkFix @@ -4108,12 +3968,10 @@ class BulkFix implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, path.hashCode); - hash = JenkinsSmiHash.combine(hash, fixes.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + path.hashCode, + fixes.hashCode, + ); } /// BulkFixDetail @@ -4177,12 +4035,10 @@ class BulkFixDetail implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, code.hashCode); - hash = JenkinsSmiHash.combine(hash, occurrences.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + code.hashCode, + occurrences.hashCode, + ); } /// ClosingLabel @@ -4258,13 +4114,11 @@ class ClosingLabel implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, label.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + label.hashCode, + ); } /// completion.availableSuggestions params @@ -4355,12 +4209,10 @@ class CompletionAvailableSuggestionsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, changedLibraries.hashCode); - hash = JenkinsSmiHash.combine(hash, removedLibraries.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + changedLibraries.hashCode, + removedLibraries.hashCode, + ); } /// completion.existingImports params @@ -4434,12 +4286,10 @@ class CompletionExistingImportsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, imports.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + imports.hashCode, + ); } /// completion.getSuggestionDetails params @@ -4540,14 +4390,12 @@ class CompletionGetSuggestionDetailsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, label.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + id.hashCode, + label.hashCode, + offset.hashCode, + ); } /// completion.getSuggestionDetails result @@ -4627,12 +4475,10 @@ class CompletionGetSuggestionDetailsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, completion.hashCode); - hash = JenkinsSmiHash.combine(hash, change.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + completion.hashCode, + change.hashCode, + ); } /// completion.getSuggestions params @@ -4705,12 +4551,10 @@ class CompletionGetSuggestionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// completion.getSuggestions result @@ -4774,11 +4618,7 @@ class CompletionGetSuggestionsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// completion.registerLibraryPaths params @@ -4849,11 +4689,7 @@ class CompletionRegisterLibraryPathsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, paths.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => paths.hashCode; } /// completion.registerLibraryPaths result @@ -4877,9 +4713,7 @@ class CompletionRegisterLibraryPathsResult implements ResponseResult { } @override - int get hashCode { - return 104675661; - } + int get hashCode => 104675661; } /// completion.results params @@ -5111,20 +4945,17 @@ class CompletionResultsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, replacementOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, replacementLength.hashCode); - hash = JenkinsSmiHash.combine(hash, results.hashCode); - hash = JenkinsSmiHash.combine(hash, isLast.hashCode); - hash = JenkinsSmiHash.combine(hash, libraryFile.hashCode); - hash = JenkinsSmiHash.combine(hash, includedSuggestionSets.hashCode); - hash = JenkinsSmiHash.combine(hash, includedElementKinds.hashCode); - hash = - JenkinsSmiHash.combine(hash, includedSuggestionRelevanceTags.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + replacementOffset.hashCode, + replacementLength.hashCode, + results.hashCode, + isLast.hashCode, + libraryFile.hashCode, + includedSuggestionSets.hashCode, + includedElementKinds.hashCode, + includedSuggestionRelevanceTags.hashCode, + ); } /// CompletionService @@ -5246,11 +5077,7 @@ class CompletionSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// completion.setSubscriptions result @@ -5274,9 +5101,7 @@ class CompletionSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 2482770; - } + int get hashCode => 2482770; } /// ContextData @@ -5384,15 +5209,13 @@ class ContextData implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, explicitFileCount.hashCode); - hash = JenkinsSmiHash.combine(hash, implicitFileCount.hashCode); - hash = JenkinsSmiHash.combine(hash, workItemQueueLength.hashCode); - hash = JenkinsSmiHash.combine(hash, cacheEntryExceptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + explicitFileCount.hashCode, + implicitFileCount.hashCode, + workItemQueueLength.hashCode, + cacheEntryExceptions.hashCode, + ); } /// convertGetterToMethod feedback @@ -5409,9 +5232,7 @@ class ConvertGetterToMethodFeedback extends RefactoringFeedback } @override - int get hashCode { - return 616032599; - } + int get hashCode => 616032599; } /// convertGetterToMethod options @@ -5428,9 +5249,7 @@ class ConvertGetterToMethodOptions extends RefactoringOptions } @override - int get hashCode { - return 488848400; - } + int get hashCode => 488848400; } /// convertMethodToGetter feedback @@ -5447,9 +5266,7 @@ class ConvertMethodToGetterFeedback extends RefactoringFeedback } @override - int get hashCode { - return 165291526; - } + int get hashCode => 165291526; } /// convertMethodToGetter options @@ -5466,9 +5283,7 @@ class ConvertMethodToGetterOptions extends RefactoringOptions } @override - int get hashCode { - return 27952290; - } + int get hashCode => 27952290; } /// diagnostic.getDiagnostics params @@ -5492,9 +5307,7 @@ class DiagnosticGetDiagnosticsParams implements RequestParams { } @override - int get hashCode { - return 587526202; - } + int get hashCode => 587526202; } /// diagnostic.getDiagnostics result @@ -5564,11 +5377,7 @@ class DiagnosticGetDiagnosticsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, contexts.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => contexts.hashCode; } /// diagnostic.getServerPort params @@ -5592,9 +5401,7 @@ class DiagnosticGetServerPortParams implements RequestParams { } @override - int get hashCode { - return 367508704; - } + int get hashCode => 367508704; } /// diagnostic.getServerPort result @@ -5658,11 +5465,7 @@ class DiagnosticGetServerPortResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, port.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => port.hashCode; } /// edit.bulkFixes params @@ -5751,12 +5554,10 @@ class EditBulkFixesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, included.hashCode); - hash = JenkinsSmiHash.combine(hash, inTestMode.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + included.hashCode, + inTestMode.hashCode, + ); } /// edit.bulkFixes result @@ -5841,12 +5642,10 @@ class EditBulkFixesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - hash = JenkinsSmiHash.combine(hash, details.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + edits.hashCode, + details.hashCode, + ); } /// edit.format params @@ -5949,14 +5748,12 @@ class EditFormatParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode); - hash = JenkinsSmiHash.combine(hash, lineLength.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + selectionOffset.hashCode, + selectionLength.hashCode, + lineLength.hashCode, + ); } /// edit.format result @@ -6051,13 +5848,11 @@ class EditFormatResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + edits.hashCode, + selectionOffset.hashCode, + selectionLength.hashCode, + ); } /// edit.getAssists params @@ -6142,13 +5937,11 @@ class EditGetAssistsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// edit.getAssists result @@ -6217,11 +6010,7 @@ class EditGetAssistsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, assists.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => assists.hashCode; } /// edit.getAvailableRefactorings params @@ -6307,13 +6096,11 @@ class EditGetAvailableRefactoringsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// edit.getAvailableRefactorings result @@ -6383,11 +6170,7 @@ class EditGetAvailableRefactoringsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kinds.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => kinds.hashCode; } /// edit.getFixes params @@ -6459,12 +6242,10 @@ class EditGetFixesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// edit.getFixes result @@ -6533,11 +6314,7 @@ class EditGetFixesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, fixes.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => fixes.hashCode; } /// edit.getPostfixCompletion params @@ -6622,13 +6399,11 @@ class EditGetPostfixCompletionParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, key.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + key.hashCode, + offset.hashCode, + ); } /// edit.getPostfixCompletion result @@ -6693,11 +6468,7 @@ class EditGetPostfixCompletionResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, change.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => change.hashCode; } /// edit.getRefactoring params @@ -6832,16 +6603,14 @@ class EditGetRefactoringParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, validateOnly.hashCode); - hash = JenkinsSmiHash.combine(hash, options.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + file.hashCode, + offset.hashCode, + length.hashCode, + validateOnly.hashCode, + options.hashCode, + ); } /// edit.getRefactoring result @@ -7014,16 +6783,14 @@ class EditGetRefactoringResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, initialProblems.hashCode); - hash = JenkinsSmiHash.combine(hash, optionsProblems.hashCode); - hash = JenkinsSmiHash.combine(hash, finalProblems.hashCode); - hash = JenkinsSmiHash.combine(hash, feedback.hashCode); - hash = JenkinsSmiHash.combine(hash, change.hashCode); - hash = JenkinsSmiHash.combine(hash, potentialEdits.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + initialProblems.hashCode, + optionsProblems.hashCode, + finalProblems.hashCode, + feedback.hashCode, + change.hashCode, + potentialEdits.hashCode, + ); } /// edit.getStatementCompletion params @@ -7096,12 +6863,10 @@ class EditGetStatementCompletionParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// edit.getStatementCompletion result @@ -7179,12 +6944,10 @@ class EditGetStatementCompletionResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, change.hashCode); - hash = JenkinsSmiHash.combine(hash, whitespaceOnly.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + change.hashCode, + whitespaceOnly.hashCode, + ); } /// edit.importElements params @@ -7279,13 +7042,11 @@ class EditImportElementsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + elements.hashCode, + offset.hashCode, + ); } /// edit.importElements result @@ -7355,11 +7116,7 @@ class EditImportElementsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edit.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => edit.hashCode; } /// edit.isPostfixCompletionApplicable params @@ -7444,13 +7201,11 @@ class EditIsPostfixCompletionApplicableParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, key.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + key.hashCode, + offset.hashCode, + ); } /// edit.isPostfixCompletionApplicable result @@ -7515,11 +7270,7 @@ class EditIsPostfixCompletionApplicableResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => value.hashCode; } /// edit.listPostfixCompletionTemplates params @@ -7543,9 +7294,7 @@ class EditListPostfixCompletionTemplatesParams implements RequestParams { } @override - int get hashCode { - return 690713107; - } + int get hashCode => 690713107; } /// edit.listPostfixCompletionTemplates result @@ -7618,11 +7367,7 @@ class EditListPostfixCompletionTemplatesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, templates.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => templates.hashCode; } /// edit.organizeDirectives params @@ -7684,11 +7429,7 @@ class EditOrganizeDirectivesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// edit.organizeDirectives result @@ -7754,11 +7495,7 @@ class EditOrganizeDirectivesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edit.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => edit.hashCode; } /// edit.sortMembers params @@ -7819,11 +7556,7 @@ class EditSortMembersParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// edit.sortMembers result @@ -7888,11 +7621,7 @@ class EditSortMembersResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, edit.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => edit.hashCode; } /// ElementDeclaration @@ -8084,21 +7813,19 @@ class ElementDeclaration implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, fileIndex.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, line.hashCode); - hash = JenkinsSmiHash.combine(hash, column.hashCode); - hash = JenkinsSmiHash.combine(hash, codeOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, codeLength.hashCode); - hash = JenkinsSmiHash.combine(hash, className.hashCode); - hash = JenkinsSmiHash.combine(hash, mixinName.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + kind.hashCode, + fileIndex.hashCode, + offset.hashCode, + line.hashCode, + column.hashCode, + codeOffset.hashCode, + codeLength.hashCode, + className.hashCode, + mixinName.hashCode, + parameters.hashCode, + ); } /// ExecutableFile @@ -8161,12 +7888,10 @@ class ExecutableFile implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + kind.hashCode, + ); } /// ExecutableKind @@ -8295,11 +8020,7 @@ class ExecutionCreateContextParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, contextRoot.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => contextRoot.hashCode; } /// execution.createContext result @@ -8363,11 +8084,7 @@ class ExecutionCreateContextResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// execution.deleteContext params @@ -8429,11 +8146,7 @@ class ExecutionDeleteContextParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// execution.deleteContext result @@ -8457,9 +8170,7 @@ class ExecutionDeleteContextResult implements ResponseResult { } @override - int get hashCode { - return 479954425; - } + int get hashCode => 479954425; } /// execution.getSuggestions params @@ -8623,16 +8334,14 @@ class ExecutionGetSuggestionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, code.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, contextFile.hashCode); - hash = JenkinsSmiHash.combine(hash, contextOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, variables.hashCode); - hash = JenkinsSmiHash.combine(hash, expressions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + code.hashCode, + offset.hashCode, + contextFile.hashCode, + contextOffset.hashCode, + variables.hashCode, + expressions.hashCode, + ); } /// execution.getSuggestions result @@ -8739,12 +8448,10 @@ class ExecutionGetSuggestionsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, suggestions.hashCode); - hash = JenkinsSmiHash.combine(hash, expressions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + suggestions.hashCode, + expressions.hashCode, + ); } /// execution.launchData params @@ -8838,13 +8545,11 @@ class ExecutionLaunchDataParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, referencedFiles.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + kind.hashCode, + referencedFiles.hashCode, + ); } /// execution.mapUri params @@ -8929,13 +8634,11 @@ class ExecutionMapUriParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, uri.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + file.hashCode, + uri.hashCode, + ); } /// execution.mapUri result @@ -9013,12 +8716,10 @@ class ExecutionMapUriResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, uri.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + uri.hashCode, + ); } /// ExecutionService @@ -9130,11 +8831,7 @@ class ExecutionSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// execution.setSubscriptions result @@ -9158,9 +8855,7 @@ class ExecutionSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 287678780; - } + int get hashCode => 287678780; } /// ExistingImport @@ -9225,12 +8920,10 @@ class ExistingImport implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, uri.hashCode); - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + uri.hashCode, + elements.hashCode, + ); } /// ExistingImports @@ -9300,12 +8993,10 @@ class ExistingImports implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - hash = JenkinsSmiHash.combine(hash, imports.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + elements.hashCode, + imports.hashCode, + ); } /// extractLocalVariable feedback @@ -9427,15 +9118,13 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback { } @override - int get hashCode { - var 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); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + coveringExpressionOffsets.hashCode, + coveringExpressionLengths.hashCode, + names.hashCode, + offsets.hashCode, + lengths.hashCode, + ); } /// extractLocalVariable options @@ -9508,12 +9197,10 @@ class ExtractLocalVariableOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, extractAll.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + extractAll.hashCode, + ); } /// extractMethod feedback @@ -9673,18 +9360,16 @@ class ExtractMethodFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, names.hashCode); - hash = JenkinsSmiHash.combine(hash, canCreateGetter.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, offsets.hashCode); - hash = JenkinsSmiHash.combine(hash, lengths.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + returnType.hashCode, + names.hashCode, + canCreateGetter.hashCode, + parameters.hashCode, + offsets.hashCode, + lengths.hashCode, + ); } /// extractMethod options @@ -9817,15 +9502,13 @@ class ExtractMethodOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, createGetter.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, extractAll.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + returnType.hashCode, + createGetter.hashCode, + name.hashCode, + parameters.hashCode, + extractAll.hashCode, + ); } /// extractWidget feedback @@ -9865,10 +9548,7 @@ class ExtractWidgetFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// extractWidget options @@ -9925,11 +9605,7 @@ class ExtractWidgetOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => name.hashCode; } /// FileKind @@ -10051,12 +9727,10 @@ class FlutterGetWidgetDescriptionParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// flutter.getWidgetDescription result @@ -10130,11 +9804,7 @@ class FlutterGetWidgetDescriptionResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, properties.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => properties.hashCode; } /// FlutterOutline @@ -10374,22 +10044,20 @@ class FlutterOutline implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, codeOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, codeLength.hashCode); - hash = JenkinsSmiHash.combine(hash, label.hashCode); - hash = JenkinsSmiHash.combine(hash, dartElement.hashCode); - hash = JenkinsSmiHash.combine(hash, attributes.hashCode); - hash = JenkinsSmiHash.combine(hash, className.hashCode); - hash = JenkinsSmiHash.combine(hash, parentAssociationLabel.hashCode); - hash = JenkinsSmiHash.combine(hash, variableName.hashCode); - hash = JenkinsSmiHash.combine(hash, children.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + offset.hashCode, + length.hashCode, + codeOffset.hashCode, + codeLength.hashCode, + label.hashCode, + dartElement.hashCode, + attributes.hashCode, + className.hashCode, + parentAssociationLabel.hashCode, + variableName.hashCode, + children.hashCode, + ); } /// FlutterOutlineAttribute @@ -10540,17 +10208,15 @@ class FlutterOutlineAttribute implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, label.hashCode); - hash = JenkinsSmiHash.combine(hash, literalValueBoolean.hashCode); - hash = JenkinsSmiHash.combine(hash, literalValueInteger.hashCode); - hash = JenkinsSmiHash.combine(hash, literalValueString.hashCode); - hash = JenkinsSmiHash.combine(hash, nameLocation.hashCode); - hash = JenkinsSmiHash.combine(hash, valueLocation.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + label.hashCode, + literalValueBoolean.hashCode, + literalValueInteger.hashCode, + literalValueString.hashCode, + nameLocation.hashCode, + valueLocation.hashCode, + ); } /// FlutterOutlineKind @@ -10710,12 +10376,10 @@ class FlutterOutlineParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, outline.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + outline.hashCode, + ); } /// FlutterService @@ -10832,11 +10496,7 @@ class FlutterSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// flutter.setSubscriptions result @@ -10860,9 +10520,7 @@ class FlutterSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 628296315; - } + int get hashCode => 628296315; } /// flutter.setWidgetPropertyValue params @@ -10949,12 +10607,10 @@ class FlutterSetWidgetPropertyValueParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + value.hashCode, + ); } /// flutter.setWidgetPropertyValue result @@ -11019,11 +10675,7 @@ class FlutterSetWidgetPropertyValueResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, change.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => change.hashCode; } /// FlutterWidgetProperty @@ -11214,19 +10866,17 @@ class FlutterWidgetProperty implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, documentation.hashCode); - hash = JenkinsSmiHash.combine(hash, expression.hashCode); - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, isRequired.hashCode); - hash = JenkinsSmiHash.combine(hash, isSafeToUpdate.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, children.hashCode); - hash = JenkinsSmiHash.combine(hash, editor.hashCode); - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + documentation.hashCode, + expression.hashCode, + id.hashCode, + isRequired.hashCode, + isSafeToUpdate.hashCode, + name.hashCode, + children.hashCode, + editor.hashCode, + value.hashCode, + ); } /// FlutterWidgetPropertyEditor @@ -11301,12 +10951,10 @@ class FlutterWidgetPropertyEditor implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, enumItems.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + enumItems.hashCode, + ); } /// FlutterWidgetPropertyEditorKind @@ -11529,16 +11177,14 @@ class FlutterWidgetPropertyValue implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, boolValue.hashCode); - hash = JenkinsSmiHash.combine(hash, doubleValue.hashCode); - hash = JenkinsSmiHash.combine(hash, intValue.hashCode); - hash = JenkinsSmiHash.combine(hash, stringValue.hashCode); - hash = JenkinsSmiHash.combine(hash, enumValue.hashCode); - hash = JenkinsSmiHash.combine(hash, expression.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + boolValue.hashCode, + doubleValue.hashCode, + intValue.hashCode, + stringValue.hashCode, + enumValue.hashCode, + expression.hashCode, + ); } /// FlutterWidgetPropertyValueEnumItem @@ -11637,14 +11283,12 @@ class FlutterWidgetPropertyValueEnumItem implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, libraryUri.hashCode); - hash = JenkinsSmiHash.combine(hash, className.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, documentation.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + libraryUri.hashCode, + className.hashCode, + name.hashCode, + documentation.hashCode, + ); } /// GeneralAnalysisService @@ -11935,22 +11579,20 @@ class HoverInformation implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, containingLibraryPath.hashCode); - hash = JenkinsSmiHash.combine(hash, containingLibraryName.hashCode); - hash = JenkinsSmiHash.combine(hash, containingClassDescription.hashCode); - hash = JenkinsSmiHash.combine(hash, dartdoc.hashCode); - hash = JenkinsSmiHash.combine(hash, elementDescription.hashCode); - hash = JenkinsSmiHash.combine(hash, elementKind.hashCode); - hash = JenkinsSmiHash.combine(hash, isDeprecated.hashCode); - hash = JenkinsSmiHash.combine(hash, parameter.hashCode); - hash = JenkinsSmiHash.combine(hash, propagatedType.hashCode); - hash = JenkinsSmiHash.combine(hash, staticType.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + containingLibraryPath.hashCode, + containingLibraryName.hashCode, + containingClassDescription.hashCode, + dartdoc.hashCode, + elementDescription.hashCode, + elementKind.hashCode, + isDeprecated.hashCode, + parameter.hashCode, + propagatedType.hashCode, + staticType.hashCode, + ); } /// ImplementedClass @@ -12012,12 +11654,10 @@ class ImplementedClass implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + ); } /// ImplementedMember @@ -12079,12 +11719,10 @@ class ImplementedMember implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + ); } /// ImportedElementSet @@ -12163,13 +11801,11 @@ class ImportedElementSet implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, strings.hashCode); - hash = JenkinsSmiHash.combine(hash, uris.hashCode); - hash = JenkinsSmiHash.combine(hash, names.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + strings.hashCode, + uris.hashCode, + names.hashCode, + ); } /// ImportedElements @@ -12246,13 +11882,11 @@ class ImportedElements implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, path.hashCode); - hash = JenkinsSmiHash.combine(hash, prefix.hashCode); - hash = JenkinsSmiHash.combine(hash, elements.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + path.hashCode, + prefix.hashCode, + elements.hashCode, + ); } /// IncludedSuggestionRelevanceTag @@ -12318,12 +11952,10 @@ class IncludedSuggestionRelevanceTag implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, tag.hashCode); - hash = JenkinsSmiHash.combine(hash, relevanceBoost.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + tag.hashCode, + relevanceBoost.hashCode, + ); } /// IncludedSuggestionSet @@ -12409,13 +12041,11 @@ class IncludedSuggestionSet implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, relevance.hashCode); - hash = JenkinsSmiHash.combine(hash, displayUri.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + relevance.hashCode, + displayUri.hashCode, + ); } /// inlineLocalVariable feedback @@ -12479,12 +12109,10 @@ class InlineLocalVariableFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, occurrences.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + occurrences.hashCode, + ); } /// inlineLocalVariable options @@ -12501,9 +12129,7 @@ class InlineLocalVariableOptions extends RefactoringOptions } @override - int get hashCode { - return 540364977; - } + int get hashCode => 540364977; } /// inlineMethod feedback @@ -12585,13 +12211,11 @@ class InlineMethodFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, className.hashCode); - hash = JenkinsSmiHash.combine(hash, methodName.hashCode); - hash = JenkinsSmiHash.combine(hash, isDeclaration.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + className.hashCode, + methodName.hashCode, + isDeclaration.hashCode, + ); } /// inlineMethod options @@ -12663,12 +12287,10 @@ class InlineMethodOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, deleteSource.hashCode); - hash = JenkinsSmiHash.combine(hash, inlineAll.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + deleteSource.hashCode, + inlineAll.hashCode, + ); } /// kythe.getKytheEntries params @@ -12731,11 +12353,7 @@ class KytheGetKytheEntriesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// kythe.getKytheEntries result @@ -12821,12 +12439,10 @@ class KytheGetKytheEntriesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, entries.hashCode); - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + entries.hashCode, + files.hashCode, + ); } /// LibraryPathSet @@ -12894,12 +12510,10 @@ class LibraryPathSet implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, scope.hashCode); - hash = JenkinsSmiHash.combine(hash, libraryPaths.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + scope.hashCode, + libraryPaths.hashCode, + ); } /// moveFile feedback @@ -12915,9 +12529,7 @@ class MoveFileFeedback extends RefactoringFeedback implements HasToJson { } @override - int get hashCode { - return 438975893; - } + int get hashCode => 438975893; } /// moveFile options @@ -12975,11 +12587,7 @@ class MoveFileOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, newFile.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => newFile.hashCode; } /// OverriddenMember @@ -13043,12 +12651,10 @@ class OverriddenMember implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, className.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + element.hashCode, + className.hashCode, + ); } /// Override @@ -13152,14 +12758,12 @@ class Override implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, superclassMember.hashCode); - hash = JenkinsSmiHash.combine(hash, interfaceMembers.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + superclassMember.hashCode, + interfaceMembers.hashCode, + ); } /// PostfixTemplateDescriptor @@ -13234,13 +12838,11 @@ class PostfixTemplateDescriptor implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, key.hashCode); - hash = JenkinsSmiHash.combine(hash, example.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + key.hashCode, + example.hashCode, + ); } /// PubStatus @@ -13293,11 +12895,7 @@ class PubStatus implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, isListingPackageDirs.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => isListingPackageDirs.hashCode; } /// RefactoringFeedback @@ -13333,10 +12931,7 @@ class RefactoringFeedback implements HasToJson { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// RefactoringOptions @@ -13371,10 +12966,7 @@ class RefactoringOptions implements HasToJson { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// rename feedback @@ -13465,14 +13057,12 @@ class RenameFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, elementKindName.hashCode); - hash = JenkinsSmiHash.combine(hash, oldName.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + elementKindName.hashCode, + oldName.hashCode, + ); } /// rename options @@ -13530,11 +13120,7 @@ class RenameOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, newName.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => newName.hashCode; } /// RequestError @@ -13614,13 +13200,11 @@ class RequestError implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, code.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + code.hashCode, + message.hashCode, + stackTrace.hashCode, + ); } /// RequestErrorCode @@ -14048,13 +13632,11 @@ class RuntimeCompletionExpression implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + type.hashCode, + ); } /// RuntimeCompletionExpressionType @@ -14234,17 +13816,15 @@ class RuntimeCompletionExpressionType implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, libraryPath.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, typeArguments.hashCode); - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterTypes.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterNames.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + libraryPath.hashCode, + kind.hashCode, + name.hashCode, + typeArguments.hashCode, + returnType.hashCode, + parameterTypes.hashCode, + parameterNames.hashCode, + ); } /// RuntimeCompletionExpressionTypeKind @@ -14368,12 +13948,10 @@ class RuntimeCompletionVariable implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + type.hashCode, + ); } /// search.findElementReferences params @@ -14463,13 +14041,11 @@ class SearchFindElementReferencesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, includePotential.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + includePotential.hashCode, + ); } /// search.findElementReferences result @@ -14553,12 +14129,10 @@ class SearchFindElementReferencesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, element.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + element.hashCode, + ); } /// search.findMemberDeclarations params @@ -14620,11 +14194,7 @@ class SearchFindMemberDeclarationsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => name.hashCode; } /// search.findMemberDeclarations result @@ -14688,11 +14258,7 @@ class SearchFindMemberDeclarationsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// search.findMemberReferences params @@ -14754,11 +14320,7 @@ class SearchFindMemberReferencesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => name.hashCode; } /// search.findMemberReferences result @@ -14822,11 +14384,7 @@ class SearchFindMemberReferencesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// search.findTopLevelDeclarations params @@ -14890,11 +14448,7 @@ class SearchFindTopLevelDeclarationsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, pattern.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => pattern.hashCode; } /// search.findTopLevelDeclarations result @@ -14958,11 +14512,7 @@ class SearchFindTopLevelDeclarationsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => id.hashCode; } /// search.getElementDeclarations params @@ -15058,13 +14608,11 @@ class SearchGetElementDeclarationsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, pattern.hashCode); - hash = JenkinsSmiHash.combine(hash, maxResults.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + pattern.hashCode, + maxResults.hashCode, + ); } /// search.getElementDeclarations result @@ -15147,12 +14695,10 @@ class SearchGetElementDeclarationsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, declarations.hashCode); - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + declarations.hashCode, + files.hashCode, + ); } /// search.getTypeHierarchy params @@ -15242,13 +14788,11 @@ class SearchGetTypeHierarchyParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, superOnly.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + superOnly.hashCode, + ); } /// search.getTypeHierarchy result @@ -15328,11 +14872,7 @@ class SearchGetTypeHierarchyResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, hierarchyItems.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => hierarchyItems.hashCode; } /// SearchResult @@ -15431,14 +14971,12 @@ class SearchResult implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, location.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, isPotential.hashCode); - hash = JenkinsSmiHash.combine(hash, path.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + location.hashCode, + kind.hashCode, + isPotential.hashCode, + path.hashCode, + ); } /// SearchResultKind @@ -15619,13 +15157,11 @@ class SearchResultsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, results.hashCode); - hash = JenkinsSmiHash.combine(hash, isLast.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + results.hashCode, + isLast.hashCode, + ); } /// server.connected params @@ -15697,12 +15233,10 @@ class ServerConnectedParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, version.hashCode); - hash = JenkinsSmiHash.combine(hash, pid.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + version.hashCode, + pid.hashCode, + ); } /// server.error params @@ -15791,13 +15325,11 @@ class ServerErrorParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, isFatal.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + isFatal.hashCode, + message.hashCode, + stackTrace.hashCode, + ); } /// server.getVersion params @@ -15821,9 +15353,7 @@ class ServerGetVersionParams implements RequestParams { } @override - int get hashCode { - return 55877452; - } + int get hashCode => 55877452; } /// server.getVersion result @@ -15887,11 +15417,7 @@ class ServerGetVersionResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, version.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => version.hashCode; } /// ServerLogEntry @@ -15968,13 +15494,11 @@ class ServerLogEntry implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, time.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, data.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + time.hashCode, + kind.hashCode, + data.hashCode, + ); } /// ServerLogEntryKind @@ -16121,11 +15645,7 @@ class ServerLogParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, entry.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => entry.hashCode; } /// ServerService @@ -16242,11 +15762,7 @@ class ServerSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// server.setSubscriptions result @@ -16270,9 +15786,7 @@ class ServerSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 748820900; - } + int get hashCode => 748820900; } /// server.shutdown params @@ -16296,9 +15810,7 @@ class ServerShutdownParams implements RequestParams { } @override - int get hashCode { - return 366630911; - } + int get hashCode => 366630911; } /// server.shutdown result @@ -16322,9 +15834,7 @@ class ServerShutdownResult implements ResponseResult { } @override - int get hashCode { - return 193626532; - } + int get hashCode => 193626532; } /// server.status params @@ -16403,12 +15913,10 @@ class ServerStatusParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, analysis.hashCode); - hash = JenkinsSmiHash.combine(hash, pub.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + analysis.hashCode, + pub.hashCode, + ); } /// TypeHierarchyItem @@ -16568,15 +16076,13 @@ class TypeHierarchyItem implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, classElement.hashCode); - hash = JenkinsSmiHash.combine(hash, displayName.hashCode); - hash = JenkinsSmiHash.combine(hash, memberElement.hashCode); - hash = JenkinsSmiHash.combine(hash, superclass.hashCode); - hash = JenkinsSmiHash.combine(hash, interfaces.hashCode); - hash = JenkinsSmiHash.combine(hash, mixins.hashCode); - hash = JenkinsSmiHash.combine(hash, subclasses.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + classElement.hashCode, + displayName.hashCode, + memberElement.hashCode, + superclass.hashCode, + interfaces.hashCode, + mixins.hashCode, + subclasses.hashCode, + ); } diff --git a/pkg/analyzer/lib/src/context/context_root.dart b/pkg/analyzer/lib/src/context/context_root.dart index d79e72c6974..515594793a2 100644 --- a/pkg/analyzer/lib/src/context/context_root.dart +++ b/pkg/analyzer/lib/src/context/context_root.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:path/path.dart' as path; /// Information about the root directory associated with an analysis context. @@ -29,12 +28,7 @@ class ContextRoot { ContextRoot(this.root, this.exclude, {required this.pathContext}); @override - int get hashCode { - int hash = 0; - hash = JenkinsSmiHash.combine(hash, root.hashCode); - hash = JenkinsSmiHash.combine(hash, exclude.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash(root, exclude); @override bool operator ==(Object other) { diff --git a/pkg/analyzer/lib/src/dart/analysis/dependency/node.dart b/pkg/analyzer/lib/src/dart/analysis/dependency/node.dart index e99f61601ad..70eb2faa6bd 100644 --- a/pkg/analyzer/lib/src/dart/analysis/dependency/node.dart +++ b/pkg/analyzer/lib/src/dart/analysis/dependency/node.dart @@ -4,7 +4,6 @@ import 'dart:typed_data'; -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:convert/convert.dart'; /// The reference to a class member. @@ -23,7 +22,7 @@ class ClassMemberReference { final int hashCode; ClassMemberReference(this.target, this.name) - : hashCode = JenkinsSmiHash.hash2(target.hashCode, name.hashCode); + : hashCode = Object.hash(target.hashCode, name.hashCode); @override bool operator ==(Object other) { @@ -121,7 +120,7 @@ class LibraryQualifiedName { factory LibraryQualifiedName(Uri libraryUri, String name) { var isPrivate = name.startsWith('_'); - var hashCode = JenkinsSmiHash.hash2(libraryUri.hashCode, name.hashCode); + var hashCode = Object.hash(libraryUri.hashCode, name.hashCode); return LibraryQualifiedName._internal( libraryUri, name, isPrivate, hashCode); } diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.dart index 88ced1a46e7..7d994071ab9 100644 --- a/pkg/analyzer/lib/src/dart/analysis/experiments.dart +++ b/pkg/analyzer/lib/src/dart/analysis/experiments.dart @@ -6,7 +6,6 @@ import 'dart:typed_data'; import 'package:analyzer/dart/analysis/features.dart'; import 'package:analyzer/src/dart/analysis/experiments_impl.dart'; -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:meta/meta.dart'; import 'package:pub_semver/src/version.dart'; @@ -172,13 +171,7 @@ class ExperimentStatus with _CurrentState implements FeatureSet { ); @override - int get hashCode { - int hash = 0; - for (var flag in _flags) { - hash = JenkinsSmiHash.combine(hash, flag.hashCode); - } - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hashAll(_flags); @override bool operator ==(Object other) { diff --git a/pkg/analyzer/lib/src/dart/constant/value.dart b/pkg/analyzer/lib/src/dart/constant/value.dart index 9f5cd4282d3..80943a1a34b 100644 --- a/pkg/analyzer/lib/src/dart/constant/value.dart +++ b/pkg/analyzer/lib/src/dart/constant/value.dart @@ -13,7 +13,6 @@ import 'package:analyzer/error/error.dart'; import 'package:analyzer/src/dart/constant/has_type_parameter_reference.dart'; import 'package:analyzer/src/dart/element/type_system.dart'; import 'package:analyzer/src/error/codes.dart'; -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:meta/meta.dart'; /// The state of an object representing a boolean value. @@ -185,7 +184,7 @@ class DartObjectImpl implements DartObject { Map? get fields => _state.fields; @override - int get hashCode => JenkinsSmiHash.hash2(type.hashCode, _state.hashCode); + int get hashCode => Object.hash(type.hashCode, _state.hashCode); @override bool get hasKnownValue => !_state.isUnknown; diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart index edcf6c35613..9c3a24d48dd 100644 --- a/pkg/analyzer/lib/src/dart/element/element.dart +++ b/pkg/analyzer/lib/src/dart/element/element.dart @@ -42,7 +42,6 @@ import 'package:analyzer/src/generated/sdk.dart' show DartSdk; import 'package:analyzer/src/generated/source.dart'; import 'package:analyzer/src/generated/utilities_collection.dart'; import 'package:analyzer/src/generated/utilities_dart.dart'; -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:analyzer/src/macro/impl/error.dart' as macro; import 'package:analyzer/src/summary2/ast_binary_tokens.dart'; import 'package:analyzer/src/summary2/bundle_reader.dart'; @@ -2735,14 +2734,7 @@ class ElementLocationImpl implements ElementLocation { } @override - int get hashCode { - int result = 0; - for (int i = 0; i < _components.length; i++) { - String component = _components[i]; - result = JenkinsSmiHash.combine(result, component.hashCode); - } - return result; - } + int get hashCode => Object.hashAll(_components); @override bool operator ==(Object object) { diff --git a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart index 86ad536036e..1be5afd72b6 100644 --- a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart +++ b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart @@ -8,7 +8,6 @@ import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/dart/element/member.dart'; import 'package:analyzer/src/dart/element/type_algebra.dart'; import 'package:analyzer/src/dart/element/type_system.dart'; -import 'package:analyzer/src/generated/utilities_general.dart'; /// Failure because of there is no most specific signature in [candidates]. class CandidatesConflict extends Conflict { @@ -885,7 +884,7 @@ class Name { factory Name(Uri? libraryUri, String name) { if (name.startsWith('_')) { - var hashCode = JenkinsSmiHash.hash2(libraryUri.hashCode, name.hashCode); + var hashCode = Object.hash(libraryUri.hashCode, name.hashCode); return Name._internal(libraryUri, name, false, hashCode); } else { return Name._internal(null, name, true, name.hashCode); diff --git a/pkg/analyzer/lib/src/generated/utilities_general.dart b/pkg/analyzer/lib/src/generated/utilities_general.dart index bfd1e087aa3..d9e674295a8 100644 --- a/pkg/analyzer/lib/src/generated/utilities_general.dart +++ b/pkg/analyzer/lib/src/generated/utilities_general.dart @@ -42,58 +42,6 @@ String? toLowerCase(Object? value) => value?.toString().toLowerCase(); /// null. String? toUpperCase(Object? value) => value?.toString().toUpperCase(); -/// Jenkins hash function, optimized for small integers. -/// -/// Static methods borrowed from sdk/lib/math/jenkins_smi_hash.dart. Non-static -/// methods are an enhancement for the "front_end" package. -/// -/// Where performance is critical, use [hash2], [hash3], or [hash4], or the -/// pattern `finish(combine(combine(...combine(0, a), b)..., z))`, where a..z -/// are hash codes to be combined. -/// -/// For ease of use, you may also use this pattern: -/// `(new JenkinsSmiHash()..add(a)..add(b)....add(z)).hashCode`, where a..z are -/// the sub-objects whose hashes should be combined. This pattern performs the -/// same operations as the performance critical variant, but allocates an extra -/// object. -class JenkinsSmiHash { - int _hash = 0; - - /// Finalizes the hash and return the resulting hashcode. - @override - int get hashCode => finish(_hash); - - /// Accumulates the object [o] into the hash. - void add(Object o) { - _hash = combine(_hash, o.hashCode); - } - - /// Accumulates the hash code [value] into the running hash [hash]. - static int combine(int hash, int value) { - hash = 0x1fffffff & (hash + value); - hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10)); - return hash ^ (hash >> 6); - } - - /// Finalizes a running hash produced by [combine]. - static int finish(int hash) { - hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3)); - hash = hash ^ (hash >> 11); - return 0x1fffffff & (hash + ((0x00003fff & hash) << 15)); - } - - /// Combines together two hash codes. - static int hash2(int a, int b) => finish(combine(combine(0, a), b)); - - /// Combines together three hash codes. - static int hash3(int a, int b, int c) => - finish(combine(combine(combine(0, a), b), c)); - - /// Combines together four hash codes. - static int hash4(int a, int b, int c, int d) => - finish(combine(combine(combine(combine(0, a), b), c), d)); -} - /// A simple limited queue. class LimitedQueue extends ListQueue { final int limit; diff --git a/pkg/analyzer/pubspec.yaml b/pkg/analyzer/pubspec.yaml index 6a3198e3798..3b0dae7bdff 100644 --- a/pkg/analyzer/pubspec.yaml +++ b/pkg/analyzer/pubspec.yaml @@ -4,7 +4,7 @@ description: This package provides a library that performs static analysis of Da homepage: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.14.0 <3.0.0' dependencies: _fe_analyzer_shared: ^26.0.0 diff --git a/pkg/analyzer_plugin/lib/protocol/protocol_common.dart b/pkg/analyzer_plugin/lib/protocol/protocol_common.dart index 65b670419b5..2e566d73279 100644 --- a/pkg/analyzer_plugin/lib/protocol/protocol_common.dart +++ b/pkg/analyzer_plugin/lib/protocol/protocol_common.dart @@ -8,7 +8,6 @@ import 'dart:convert' hide JsonDecoder; -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:analyzer_plugin/protocol/protocol.dart'; import 'package:analyzer_plugin/src/protocol/protocol_internal.dart'; @@ -66,12 +65,10 @@ class AddContentOverlay implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, 704418402); - hash = JenkinsSmiHash.combine(hash, content.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + 704418402, + content.hashCode, + ); } /// AnalysisError @@ -252,19 +249,17 @@ class AnalysisError implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, severity.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - hash = JenkinsSmiHash.combine(hash, location.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, correction.hashCode); - hash = JenkinsSmiHash.combine(hash, code.hashCode); - hash = JenkinsSmiHash.combine(hash, url.hashCode); - hash = JenkinsSmiHash.combine(hash, contextMessages.hashCode); - hash = JenkinsSmiHash.combine(hash, hasFix.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + severity.hashCode, + type.hashCode, + location.hashCode, + message.hashCode, + correction.hashCode, + code.hashCode, + url.hashCode, + contextMessages.hashCode, + hasFix.hashCode, + ); } /// AnalysisErrorSeverity @@ -477,12 +472,10 @@ class ChangeContentOverlay implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, 873118866); - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + 873118866, + edits.hashCode, + ); } /// CompletionSuggestion @@ -918,33 +911,31 @@ class CompletionSuggestion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, relevance.hashCode); - hash = JenkinsSmiHash.combine(hash, completion.hashCode); - hash = JenkinsSmiHash.combine(hash, displayText.hashCode); - hash = JenkinsSmiHash.combine(hash, replacementOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, replacementLength.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, selectionLength.hashCode); - hash = JenkinsSmiHash.combine(hash, isDeprecated.hashCode); - hash = JenkinsSmiHash.combine(hash, isPotential.hashCode); - hash = JenkinsSmiHash.combine(hash, docSummary.hashCode); - hash = JenkinsSmiHash.combine(hash, docComplete.hashCode); - hash = JenkinsSmiHash.combine(hash, declaringType.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultArgumentListString.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultArgumentListTextRanges.hashCode); - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterNames.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterTypes.hashCode); - hash = JenkinsSmiHash.combine(hash, requiredParameterCount.hashCode); - hash = JenkinsSmiHash.combine(hash, hasNamedParameters.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterName.hashCode); - hash = JenkinsSmiHash.combine(hash, parameterType.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hashAll([ + kind.hashCode, + relevance.hashCode, + completion.hashCode, + displayText.hashCode, + replacementOffset.hashCode, + replacementLength.hashCode, + selectionOffset.hashCode, + selectionLength.hashCode, + isDeprecated.hashCode, + isPotential.hashCode, + docSummary.hashCode, + docComplete.hashCode, + declaringType.hashCode, + defaultArgumentListString.hashCode, + defaultArgumentListTextRanges.hashCode, + element.hashCode, + returnType.hashCode, + parameterNames.hashCode, + parameterTypes.hashCode, + requiredParameterCount.hashCode, + hasNamedParameters.hashCode, + parameterName.hashCode, + parameterType.hashCode, + ]); } /// CompletionSuggestionKind @@ -1139,12 +1130,10 @@ class DiagnosticMessage implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, location.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + message.hashCode, + location.hashCode, + ); } /// Element @@ -1347,18 +1336,16 @@ class Element implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, location.hashCode); - hash = JenkinsSmiHash.combine(hash, flags.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, typeParameters.hashCode); - hash = JenkinsSmiHash.combine(hash, aliasedType.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + name.hashCode, + location.hashCode, + flags.hashCode, + parameters.hashCode, + returnType.hashCode, + typeParameters.hashCode, + aliasedType.hashCode, + ); } /// ElementKind @@ -1753,13 +1740,11 @@ class FoldingRegion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + offset.hashCode, + length.hashCode, + ); } /// HighlightRegion @@ -1835,13 +1820,11 @@ class HighlightRegion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, type.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + type.hashCode, + offset.hashCode, + length.hashCode, + ); } /// HighlightRegionType @@ -2545,15 +2528,13 @@ class KytheEntry implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, source.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, target.hashCode); - hash = JenkinsSmiHash.combine(hash, fact.hashCode); - hash = JenkinsSmiHash.combine(hash, value.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + source.hashCode, + kind.hashCode, + target.hashCode, + fact.hashCode, + value.hashCode, + ); } /// KytheVName @@ -2659,15 +2640,13 @@ class KytheVName implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, signature.hashCode); - hash = JenkinsSmiHash.combine(hash, corpus.hashCode); - hash = JenkinsSmiHash.combine(hash, root.hashCode); - hash = JenkinsSmiHash.combine(hash, path.hashCode); - hash = JenkinsSmiHash.combine(hash, language.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + signature.hashCode, + corpus.hashCode, + root.hashCode, + path.hashCode, + language.hashCode, + ); } /// LinkedEditGroup @@ -2770,13 +2749,11 @@ class LinkedEditGroup implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, positions.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, suggestions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + positions.hashCode, + length.hashCode, + suggestions.hashCode, + ); } /// LinkedEditSuggestion @@ -2839,12 +2816,10 @@ class LinkedEditSuggestion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, value.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + value.hashCode, + kind.hashCode, + ); } /// LinkedEditSuggestionKind @@ -3043,17 +3018,15 @@ class Location implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, startLine.hashCode); - hash = JenkinsSmiHash.combine(hash, startColumn.hashCode); - hash = JenkinsSmiHash.combine(hash, endLine.hashCode); - hash = JenkinsSmiHash.combine(hash, endColumn.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + startLine.hashCode, + startColumn.hashCode, + endLine.hashCode, + endColumn.hashCode, + ); } /// NavigationRegion @@ -3131,13 +3104,11 @@ class NavigationRegion implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, targets.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + targets.hashCode, + ); } /// NavigationTarget @@ -3287,18 +3258,16 @@ class NavigationTarget implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, fileIndex.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, startLine.hashCode); - hash = JenkinsSmiHash.combine(hash, startColumn.hashCode); - hash = JenkinsSmiHash.combine(hash, codeOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, codeLength.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + fileIndex.hashCode, + offset.hashCode, + length.hashCode, + startLine.hashCode, + startColumn.hashCode, + codeOffset.hashCode, + codeLength.hashCode, + ); } /// Occurrences @@ -3375,13 +3344,11 @@ class Occurrences implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, offsets.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + element.hashCode, + offsets.hashCode, + length.hashCode, + ); } /// Outline @@ -3509,16 +3476,14 @@ class Outline implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, element.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, codeOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, codeLength.hashCode); - hash = JenkinsSmiHash.combine(hash, children.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + element.hashCode, + offset.hashCode, + length.hashCode, + codeOffset.hashCode, + codeLength.hashCode, + children.hashCode, + ); } /// ParameterInfo @@ -3609,14 +3574,12 @@ class ParameterInfo implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - hash = JenkinsSmiHash.combine(hash, defaultValue.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + name.hashCode, + type.hashCode, + defaultValue.hashCode, + ); } /// ParameterKind @@ -3748,12 +3711,10 @@ class Position implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// RefactoringKind @@ -3963,15 +3924,13 @@ class RefactoringMethodParameter implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, id.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, type.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + id.hashCode, + kind.hashCode, + type.hashCode, + name.hashCode, + parameters.hashCode, + ); } /// RefactoringMethodParameterKind @@ -4111,13 +4070,11 @@ class RefactoringProblem implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, severity.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, location.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + severity.hashCode, + message.hashCode, + location.hashCode, + ); } /// RefactoringProblemSeverity @@ -4248,11 +4205,7 @@ class RemoveContentOverlay implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, 114870849); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 114870849; } /// SourceChange @@ -4397,15 +4350,13 @@ class SourceChange implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - hash = JenkinsSmiHash.combine(hash, linkedEditGroups.hashCode); - hash = JenkinsSmiHash.combine(hash, selection.hashCode); - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + message.hashCode, + edits.hashCode, + linkedEditGroups.hashCode, + selection.hashCode, + id.hashCode, + ); } /// SourceEdit @@ -4512,14 +4463,12 @@ class SourceEdit implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, replacement.hashCode); - hash = JenkinsSmiHash.combine(hash, id.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + replacement.hashCode, + id.hashCode, + ); } /// SourceFileEdit @@ -4610,11 +4559,9 @@ class SourceFileEdit implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, fileStamp.hashCode); - hash = JenkinsSmiHash.combine(hash, edits.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + fileStamp.hashCode, + edits.hashCode, + ); } diff --git a/pkg/analyzer_plugin/lib/protocol/protocol_generated.dart b/pkg/analyzer_plugin/lib/protocol/protocol_generated.dart index 937d5c275b2..ac23e9237f0 100644 --- a/pkg/analyzer_plugin/lib/protocol/protocol_generated.dart +++ b/pkg/analyzer_plugin/lib/protocol/protocol_generated.dart @@ -8,7 +8,6 @@ import 'dart:convert' hide JsonDecoder; -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:analyzer_plugin/protocol/protocol.dart'; import 'package:analyzer_plugin/src/protocol/protocol_internal.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; @@ -81,12 +80,10 @@ class AnalysisErrorFixes implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, error.hashCode); - hash = JenkinsSmiHash.combine(hash, fixes.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + error.hashCode, + fixes.hashCode, + ); } /// analysis.errors params @@ -164,12 +161,10 @@ class AnalysisErrorsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, errors.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + errors.hashCode, + ); } /// analysis.folding params @@ -247,12 +242,10 @@ class AnalysisFoldingParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + regions.hashCode, + ); } /// analysis.getNavigation params @@ -340,13 +333,11 @@ class AnalysisGetNavigationParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// analysis.getNavigation result @@ -449,13 +440,11 @@ class AnalysisGetNavigationResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - hash = JenkinsSmiHash.combine(hash, targets.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + files.hashCode, + targets.hashCode, + regions.hashCode, + ); } /// analysis.handleWatchEvents params @@ -523,11 +512,7 @@ class AnalysisHandleWatchEventsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, events.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => events.hashCode; } /// analysis.handleWatchEvents result @@ -551,9 +536,7 @@ class AnalysisHandleWatchEventsResult implements ResponseResult { } @override - int get hashCode { - return 779767607; - } + int get hashCode => 779767607; } /// analysis.highlights params @@ -631,12 +614,10 @@ class AnalysisHighlightsParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + regions.hashCode, + ); } /// analysis.navigation params @@ -747,14 +728,12 @@ class AnalysisNavigationParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, regions.hashCode); - hash = JenkinsSmiHash.combine(hash, targets.hashCode); - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + regions.hashCode, + targets.hashCode, + files.hashCode, + ); } /// analysis.occurrences params @@ -833,12 +812,10 @@ class AnalysisOccurrencesParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, occurrences.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + occurrences.hashCode, + ); } /// analysis.outline params @@ -914,12 +891,10 @@ class AnalysisOutlineParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, outline.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + outline.hashCode, + ); } /// AnalysisService @@ -1056,11 +1031,7 @@ class AnalysisSetContextRootsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, roots.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => roots.hashCode; } /// analysis.setContextRoots result @@ -1084,9 +1055,7 @@ class AnalysisSetContextRootsResult implements ResponseResult { } @override - int get hashCode { - return 969645618; - } + int get hashCode => 969645618; } /// analysis.setPriorityFiles params @@ -1149,11 +1118,7 @@ class AnalysisSetPriorityFilesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => files.hashCode; } /// analysis.setPriorityFiles result @@ -1177,9 +1142,7 @@ class AnalysisSetPriorityFilesResult implements ResponseResult { } @override - int get hashCode { - return 330050055; - } + int get hashCode => 330050055; } /// analysis.setSubscriptions params @@ -1252,11 +1215,7 @@ class AnalysisSetSubscriptionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, subscriptions.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => subscriptions.hashCode; } /// analysis.setSubscriptions result @@ -1280,9 +1239,7 @@ class AnalysisSetSubscriptionsResult implements ResponseResult { } @override - int get hashCode { - return 218088493; - } + int get hashCode => 218088493; } /// analysis.updateContent params @@ -1356,11 +1313,7 @@ class AnalysisUpdateContentParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => files.hashCode; } /// analysis.updateContent result @@ -1384,9 +1337,7 @@ class AnalysisUpdateContentResult implements ResponseResult { } @override - int get hashCode { - return 468798730; - } + int get hashCode => 468798730; } /// completion.getSuggestions params @@ -1459,12 +1410,10 @@ class CompletionGetSuggestionsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// completion.getSuggestions result @@ -1572,13 +1521,11 @@ class CompletionGetSuggestionsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, replacementOffset.hashCode); - hash = JenkinsSmiHash.combine(hash, replacementLength.hashCode); - hash = JenkinsSmiHash.combine(hash, results.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + replacementOffset.hashCode, + replacementLength.hashCode, + results.hashCode, + ); } /// ContextRoot @@ -1659,13 +1606,11 @@ class ContextRoot implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, root.hashCode); - hash = JenkinsSmiHash.combine(hash, exclude.hashCode); - hash = JenkinsSmiHash.combine(hash, optionsFile.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + root.hashCode, + exclude.hashCode, + optionsFile.hashCode, + ); } /// convertGetterToMethod feedback @@ -1682,9 +1627,7 @@ class ConvertGetterToMethodFeedback extends RefactoringFeedback } @override - int get hashCode { - return 616032599; - } + int get hashCode => 616032599; } /// convertGetterToMethod options @@ -1701,9 +1644,7 @@ class ConvertGetterToMethodOptions extends RefactoringOptions } @override - int get hashCode { - return 488848400; - } + int get hashCode => 488848400; } /// convertMethodToGetter feedback @@ -1720,9 +1661,7 @@ class ConvertMethodToGetterFeedback extends RefactoringFeedback } @override - int get hashCode { - return 165291526; - } + int get hashCode => 165291526; } /// convertMethodToGetter options @@ -1739,9 +1678,7 @@ class ConvertMethodToGetterOptions extends RefactoringOptions } @override - int get hashCode { - return 27952290; - } + int get hashCode => 27952290; } /// edit.getAssists params @@ -1826,13 +1763,11 @@ class EditGetAssistsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// edit.getAssists result @@ -1901,11 +1836,7 @@ class EditGetAssistsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, assists.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => assists.hashCode; } /// edit.getAvailableRefactorings params @@ -1991,13 +1922,11 @@ class EditGetAvailableRefactoringsParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + length.hashCode, + ); } /// edit.getAvailableRefactorings result @@ -2072,11 +2001,7 @@ class EditGetAvailableRefactoringsResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kinds.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => kinds.hashCode; } /// edit.getFixes params @@ -2148,12 +2073,10 @@ class EditGetFixesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + file.hashCode, + offset.hashCode, + ); } /// edit.getFixes result @@ -2222,11 +2145,7 @@ class EditGetFixesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, fixes.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => fixes.hashCode; } /// edit.getRefactoring params @@ -2361,16 +2280,14 @@ class EditGetRefactoringParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - hash = JenkinsSmiHash.combine(hash, file.hashCode); - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, validateOnly.hashCode); - hash = JenkinsSmiHash.combine(hash, options.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + kind.hashCode, + file.hashCode, + offset.hashCode, + length.hashCode, + validateOnly.hashCode, + options.hashCode, + ); } /// edit.getRefactoring result @@ -2542,16 +2459,14 @@ class EditGetRefactoringResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, initialProblems.hashCode); - hash = JenkinsSmiHash.combine(hash, optionsProblems.hashCode); - hash = JenkinsSmiHash.combine(hash, finalProblems.hashCode); - hash = JenkinsSmiHash.combine(hash, feedback.hashCode); - hash = JenkinsSmiHash.combine(hash, change.hashCode); - hash = JenkinsSmiHash.combine(hash, potentialEdits.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + initialProblems.hashCode, + optionsProblems.hashCode, + finalProblems.hashCode, + feedback.hashCode, + change.hashCode, + potentialEdits.hashCode, + ); } /// extractLocalVariable feedback @@ -2673,15 +2588,13 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback { } @override - int get hashCode { - var 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); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + coveringExpressionOffsets.hashCode, + coveringExpressionLengths.hashCode, + names.hashCode, + offsets.hashCode, + lengths.hashCode, + ); } /// extractLocalVariable options @@ -2754,12 +2667,10 @@ class ExtractLocalVariableOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, extractAll.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + extractAll.hashCode, + ); } /// extractMethod feedback @@ -2919,18 +2830,16 @@ class ExtractMethodFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, names.hashCode); - hash = JenkinsSmiHash.combine(hash, canCreateGetter.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, offsets.hashCode); - hash = JenkinsSmiHash.combine(hash, lengths.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + returnType.hashCode, + names.hashCode, + canCreateGetter.hashCode, + parameters.hashCode, + offsets.hashCode, + lengths.hashCode, + ); } /// extractMethod options @@ -3063,15 +2972,13 @@ class ExtractMethodOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, returnType.hashCode); - hash = JenkinsSmiHash.combine(hash, createGetter.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, parameters.hashCode); - hash = JenkinsSmiHash.combine(hash, extractAll.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + returnType.hashCode, + createGetter.hashCode, + name.hashCode, + parameters.hashCode, + extractAll.hashCode, + ); } /// inlineLocalVariable feedback @@ -3135,12 +3042,10 @@ class InlineLocalVariableFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, occurrences.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + name.hashCode, + occurrences.hashCode, + ); } /// inlineLocalVariable options @@ -3157,9 +3062,7 @@ class InlineLocalVariableOptions extends RefactoringOptions } @override - int get hashCode { - return 540364977; - } + int get hashCode => 540364977; } /// inlineMethod feedback @@ -3241,13 +3144,11 @@ class InlineMethodFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, className.hashCode); - hash = JenkinsSmiHash.combine(hash, methodName.hashCode); - hash = JenkinsSmiHash.combine(hash, isDeclaration.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + className.hashCode, + methodName.hashCode, + isDeclaration.hashCode, + ); } /// inlineMethod options @@ -3319,12 +3220,10 @@ class InlineMethodOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, deleteSource.hashCode); - hash = JenkinsSmiHash.combine(hash, inlineAll.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + deleteSource.hashCode, + inlineAll.hashCode, + ); } /// kythe.getKytheEntries params @@ -3387,11 +3286,7 @@ class KytheGetKytheEntriesParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, file.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => file.hashCode; } /// kythe.getKytheEntries result @@ -3477,12 +3372,10 @@ class KytheGetKytheEntriesResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, entries.hashCode); - hash = JenkinsSmiHash.combine(hash, files.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + entries.hashCode, + files.hashCode, + ); } /// moveFile feedback @@ -3498,9 +3391,7 @@ class MoveFileFeedback extends RefactoringFeedback implements HasToJson { } @override - int get hashCode { - return 438975893; - } + int get hashCode => 438975893; } /// moveFile options @@ -3558,11 +3449,7 @@ class MoveFileOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, newFile.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => newFile.hashCode; } /// plugin.error params @@ -3653,13 +3540,11 @@ class PluginErrorParams implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, isFatal.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + isFatal.hashCode, + message.hashCode, + stackTrace.hashCode, + ); } /// plugin.shutdown params @@ -3683,9 +3568,7 @@ class PluginShutdownParams implements RequestParams { } @override - int get hashCode { - return 478064585; - } + int get hashCode => 478064585; } /// plugin.shutdown result @@ -3709,9 +3592,7 @@ class PluginShutdownResult implements ResponseResult { } @override - int get hashCode { - return 9389109; - } + int get hashCode => 9389109; } /// plugin.versionCheck params @@ -3802,13 +3683,11 @@ class PluginVersionCheckParams implements RequestParams { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, byteStorePath.hashCode); - hash = JenkinsSmiHash.combine(hash, sdkPath.hashCode); - hash = JenkinsSmiHash.combine(hash, version.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + byteStorePath.hashCode, + sdkPath.hashCode, + version.hashCode, + ); } /// plugin.versionCheck result @@ -3939,15 +3818,13 @@ class PluginVersionCheckResult implements ResponseResult { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, isCompatible.hashCode); - hash = JenkinsSmiHash.combine(hash, name.hashCode); - hash = JenkinsSmiHash.combine(hash, version.hashCode); - hash = JenkinsSmiHash.combine(hash, contactInfo.hashCode); - hash = JenkinsSmiHash.combine(hash, interestingFiles.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + isCompatible.hashCode, + name.hashCode, + version.hashCode, + contactInfo.hashCode, + interestingFiles.hashCode, + ); } /// PrioritizedSourceChange @@ -4012,12 +3889,10 @@ class PrioritizedSourceChange implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, priority.hashCode); - hash = JenkinsSmiHash.combine(hash, change.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + priority.hashCode, + change.hashCode, + ); } /// RefactoringFeedback @@ -4053,10 +3928,7 @@ class RefactoringFeedback implements HasToJson { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// RefactoringOptions @@ -4091,10 +3963,7 @@ class RefactoringOptions implements HasToJson { } @override - int get hashCode { - var hash = 0; - return JenkinsSmiHash.finish(hash); - } + int get hashCode => 0; } /// rename feedback @@ -4184,14 +4053,12 @@ class RenameFeedback extends RefactoringFeedback { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, offset.hashCode); - hash = JenkinsSmiHash.combine(hash, length.hashCode); - hash = JenkinsSmiHash.combine(hash, elementKindName.hashCode); - hash = JenkinsSmiHash.combine(hash, oldName.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + offset.hashCode, + length.hashCode, + elementKindName.hashCode, + oldName.hashCode, + ); } /// rename options @@ -4249,11 +4116,7 @@ class RenameOptions extends RefactoringOptions { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, newName.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => newName.hashCode; } /// RequestError @@ -4333,13 +4196,11 @@ class RequestError implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, code.hashCode); - hash = JenkinsSmiHash.combine(hash, message.hashCode); - hash = JenkinsSmiHash.combine(hash, stackTrace.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + code.hashCode, + message.hashCode, + stackTrace.hashCode, + ); } /// RequestErrorCode @@ -4483,12 +4344,10 @@ class WatchEvent implements HasToJson { } @override - int get hashCode { - var hash = 0; - hash = JenkinsSmiHash.combine(hash, type.hashCode); - hash = JenkinsSmiHash.combine(hash, path.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash( + type.hashCode, + path.hashCode, + ); } /// WatchEventType diff --git a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_core.dart b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_core.dart index f7e9777bd83..a9597f71f0c 100644 --- a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_core.dart +++ b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_core.dart @@ -10,7 +10,6 @@ import 'package:analyzer/dart/analysis/session.dart'; import 'package:analyzer/exception/exception.dart'; import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/src/generated/source.dart'; -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:analyzer_plugin/src/utilities/change_builder/change_builder_dart.dart'; import 'package:analyzer_plugin/src/utilities/change_builder/change_builder_yaml.dart'; @@ -71,23 +70,14 @@ class ChangeBuilderImpl implements ChangeBuilder { // In addition, we should consider implementing our own hash function for // file edits because the `hashCode` defined for them might not be // sufficient to detect all changes to the list of edits. - var hash = 0; - for (var builder in _genericFileEditBuilders.values) { - if (builder.hasEdits) { - hash = JenkinsSmiHash.combine(hash, builder.fileEdit.hashCode); - } - } - for (var builder in _dartFileEditBuilders.values) { - if (builder.hasEdits) { - hash = JenkinsSmiHash.combine(hash, builder.fileEdit.hashCode); - } - } - for (var builder in _yamlFileEditBuilders.values) { - if (builder.hasEdits) { - hash = JenkinsSmiHash.combine(hash, builder.fileEdit.hashCode); - } - } - return JenkinsSmiHash.finish(hash); + return Object.hashAll([ + for (var builder in _genericFileEditBuilders.values) + if (builder.hasEdits) builder.fileEdit, + for (var builder in _dartFileEditBuilders.values) + if (builder.hasEdits) builder.fileEdit, + for (var builder in _yamlFileEditBuilders.values) + if (builder.hasEdits) builder.fileEdit, + ]); } @override diff --git a/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart b/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart index 85fb45a7f54..5f3d9ca9c73 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart @@ -368,7 +368,6 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator { void emitImports() { writeln("import 'dart:convert' hide JsonDecoder;"); writeln(); - writeln("import 'package:analyzer/src/generated/utilities_general.dart';"); writeln("import 'package:$packageName/protocol/protocol.dart';"); writeln( "import 'package:$packageName/src/protocol/protocol_internal.dart';"); @@ -614,25 +613,39 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator { /// Emit the hashCode getter for an object class. void emitObjectHashCode(TypeObject? type, String className) { writeln('@override'); - writeln('int get hashCode {'); + writeln('int get hashCode => '); indent(() { if (type == null) { - writeln('return ${className.hashCode};'); + writeln(' ${className.hashCode}'); } else { - writeln('var hash = 0;'); - for (var field in type.fields) { - String valueToCombine; + final items = type.fields.map((field) { if (field.value != null) { - valueToCombine = field.value.hashCode.toString(); + return field.value.hashCode.toString(); } else { - valueToCombine = '${field.name}.hashCode'; + return '${field.name}.hashCode'; } - writeln('hash = JenkinsSmiHash.combine(hash, $valueToCombine);'); + }).toList(); + + if (items.isEmpty) { + writeln('0'); + } else if (items.length == 1) { + writeln(items.single); + } else if (items.length <= 20) { + writeln('Object.hash('); + for (var field in items) { + writeln('$field,'); + } + writeln(')'); + } else { + writeln('Object.hashAll(['); + for (var field in items) { + writeln('$field,'); + } + writeln('])'); } - writeln('return JenkinsSmiHash.finish(hash);'); } + writeln(';'); }); - writeln('}'); } /// If the class named [className] requires special constructors, emit them diff --git a/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart b/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart index a872b10d478..54062f6f99f 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_protocol_common.dart @@ -44,15 +44,11 @@ class CodegenCommonVisitor extends CodegenProtocolVisitor { writeln("import 'dart:convert' hide JsonDecoder;"); writeln(); if (forClient) { - writeln( - "import 'package:analysis_server_client/src/protocol/protocol_util.dart';"); writeln( "import 'package:analysis_server_client/src/protocol/protocol_base.dart';"); writeln( "import 'package:analysis_server_client/src/protocol/protocol_internal.dart';"); } else { - writeln( - "import 'package:analyzer/src/generated/utilities_general.dart';"); writeln("import 'package:$packageName/protocol/protocol.dart';"); writeln( "import 'package:$packageName/src/protocol/protocol_internal.dart';"); diff --git a/pkg/nnbd_migration/lib/fix_reason_target.dart b/pkg/nnbd_migration/lib/fix_reason_target.dart index 9f9c91ca2c9..c9c876bbf33 100644 --- a/pkg/nnbd_migration/lib/fix_reason_target.dart +++ b/pkg/nnbd_migration/lib/fix_reason_target.dart @@ -2,8 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analyzer/src/generated/utilities_general.dart'; - /// Data structure representing a part of a type. When a fix has multiple /// reasons (due to a complex type having different nullabilities at different /// locations), this data structure allows us to tell which part of the type @@ -53,7 +51,7 @@ class _FixReasonTarget_NamedParameter extends _FixReasonTarget_Part { : super(inner); @override - int get hashCode => JenkinsSmiHash.hash3(2, inner.hashCode, name.hashCode); + int get hashCode => Object.hash(2, inner.hashCode, name.hashCode); @override bool operator ==(Object other) => @@ -82,7 +80,7 @@ class _FixReasonTarget_PositionalParameter extends _FixReasonTarget_Part { : super(inner); @override - int get hashCode => JenkinsSmiHash.hash3(1, inner.hashCode, index); + int get hashCode => Object.hash(1, inner.hashCode, index); @override bool operator ==(Object other) => @@ -100,7 +98,7 @@ class _FixReasonTarget_ReturnType extends _FixReasonTarget_Part { _FixReasonTarget_ReturnType(FixReasonTarget inner) : super(inner); @override - int get hashCode => JenkinsSmiHash.hash2(3, inner.hashCode); + int get hashCode => Object.hash(3, inner.hashCode); @override bool operator ==(Object other) => @@ -133,7 +131,7 @@ class _FixReasonTarget_TypeArgument extends _FixReasonTarget_Part { : super(inner); @override - int get hashCode => JenkinsSmiHash.hash3(5, inner.hashCode, index); + int get hashCode => Object.hash(5, inner.hashCode, index); @override bool operator ==(Object other) => @@ -164,7 +162,7 @@ class _FixReasonTarget_YieldedType extends _FixReasonTarget_Part { _FixReasonTarget_YieldedType(FixReasonTarget inner) : super(inner); @override - int get hashCode => JenkinsSmiHash.hash2(4, inner.hashCode); + int get hashCode => Object.hash(4, inner.hashCode); @override bool operator ==(Object other) => diff --git a/pkg/nnbd_migration/lib/nnbd_migration.dart b/pkg/nnbd_migration/lib/nnbd_migration.dart index aaa17c7a58d..d184cb0e1cc 100644 --- a/pkg/nnbd_migration/lib/nnbd_migration.dart +++ b/pkg/nnbd_migration/lib/nnbd_migration.dart @@ -7,7 +7,6 @@ import 'dart:convert'; import 'package:analyzer/dart/analysis/results.dart'; import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/src/generated/source.dart'; -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:nnbd_migration/instrumentation.dart'; import 'package:nnbd_migration/src/nullability_migration_impl.dart'; @@ -254,12 +253,7 @@ class NullabilityFixDescription { {required this.appliedMessage, required this.kind}); @override - int get hashCode { - int hash = 0; - hash = JenkinsSmiHash.combine(hash, appliedMessage.hashCode); - hash = JenkinsSmiHash.combine(hash, kind.hashCode); - return JenkinsSmiHash.finish(hash); - } + int get hashCode => Object.hash(appliedMessage, kind); @override bool operator ==(Object other) => diff --git a/pkg/nnbd_migration/lib/src/front_end/migration_info.dart b/pkg/nnbd_migration/lib/src/front_end/migration_info.dart index bef2c3adf4d..02ea5e16e18 100644 --- a/pkg/nnbd_migration/lib/src/front_end/migration_info.dart +++ b/pkg/nnbd_migration/lib/src/front_end/migration_info.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; import 'package:collection/collection.dart'; import 'package:crypto/crypto.dart'; @@ -143,7 +142,7 @@ class NavigationTarget extends NavigationRegion { : super(offset, line, length); @override - int get hashCode => JenkinsSmiHash.hash3(filePath.hashCode, offset, length); + int get hashCode => Object.hash(filePath.hashCode, offset, length); @override bool operator ==(Object other) { diff --git a/pkg/nnbd_migration/pubspec.yaml b/pkg/nnbd_migration/pubspec.yaml index 18fffd339c4..6d8ac9d8577 100644 --- a/pkg/nnbd_migration/pubspec.yaml +++ b/pkg/nnbd_migration/pubspec.yaml @@ -4,7 +4,7 @@ name: nnbd_migration publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.14.0 <3.0.0' dependencies: _fe_analyzer_shared: diff --git a/pkg/telemetry/pubspec.yaml b/pkg/telemetry/pubspec.yaml index 98d68d6ae80..b5b6b309f31 100644 --- a/pkg/telemetry/pubspec.yaml +++ b/pkg/telemetry/pubspec.yaml @@ -7,7 +7,7 @@ environment: sdk: '>=2.12.0 <3.0.0' dependencies: - http: ^0.12.0 + http: ^0.13.0 meta: path: ../meta path: ^1.4.0