Format analyzer/ and analysis_server/ to dart format.
When running cl upload, I noticed that there were a lot of existing format issues, which this fixes.
Change-Id: I01611562c907dbc4151e28eceee4a1f5a51644dc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435522
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
diff --git a/pkg/analysis_server/lib/src/computer/computer_overrides.dart b/pkg/analysis_server/lib/src/computer/computer_overrides.dart
index b56382e..f4ce810 100644
--- a/pkg/analysis_server/lib/src/computer/computer_overrides.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_overrides.dart
@@ -57,9 +57,8 @@
var interfaceMembers =
interfaceElements
.map(
- (member) => proto.newOverriddenMember_fromEngine(
- member.nonSynthetic,
- ),
+ (member) =>
+ proto.newOverriddenMember_fromEngine(member.nonSynthetic),
)
.toList();
_overrides.add(
diff --git a/pkg/analyzer/lib/src/dart/element/generic_inferrer.dart b/pkg/analyzer/lib/src/dart/element/generic_inferrer.dart
index 054308a..4c782b8 100644
--- a/pkg/analyzer/lib/src/dart/element/generic_inferrer.dart
+++ b/pkg/analyzer/lib/src/dart/element/generic_inferrer.dart
@@ -51,8 +51,8 @@
class GenericInferrer {
final TypeSystemImpl _typeSystem;
final Set<TypeParameterElementImpl> _typeParameters = Set.identity();
- final Map<TypeParameterElementImpl, List<MergedTypeConstraint>>
- _constraints = {};
+ final Map<TypeParameterElementImpl, List<MergedTypeConstraint>> _constraints =
+ {};
/// The list of type parameters being inferred.
final List<TypeParameterElementImpl> _typeFormals;
diff --git a/pkg/analyzer/lib/src/dart/element/normalize.dart b/pkg/analyzer/lib/src/dart/element/normalize.dart
index 0f4bed0..96323ab 100644
--- a/pkg/analyzer/lib/src/dart/element/normalize.dart
+++ b/pkg/analyzer/lib/src/dart/element/normalize.dart
@@ -245,10 +245,7 @@
/// NORM(X & T)
/// * let S be NORM(T)
- TypeImpl _typeParameterType_promoted(
- TypeParameterElementImpl X,
- TypeImpl S,
- ) {
+ TypeImpl _typeParameterType_promoted(TypeParameterElementImpl X, TypeImpl S) {
// * if S is Never then Never
if (identical(S, NeverTypeImpl.instance)) {
return NeverTypeImpl.instance;
diff --git a/pkg/analyzer/lib/src/dart/element/type_system.dart b/pkg/analyzer/lib/src/dart/element/type_system.dart
index 3f21cc3..ae8a65c 100644
--- a/pkg/analyzer/lib/src/dart/element/type_system.dart
+++ b/pkg/analyzer/lib/src/dart/element/type_system.dart
@@ -520,8 +520,7 @@
}
candidates = [supertype];
candidates.addAll(mixinElement.mixins);
- if (mixinElement is ClassElementImpl &&
- mixinElement.isMixinApplication) {
+ if (mixinElement is ClassElementImpl && mixinElement.isMixinApplication) {
candidates.removeLast();
}
}
diff --git a/pkg/analyzer/lib/src/dart/resolver/constructor_reference_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/constructor_reference_resolver.dart
index 936e086..cb2aa2d 100644
--- a/pkg/analyzer/lib/src/dart/resolver/constructor_reference_resolver.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/constructor_reference_resolver.dart
@@ -32,8 +32,7 @@
var element = node.constructorName.element;
if (element != null && !element.isFactory) {
var enclosingElement = element.enclosingElement;
- if (enclosingElement is ClassElementImpl &&
- enclosingElement.isAbstract) {
+ if (enclosingElement is ClassElementImpl && enclosingElement.isAbstract) {
_resolver.diagnosticReporter.atNode(
node,
CompileTimeErrorCode
diff --git a/pkg/analyzer/lib/src/fine/library_manifest.dart b/pkg/analyzer/lib/src/fine/library_manifest.dart
index 4b9e48a..b55b019 100644
--- a/pkg/analyzer/lib/src/fine/library_manifest.dart
+++ b/pkg/analyzer/lib/src/fine/library_manifest.dart
@@ -1044,10 +1044,10 @@
}
/// Returns either the existing item from [declaredItems], or builds a new one.
- Item _getOrBuildElementItem<
- E extends ElementImpl,
- Item extends ManifestItem
- >(E element, Item Function() build) {
+ Item _getOrBuildElementItem<E extends ElementImpl, Item extends ManifestItem>(
+ E element,
+ Item Function() build,
+ ) {
// We assume that when matching elements against the structure of
// the item, we put into [itemMap] only the type of the item that
// corresponds the type of the element.
diff --git a/pkg/analyzer/lib/src/fine/manifest_item.dart b/pkg/analyzer/lib/src/fine/manifest_item.dart
index 4145a10..c89c151 100644
--- a/pkg/analyzer/lib/src/fine/manifest_item.dart
+++ b/pkg/analyzer/lib/src/fine/manifest_item.dart
@@ -697,8 +697,7 @@
}
}
-class InstanceItemMethodItem
- extends InstanceItemMemberItem<MethodElementImpl> {
+class InstanceItemMethodItem extends InstanceItemMemberItem<MethodElementImpl> {
final ManifestFunctionType functionType;
InstanceItemMethodItem({
diff --git a/pkg/analyzer/lib/src/fine/requirements.dart b/pkg/analyzer/lib/src/fine/requirements.dart
index c1a4bdd..326df6a 100644
--- a/pkg/analyzer/lib/src/fine/requirements.dart
+++ b/pkg/analyzer/lib/src/fine/requirements.dart
@@ -1052,9 +1052,7 @@
}
}
- _InstanceItemWithRequirements? _getInstanceItem(
- InstanceElementImpl element,
- ) {
+ _InstanceItemWithRequirements? _getInstanceItem(InstanceElementImpl element) {
var libraryElement = element.library2;
var manifest = libraryElement.manifest;
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index 1f35267..055c0fe 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -963,11 +963,7 @@
}
@override
- SwitchExpressionMemberInfo<
- AstNodeImpl,
- ExpressionImpl,
- PromotableElementImpl
- >
+ SwitchExpressionMemberInfo<AstNodeImpl, ExpressionImpl, PromotableElementImpl>
getSwitchExpressionMemberInfo(
covariant SwitchExpressionImpl node,
int index,
diff --git a/pkg/analyzer/lib/src/summary2/extension_type.dart b/pkg/analyzer/lib/src/summary2/extension_type.dart
index 628c90d..e7ecd4e 100644
--- a/pkg/analyzer/lib/src/summary2/extension_type.dart
+++ b/pkg/analyzer/lib/src/summary2/extension_type.dart
@@ -98,8 +98,7 @@
}
class _ImplementsWalker extends graph.DependencyWalker<_ImplementsNode> {
- final Map<ExtensionTypeElementImpl, _ImplementsNode> nodeMap =
- Map.identity();
+ final Map<ExtensionTypeElementImpl, _ImplementsNode> nodeMap = Map.identity();
@override
void evaluate(_ImplementsNode v) {
diff --git a/pkg/analyzer/lib/src/summary2/types_builder.dart b/pkg/analyzer/lib/src/summary2/types_builder.dart
index 48def41..a835c6a 100644
--- a/pkg/analyzer/lib/src/summary2/types_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/types_builder.dart
@@ -230,7 +230,8 @@
case SetterElementImpl():
element.returnType = returnType;
var fragmentValue =
- element.formalParameters.singleOrNull as FormalParameterElementImpl?;
+ element.formalParameters.singleOrNull
+ as FormalParameterElementImpl?;
var valueNode = node.parameters?.parameters.firstOrNull;
var valueNodeType = valueNode?.declaredFragment!.type;
fragmentValue?.type = valueNodeType ?? InvalidTypeImpl.instance;
diff --git a/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart b/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart
index 4a86fab..ee7a2be 100644
--- a/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart
+++ b/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart
@@ -1075,7 +1075,10 @@
bool isStatic = false,
}) {
var fieldFragment = FieldFragmentImpl(name2: name, nameOffset: -1);
- var fieldElement = FieldElementImpl(reference: Reference.root(), firstFragment: fieldFragment);
+ var fieldElement = FieldElementImpl(
+ reference: Reference.root(),
+ firstFragment: fieldFragment,
+ );
fieldFragment.isStatic = isStatic;
fieldFragment.isSynthetic = true;
fieldFragment.type = type;
diff --git a/pkg/analyzer/test/generated/elements_types_mixin.dart b/pkg/analyzer/test/generated/elements_types_mixin.dart
index 6df3388..37e1bb1 100644
--- a/pkg/analyzer/test/generated/elements_types_mixin.dart
+++ b/pkg/analyzer/test/generated/elements_types_mixin.dart
@@ -271,10 +271,7 @@
name2: representationName,
nameOffset: -1,
);
- FieldElementImpl(
- reference: Reference.root(),
- firstFragment: fieldFragment,
- );
+ FieldElementImpl(reference: Reference.root(), firstFragment: fieldFragment);
fieldFragment.type = representationType;
fragment.fields = [fieldFragment];
