Format analyzer/ and analysis_server/ to dart format.

fshcheglov · Commit Queue · commit 22a74f558041 · 2025-06-23T10:42:23.000-07:00
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
@@ -57,9 +57,8 @@ class DartUnitOverridesComputer {
         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
@@ -51,8 +51,8 @@ import 'package:collection/collection.dart';
 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
@@ -245,10 +245,7 @@ class NormalizeHelper {
 
   /// 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
@@ -520,8 +520,7 @@ class TypeSystemImpl implements TypeSystem {
       }
       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
@@ -32,8 +32,7 @@ class ConstructorReferenceResolver {
     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
@@ -1044,10 +1044,10 @@ class LibraryManifestBuilder {
   }
 
   /// 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
@@ -697,8 +697,7 @@ sealed class InstanceItemMemberItem<E extends AnnotatableElementImpl>
   }
 }
 
-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
@@ -1052,9 +1052,7 @@ class RequirementsManifest {
     }
   }
 
-  _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
@@ -963,11 +963,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   }
 
   @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
@@ -98,8 +98,7 @@ class _ImplementsNode extends graph.Node<_ImplementsNode> {
 }
 
 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
@@ -230,7 +230,8 @@ class TypesBuilder {
         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
@@ -1075,7 +1075,10 @@ class _MockSdkElementsBuilder {
     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
@@ -271,10 +271,7 @@ mixin ElementsTypesMixin {
       name2: representationName,
       nameOffset: -1,
     );
-    FieldElementImpl(
-      reference: Reference.root(),
-      firstFragment: fieldFragment,
-    );
+    FieldElementImpl(reference: Reference.root(), firstFragment: fieldFragment);
     fieldFragment.type = representationType;
     fragment.fields = [fieldFragment];
 

Original file line number	Diff line number	Diff line change
`@@ -520,8 +520,7 @@ class TypeSystemImpl implements TypeSystem {`
`520`	`520`	`}`
`521`	`521`	`candidates = [supertype];`
`522`	`522`	`candidates.addAll(mixinElement.mixins);`
`523`		`- if (mixinElement is ClassElementImpl &&`
`524`		`- mixinElement.isMixinApplication) {`
	`523`	`+ if (mixinElement is ClassElementImpl && mixinElement.isMixinApplication) {`
`525`	`524`	`candidates.removeLast();`
`526`	`525`	`}`
`527`	`526`	`}`
Original file line number	Diff line number	Diff line change
`@@ -697,8 +697,7 @@ sealed class InstanceItemMemberItem<E extends AnnotatableElementImpl>`
`697`	`697`	`}`
`698`	`698`	`}`
`699`	`699`
`700`		`-class InstanceItemMethodItem`
`701`		`- extends InstanceItemMemberItem<MethodElementImpl> {`
	`700`	`+class InstanceItemMethodItem extends InstanceItemMemberItem<MethodElementImpl> {`
`702`	`701`	`final ManifestFunctionType functionType;`
`703`	`702`
`704`	`703`	`InstanceItemMethodItem({`
Original file line number	Diff line number	Diff line change
`@@ -1052,9 +1052,7 @@ class RequirementsManifest {`
`1052`	`1052`	`}`
`1053`	`1053`	`}`
`1054`	`1054`
`1055`		`- _InstanceItemWithRequirements? _getInstanceItem(`
`1056`		`- InstanceElementImpl element,`
`1057`		`- ) {`
	`1055`	`+ _InstanceItemWithRequirements? _getInstanceItem(InstanceElementImpl element) {`
`1058`	`1056`	`var libraryElement = element.library2;`
`1059`	`1057`	`var manifest = libraryElement.manifest;`
`1060`	`1058`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,7 @@ class _ImplementsNode extends graph.Node<_ImplementsNode> {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`class _ImplementsWalker extends graph.DependencyWalker<_ImplementsNode> {`
`101`		`- final Map<ExtensionTypeElementImpl, _ImplementsNode> nodeMap =`
`102`		`- Map.identity();`
	`101`	`+ final Map<ExtensionTypeElementImpl, _ImplementsNode> nodeMap = Map.identity();`
`103`	`102`
`104`	`103`	`@override`
`105`	`104`	`void evaluate(_ImplementsNode v) {`