[CFE/shared] Make formatting more consistent by specifying DartFormatter.latestShortStyleLanguageVersion

Autogenerated files was formatted with the new style, so if one for
instance formatted the file via the IDE or by saying
`out/ReleaseX64/dart-sdk/bin/dart format pkg/front_end/lib/` we'd get
*a lot* of changes which isn't great.
This CL sets the formatter version for the auto-generated files,
hopefully avoiding such things.

Change-Id: I4f92aafde7c77e7c78179f78bf821979a25ec12c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398884
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Commit-Queue: Jens Johansen <jensj@google.com>

pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart

@@ -11,308 +11,271 @@ const Version defaultLanguageVersion = const Version(3, 7);
 /// Enum for experimental flags shared between the CFE and the analyzer.
 enum ExperimentalFlag {
   augmentations(
-    name: 'augmentations',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: const Version(3, 6),
-  ),
+      name: 'augmentations',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: const Version(3, 6)),
 
   classModifiers(
-    name: 'class-modifiers',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(3, 0),
-    experimentReleasedVersion: const Version(3, 0),
-  ),
+      name: 'class-modifiers',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(3, 0),
+      experimentReleasedVersion: const Version(3, 0)),
 
   constFunctions(
-    name: 'const-functions',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'const-functions',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   constantUpdate2018(
-    name: 'constant-update-2018',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 0),
-    experimentReleasedVersion: const Version(2, 0),
-  ),
+      name: 'constant-update-2018',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 0),
+      experimentReleasedVersion: const Version(2, 0)),
 
   constructorTearoffs(
-    name: 'constructor-tearoffs',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 15),
-    experimentReleasedVersion: const Version(2, 15),
-  ),
+      name: 'constructor-tearoffs',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 15),
+      experimentReleasedVersion: const Version(2, 15)),
 
   controlFlowCollections(
-    name: 'control-flow-collections',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 0),
-    experimentReleasedVersion: const Version(2, 0),
-  ),
+      name: 'control-flow-collections',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 0),
+      experimentReleasedVersion: const Version(2, 0)),
 
   digitSeparators(
-    name: 'digit-separators',
-    isEnabledByDefault: true,
-    isExpired: false,
-    experimentEnabledVersion: const Version(3, 6),
-    experimentReleasedVersion: const Version(3, 6),
-  ),
+      name: 'digit-separators',
+      isEnabledByDefault: true,
+      isExpired: false,
+      experimentEnabledVersion: const Version(3, 6),
+      experimentReleasedVersion: const Version(3, 6)),
 
   enhancedEnums(
-    name: 'enhanced-enums',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 17),
-    experimentReleasedVersion: const Version(2, 17),
-  ),
+      name: 'enhanced-enums',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 17),
+      experimentReleasedVersion: const Version(2, 17)),
 
   enhancedParts(
-    name: 'enhanced-parts',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: const Version(3, 6),
-  ),
+      name: 'enhanced-parts',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: const Version(3, 6)),
 
   enumShorthands(
-    name: 'enum-shorthands',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'enum-shorthands',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   extensionMethods(
-    name: 'extension-methods',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 6),
-    experimentReleasedVersion: const Version(2, 6),
-  ),
+      name: 'extension-methods',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 6),
+      experimentReleasedVersion: const Version(2, 6)),
 
   genericMetadata(
-    name: 'generic-metadata',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 14),
-    experimentReleasedVersion: const Version(2, 14),
-  ),
+      name: 'generic-metadata',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 14),
+      experimentReleasedVersion: const Version(2, 14)),
 
   getterSetterError(
-    name: 'getter-setter-error',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'getter-setter-error',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   inferenceUpdate1(
-    name: 'inference-update-1',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 18),
-    experimentReleasedVersion: const Version(2, 18),
-  ),
+      name: 'inference-update-1',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 18),
+      experimentReleasedVersion: const Version(2, 18)),
 
   inferenceUpdate2(
-    name: 'inference-update-2',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(3, 2),
-    experimentReleasedVersion: const Version(3, 2),
-  ),
+      name: 'inference-update-2',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(3, 2),
+      experimentReleasedVersion: const Version(3, 2)),
 
   inferenceUpdate3(
-    name: 'inference-update-3',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(3, 4),
-    experimentReleasedVersion: const Version(3, 4),
-  ),
+      name: 'inference-update-3',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(3, 4),
+      experimentReleasedVersion: const Version(3, 4)),
 
   inferenceUpdate4(
-    name: 'inference-update-4',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'inference-update-4',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   inferenceUsingBounds(
-    name: 'inference-using-bounds',
-    isEnabledByDefault: true,
-    isExpired: false,
-    experimentEnabledVersion: const Version(3, 7),
-    experimentReleasedVersion: const Version(3, 7),
-  ),
+      name: 'inference-using-bounds',
+      isEnabledByDefault: true,
+      isExpired: false,
+      experimentEnabledVersion: const Version(3, 7),
+      experimentReleasedVersion: const Version(3, 7)),
 
   inlineClass(
-    name: 'inline-class',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(3, 3),
-    experimentReleasedVersion: const Version(3, 3),
-  ),
+      name: 'inline-class',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(3, 3),
+      experimentReleasedVersion: const Version(3, 3)),
 
   macros(
-    name: 'macros',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: const Version(3, 3),
-  ),
+      name: 'macros',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: const Version(3, 3)),
 
   namedArgumentsAnywhere(
-    name: 'named-arguments-anywhere',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 17),
-    experimentReleasedVersion: const Version(2, 17),
-  ),
+      name: 'named-arguments-anywhere',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 17),
+      experimentReleasedVersion: const Version(2, 17)),
 
   nativeAssets(
-    name: 'native-assets',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'native-assets',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   nonNullable(
-    name: 'non-nullable',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 12),
-    experimentReleasedVersion: const Version(2, 10),
-  ),
+      name: 'non-nullable',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 12),
+      experimentReleasedVersion: const Version(2, 10)),
 
   nonfunctionTypeAliases(
-    name: 'nonfunction-type-aliases',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 13),
-    experimentReleasedVersion: const Version(2, 13),
-  ),
+      name: 'nonfunction-type-aliases',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 13),
+      experimentReleasedVersion: const Version(2, 13)),
 
   nullAwareElements(
-    name: 'null-aware-elements',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'null-aware-elements',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   patterns(
-    name: 'patterns',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(3, 0),
-    experimentReleasedVersion: const Version(3, 0),
-  ),
+      name: 'patterns',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(3, 0),
+      experimentReleasedVersion: const Version(3, 0)),
 
   recordUse(
-    name: 'record-use',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'record-use',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   records(
-    name: 'records',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(3, 0),
-    experimentReleasedVersion: const Version(3, 0),
-  ),
+      name: 'records',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(3, 0),
+      experimentReleasedVersion: const Version(3, 0)),
 
   sealedClass(
-    name: 'sealed-class',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(3, 0),
-    experimentReleasedVersion: const Version(3, 0),
-  ),
+      name: 'sealed-class',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(3, 0),
+      experimentReleasedVersion: const Version(3, 0)),
 
   setLiterals(
-    name: 'set-literals',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 0),
-    experimentReleasedVersion: const Version(2, 0),
-  ),
+      name: 'set-literals',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 0),
+      experimentReleasedVersion: const Version(2, 0)),
 
   spreadCollections(
-    name: 'spread-collections',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 0),
-    experimentReleasedVersion: const Version(2, 0),
-  ),
+      name: 'spread-collections',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 0),
+      experimentReleasedVersion: const Version(2, 0)),
 
   superParameters(
-    name: 'super-parameters',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 17),
-    experimentReleasedVersion: const Version(2, 17),
-  ),
+      name: 'super-parameters',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 17),
+      experimentReleasedVersion: const Version(2, 17)),
 
   testExperiment(
-    name: 'test-experiment',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'test-experiment',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   tripleShift(
-    name: 'triple-shift',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 14),
-    experimentReleasedVersion: const Version(2, 14),
-  ),
+      name: 'triple-shift',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 14),
+      experimentReleasedVersion: const Version(2, 14)),
 
   unnamedLibraries(
-    name: 'unnamed-libraries',
-    isEnabledByDefault: true,
-    isExpired: true,
-    experimentEnabledVersion: const Version(2, 19),
-    experimentReleasedVersion: const Version(2, 19),
-  ),
+      name: 'unnamed-libraries',
+      isEnabledByDefault: true,
+      isExpired: true,
+      experimentEnabledVersion: const Version(2, 19),
+      experimentReleasedVersion: const Version(2, 19)),
 
   unquotedImports(
-    name: 'unquoted-imports',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'unquoted-imports',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   variance(
-    name: 'variance',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
+      name: 'variance',
+      isEnabledByDefault: false,
+      isExpired: false,
+      experimentEnabledVersion: defaultLanguageVersion,
+      experimentReleasedVersion: defaultLanguageVersion),
 
   wildcardVariables(
-    name: 'wildcard-variables',
-    isEnabledByDefault: true,
-    isExpired: false,
-    experimentEnabledVersion: const Version(3, 7),
-    experimentReleasedVersion: const Version(3, 7),
-  );
+      name: 'wildcard-variables',
+      isEnabledByDefault: true,
+      isExpired: false,
+      experimentEnabledVersion: const Version(3, 7),
+      experimentReleasedVersion: const Version(3, 7)),
+  ;
 
   final String name;
   final bool isEnabledByDefault;
@@ -320,13 +283,12 @@ enum ExperimentalFlag {
   final Version experimentEnabledVersion;
   final Version experimentReleasedVersion;
 
-  const ExperimentalFlag({
-    required this.name,
-    required this.isEnabledByDefault,
-    required this.isExpired,
-    required this.experimentEnabledVersion,
-    required this.experimentReleasedVersion,
-  });
+  const ExperimentalFlag(
+      {required this.name,
+      required this.isEnabledByDefault,
+      required this.isExpired,
+      required this.experimentEnabledVersion,
+      required this.experimentReleasedVersion});
 }
 
 class Version {

pkg/_fe_analyzer_shared/lib/src/metadata/proto.dart

@@ -721,7 +721,7 @@ class GenericMixinProto extends Proto {
   @override
   Proto? resolve() {
     List<TypeAnnotation>? newTypeArguments =
-    typeArguments.resolve((a) => a.resolve());
+        typeArguments.resolve((a) => a.resolve());
     return newTypeArguments == null
         ? null
         : new GenericMixinProto(reference, scope, newTypeArguments);

pkg/_fe_analyzer_shared/lib/src/parser/util.dart

@@ -283,4 +283,4 @@ double doubleFromToken(Token token, {required bool hasSeparators}) {
     text = stripSeparators(text);
   }
   return double.parse(text);
-}
+}

pkg/front_end/benchmarks/patterns/generate_datatypes.dart

@@ -79,9 +79,9 @@ List<Test> tests = [''');
 ];
 ''');
 
-  String result =
-      new DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
-          .format(sb.toString());
+  String result = new DartFormatter(
+          languageVersion: DartFormatter.latestShortStyleLanguageVersion)
+      .format(sb.toString());
   new File.fromUri(fileUri).writeAsStringSync(result);
 }
 
@@ -218,8 +218,8 @@ class CounterVisitor$size implements Visitor$size<void, Counter> {
 }
 ''');
 
-  String result =
-      new DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
-          .format(sb.toString());
+  String result = new DartFormatter(
+          languageVersion: DartFormatter.latestShortStyleLanguageVersion)
+      .format(sb.toString());
   new File.fromUri(fileUri).writeAsStringSync(result);
 }

pkg/front_end/benchmarks/patterns/util.dart

@@ -242,7 +242,7 @@ class SeriesSet {
     }
     sb.write(']);');
     return new DartFormatter(
-            languageVersion: DartFormatter.latestLanguageVersion)
+            languageVersion: DartFormatter.latestShortStyleLanguageVersion)
         .format(sb.toString());
   }
 }

pkg/front_end/lib/src/kernel/body_builder.dart

@@ -1929,8 +1929,7 @@ class BodyBuilder extends StackListenerImpl
         }
       } else if (last is RedirectingInitializer) {
         if (_context.isEnumClass && libraryFeatures.enhancedEnums.isEnabled) {
-          ArgumentsImpl arguments =
-              last.arguments as ArgumentsImpl;
+          ArgumentsImpl arguments = last.arguments as ArgumentsImpl;
           List<Expression> enumSyntheticArguments = [
             new VariableGetImpl(function.positionalParameters[0],
                 forNullGuardedAccess: false)

pkg/front_end/test/parser_test_listener_creator.dart

@@ -111,7 +111,8 @@ class ParserTestListener implements Listener {
 
   out.writeln("}");
 
-  return new DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
+  return new DartFormatter(
+          languageVersion: DartFormatter.latestShortStyleLanguageVersion)
       .format("$out");
 }
 

pkg/front_end/test/parser_test_parser_creator.dart

@@ -112,7 +112,8 @@ class TestParser extends Parser {
 
   out.writeln("}");
 
-  return new DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
+  return new DartFormatter(
+          languageVersion: DartFormatter.latestShortStyleLanguageVersion)
       .format("$out");
 }
 

pkg/front_end/test/textual_outline_suite.dart

@@ -162,7 +162,8 @@ class TextualOutline extends Step<TestDescription, TestDescription, Context> {
           // an older language version, it will contain a `// @dart=x.y`
           // comment, which takes precedence over this argument.
           result = new DartFormatter(
-                  languageVersion: DartFormatter.latestLanguageVersion,
+                  languageVersion:
+                      DartFormatter.latestShortStyleLanguageVersion,
                   experimentFlags: experimentFlags)
               .format(result);
         } catch (e, st) {

pkg/front_end/testcases/constructor_tearoffs/callable_instantiation.dart.textual_outline.expect

@@ -3,21 +3,20 @@ import 'dart:async';
 method<T extends Class, S extends int>(Class c, int i, T t, S s) {}
 
 test<T extends Class?, S extends int>(
-  Class? c1,
-  GetterCall c2,
-  int? i,
-  T t1,
-  T? t2,
-  S? s,
-  void Function<T>()? f1,
-  Never n,
-  dynamic d,
-  String a,
-  double b,
-  bool c,
-  FutureOr<Class> f2,
-  Function f3,
-) {}
+    Class? c1,
+    GetterCall c2,
+    int? i,
+    T t1,
+    T? t2,
+    S? s,
+    void Function<T>()? f1,
+    Never n,
+    dynamic d,
+    String a,
+    double b,
+    bool c,
+    FutureOr<Class> f2,
+    Function f3) {}
 
 Class c1 = Class();
 

pkg/front_end/testcases/constructor_tearoffs/callable_instantiation.dart.textual_outline_modelled.expect

@@ -57,21 +57,20 @@ main() {}
 method<T extends Class, S extends int>(Class c, int i, T t, S s) {}
 
 test<T extends Class?, S extends int>(
-  Class? c1,
-  GetterCall c2,
-  int? i,
-  T t1,
-  T? t2,
-  S? s,
-  void Function<T>()? f1,
-  Never n,
-  dynamic d,
-  String a,
-  double b,
-  bool c,
-  FutureOr<Class> f2,
-  Function f3,
-) {}
+    Class? c1,
+    GetterCall c2,
+    int? i,
+    T t1,
+    T? t2,
+    S? s,
+    void Function<T>()? f1,
+    Never n,
+    dynamic d,
+    String a,
+    double b,
+    bool c,
+    FutureOr<Class> f2,
+    Function f3) {}
 
 var topLevel1 = c1<int>;
 

pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.textual_outline.expect

@@ -1,11 +1,17 @@
 class Class {
   final List<Const> constants;
-  Class({
-    this.constants = const [Const.impl(), Alias.impl(), ImplAlias<String>()],
-  });
-  const Class.named({
-    this.constants = const [Const.impl(), Alias.impl(), ImplAlias<String>()],
-  });
+  Class(
+      {this.constants = const [
+        Const.impl(),
+        Alias.impl(),
+        ImplAlias<String>()
+      ]});
+  const Class.named(
+      {this.constants = const [
+        Const.impl(),
+        Alias.impl(),
+        ImplAlias<String>()
+      ]});
 }
 
 typedef Alias = Const;

pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.textual_outline_modelled.expect

@@ -3,12 +3,18 @@ abstract class Const {
 }
 
 class Class {
-  Class({
-    this.constants = const [Const.impl(), Alias.impl(), ImplAlias<String>()],
-  });
-  const Class.named({
-    this.constants = const [Const.impl(), Alias.impl(), ImplAlias<String>()],
-  });
+  Class(
+      {this.constants = const [
+        Const.impl(),
+        Alias.impl(),
+        ImplAlias<String>()
+      ]});
+  const Class.named(
+      {this.constants = const [
+        Const.impl(),
+        Alias.impl(),
+        ImplAlias<String>()
+      ]});
   final List<Const> constants;
 }
 

pkg/front_end/testcases/coverage/from_co19/built_in_identifier_A02_t02.dart.textual_outline.expect

@@ -2,7 +2,9 @@ class C<as> {}
 
 mixin M<as> {}
 
-enum E<as> { e1 }
+enum E<as> {
+  e1;
+}
 
 void foo<as>() {}
 

pkg/front_end/testcases/coverage/from_co19/built_in_identifier_A02_t02.dart.textual_outline_modelled.expect

@@ -2,7 +2,9 @@ class C<as> {}
 
 const void Function<as>()? c = null;
 
-enum E<as> { e1 }
+enum E<as> {
+  e1;
+}
 
 extension Ext<as> on List {}
 

pkg/front_end/testcases/coverage/handcrafted/dart2js/cloning.dart.textual_outline.expect

@@ -1,6 +1,9 @@
 class VariableDeclaration {
   String? _name;
   int flags = 0;
-  VariableDeclaration(this._name, {int flags = -1}) {}
+  VariableDeclaration(
+    this._name, {
+    int flags = -1,
+  }) {}
   String? get name => _name;
 }

pkg/front_end/testcases/coverage/handcrafted/dart2js/cloning.dart.textual_outline_modelled.expect

@@ -1,6 +1,9 @@
 class VariableDeclaration {
   String? _name;
   String? get name => _name;
-  VariableDeclaration(this._name, {int flags = -1}) {}
+  VariableDeclaration(
+    this._name, {
+    int flags = -1,
+  }) {}
   int flags = 0;
 }

pkg/front_end/testcases/dart2js/conditional_import.dart.textual_outline.expect

@@ -1,12 +1,10 @@
 import "conditional_import.dart"
     if (dart.library.io) "dart:io"
-    if (dart.library.html) "dart:html"
-    as a;
+    if (dart.library.html) "dart:html" as a;
 
 import "conditional_import.dart"
     if (dart.library.html) "dart:html"
-    if (dart.library.io) "dart:io"
-    as b;
+    if (dart.library.io) "dart:io" as b;
 
 import "conditional_import.dart" if (dart.library.foo) "dart:foo" as c;
 

pkg/front_end/testcases/dart2js/conditional_import.dart.textual_outline_modelled.expect

@@ -1,12 +1,10 @@
 import "conditional_import.dart" if (dart.library.foo) "dart:foo" as c;
 import "conditional_import.dart"
     if (dart.library.html) "dart:html"
-    if (dart.library.io) "dart:io"
-    as b;
+    if (dart.library.io) "dart:io" as b;
 import "conditional_import.dart"
     if (dart.library.io) "dart:io"
-    if (dart.library.html) "dart:html"
-    as a;
+    if (dart.library.html) "dart:html" as a;
 
 class HttpRequest {}
 

pkg/front_end/testcases/dart2js/enum_from_environment.dart.textual_outline.expect

@@ -1,6 +1,7 @@
 enum A {
   a(B.a),
-  b(B.b);
+  b(B.b),
+  ;
 
   final B value;
   const A(this.value);

pkg/front_end/testcases/dart2js/enum_from_environment.dart.textual_outline_modelled.expect

@@ -9,7 +9,8 @@ class B {
 
 enum A {
   a(B.a),
-  b(B.b);
+  b(B.b),
+  ;
 
   final B value;
   const A(this.value);

pkg/front_end/testcases/dart2js/extension_types/external.dart.textual_outline.expect

@@ -1,4 +1,5 @@
 @JS()
+
 library static_interop;
 
 import 'dart:js_interop';

pkg/front_end/testcases/dart2js/issue56803.dart.textual_outline.expect

@@ -1,7 +1,9 @@
 const String? maybe = bool.fromEnvironment("not there") ? "string" : null;
 
 extension type const Ext._(String _) implements String {
-  const Ext() : assert(maybe != null, "Must not be null"), _ = "OK";
+  const Ext()
+      : assert(maybe != null, "Must not be null"),
+        _ = "OK";
 }
 
 void main() {}

pkg/front_end/testcases/dart2js/issue56803.dart.textual_outline_modelled.expect

@@ -1,7 +1,9 @@
 const String? maybe = bool.fromEnvironment("not there") ? "string" : null;
 
 extension type const Ext._(String _) implements String {
-  const Ext() : assert(maybe != null, "Must not be null"), _ = "OK";
+  const Ext()
+      : assert(maybe != null, "Must not be null"),
+        _ = "OK";
 }
 
 void main() {}

pkg/front_end/testcases/dart2js/issue56803b.dart.textual_outline.expect

@@ -2,7 +2,9 @@ const String? maybe = bool.fromEnvironment("not there") ? "string" : null;
 
 class Ext {
   final String _;
-  const Ext() : assert(maybe != null, "Must not be null"), _ = "OK";
+  const Ext()
+      : assert(maybe != null, "Must not be null"),
+        _ = "OK";
 }
 
 void main() {}

pkg/front_end/testcases/dart2js/issue56803b.dart.textual_outline_modelled.expect

@@ -1,5 +1,7 @@
 class Ext {
-  const Ext() : assert(maybe != null, "Must not be null"), _ = "OK";
+  const Ext()
+      : assert(maybe != null, "Must not be null"),
+        _ = "OK";
   final String _;
 }
 

pkg/front_end/testcases/dart2js/js_interop_transforms/isa.dart.textual_outline.expect

@@ -1,4 +1,5 @@
 @JS('library1')
+
 library;
 
 import 'dart:js_interop';

pkg/front_end/testcases/dart2wasm/inference_update_2/issue52452.dart.textual_outline.expect

@@ -2,7 +2,10 @@ class C {
   final int? _f2;
   final int? _f3;
   final int? _f4;
-  C(int? i) : _f2 = i, _f3 = i, _f4 = i;
+  C(int? i)
+      : _f2 = i,
+        _f3 = i,
+        _f4 = i;
 }
 
 class A {
@@ -13,7 +16,9 @@ mixin M3 {}
 
 abstract class D extends A with M3 {
   final int? _f4;
-  D(int? i) : _f4 = i, super(i);
+  D(int? i)
+      : _f4 = i,
+        super(i);
 }
 
 mixin M1 {

pkg/front_end/testcases/dart2wasm/inference_update_2/issue52452.dart.textual_outline_modelled.expect

@@ -1,5 +1,7 @@
 abstract class D extends A with M3 {
-  D(int? i) : _f4 = i, super(i);
+  D(int? i)
+      : _f4 = i,
+        super(i);
   final int? _f4;
 }
 
@@ -12,7 +14,10 @@ class B {
 }
 
 class C {
-  C(int? i) : _f2 = i, _f3 = i, _f4 = i;
+  C(int? i)
+      : _f2 = i,
+        _f3 = i,
+        _f4 = i;
   final int? _f2;
   final int? _f3;
   final int? _f4;

pkg/front_end/testcases/dartdevc/conditional_import.dart.textual_outline.expect

@@ -1,12 +1,10 @@
 import "conditional_import.dart"
     if (dart.library.io) "dart:io"
-    if (dart.library.html) "dart:html"
-    as a;
+    if (dart.library.html) "dart:html" as a;
 
 import "conditional_import.dart"
     if (dart.library.html) "dart:html"
-    if (dart.library.io) "dart:io"
-    as b;
+    if (dart.library.io) "dart:io" as b;
 
 import "conditional_import.dart" if (dart.library.foo) "dart:foo" as c;
 

pkg/front_end/testcases/dartdevc/conditional_import.dart.textual_outline_modelled.expect

@@ -1,12 +1,10 @@
 import "conditional_import.dart" if (dart.library.foo) "dart:foo" as c;
 import "conditional_import.dart"
     if (dart.library.html) "dart:html"
-    if (dart.library.io) "dart:io"
-    as b;
+    if (dart.library.io) "dart:io" as b;
 import "conditional_import.dart"
     if (dart.library.io) "dart:io"
-    if (dart.library.html) "dart:html"
-    as a;
+    if (dart.library.html) "dart:html" as a;
 
 class HttpRequest {}
 

pkg/front_end/testcases/dartdevc/extension_types/external.dart.textual_outline.expect

@@ -1,4 +1,5 @@
 @JS()
+
 library static_interop;
 
 import 'dart:js_interop';

pkg/front_end/testcases/dartdevc/inference_update_2/issue52452.dart.textual_outline.expect

@@ -2,7 +2,10 @@ class C {
   final int? _f2;
   final int? _f3;
   final int? _f4;
-  C(int? i) : _f2 = i, _f3 = i, _f4 = i;
+  C(int? i)
+      : _f2 = i,
+        _f3 = i,
+        _f4 = i;
 }
 
 class A {
@@ -13,7 +16,9 @@ mixin M3 {}
 
 abstract class D extends A with M3 {
   final int? _f4;
-  D(int? i) : _f4 = i, super(i);
+  D(int? i)
+      : _f4 = i,
+        super(i);
 }
 
 mixin M1 {

pkg/front_end/testcases/dartdevc/inference_update_2/issue52452.dart.textual_outline_modelled.expect

@@ -1,5 +1,7 @@
 abstract class D extends A with M3 {
-  D(int? i) : _f4 = i, super(i);
+  D(int? i)
+      : _f4 = i,
+        super(i);
   final int? _f4;
 }
 
@@ -12,7 +14,10 @@ class B {
 }
 
 class C {
-  C(int? i) : _f2 = i, _f3 = i, _f4 = i;
+  C(int? i)
+      : _f2 = i,
+        _f3 = i,
+        _f4 = i;
   final int? _f2;
   final int? _f3;
   final int? _f4;

pkg/front_end/testcases/dartdevc/js_interop_transforms/isa.dart.textual_outline.expect

@@ -1,4 +1,5 @@
 @JS('library1')
+
 library;
 
 import 'dart:js_interop';

pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.textual_outline.expect

@@ -4,7 +4,10 @@ enum E1 {
   final int element = 42;
 }
 
-enum E2 { element, element }
+enum E2 {
+  element,
+  element;
+}
 
 enum E3 {
   element;

pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.textual_outline_modelled.expect

@@ -6,7 +6,10 @@ enum E1 {
 
 enum E10 with A10 { element }
 
-enum E2 { element, element }
+enum E2 {
+  element,
+  element;
+}
 
 enum E3 {
   element;

pkg/front_end/testcases/enhanced_enums/enum_with_mixin.dart.textual_outline.expect

@@ -9,4 +9,6 @@ enum SomeEnum with HasSomeField {
   String get someField => 'field';
 }
 
-enum NormalEnum { value }
+enum NormalEnum {
+  value;
+}

pkg/front_end/testcases/enhanced_enums/enum_with_mixin.dart.textual_outline_modelled.expect

@@ -1,4 +1,6 @@
-enum NormalEnum { value }
+enum NormalEnum {
+  value;
+}
 
 enum SomeEnum with HasSomeField {
   value;

pkg/front_end/testcases/enhanced_enums/issue48303.dart.textual_outline.expect

@@ -2,7 +2,11 @@ mixin M1 on Enum {
   int mixedInMethod1(int v) => v;
 }
 
-enum E with M1 { e1, e2, e3 }
+enum E with M1 {
+  e1,
+  e2,
+  e3;
+}
 
 expectEquals(x, y) {}
 

pkg/front_end/testcases/enhanced_enums/issue48303.dart.textual_outline_modelled.expect

@@ -1,4 +1,8 @@
-enum E with M1 { e1, e2, e3 }
+enum E with M1 {
+  e1,
+  e2,
+  e3;
+}
 
 expectEquals(x, y) {}
 

pkg/front_end/testcases/enhanced_enums/issue51189.dart.textual_outline.expect

@@ -1,6 +1,8 @@
 class A {}
 
-enum E<X extends A> { element }
+enum E<X extends A> {
+  element,
+}
 
 main() {}
 

pkg/front_end/testcases/enhanced_enums/issue51189.dart.textual_outline_modelled.expect

@@ -1,6 +1,8 @@
 class A {}
 
-enum E<X extends A> { element }
+enum E<X extends A> {
+  element,
+}
 
 expectEquals(x, y) {}
 

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline.expect

@@ -1,10 +1,18 @@
-enum E1 { element.new() }
+enum E1 {
+  element.new();
+}
 
-enum E2<values> { element }
+enum E2<values> {
+  element;
+}
 
-enum E3<element> { element }
+enum E3<element> {
+  element;
+}
 
-enum values { element }
+enum values {
+  element;
+}
 
 abstract class SuperclassWithEquals {
   bool operator ==(Object other) => true;

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.textual_outline_modelled.expect

@@ -16,12 +16,20 @@ abstract class SuperclassWithValues {
   Never get values => throw 0;
 }
 
-enum E1 { element.new() }
+enum E1 {
+  element.new();
+}
 
-enum E2<values> { element }
+enum E2<values> {
+  element;
+}
 
-enum E3<element> { element }
+enum E3<element> {
+  element;
+}
 
-enum values { element }
+enum values {
+  element;
+}
 
 main() {}

pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.textual_outline.expect

@@ -4,7 +4,8 @@ enum C {
   c(1, z: 3, 2),
   d.named1(1, 2, 3),
   e.named2(1, 2, 3),
-  f.named3(1, 2, 3);
+  f.named3(1, 2, 3),
+  ;
 
   final String log;
   const C(int x, int y, {int z = 42}) : this.log = "x=$x, y=$y, z=$z";

pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.textual_outline_modelled.expect

@@ -4,7 +4,8 @@ enum C {
   c(1, z: 3, 2),
   d.named1(1, 2, 3),
   e.named2(1, 2, 3),
-  f.named3(1, 2, 3);
+  f.named3(1, 2, 3),
+  ;
 
   final String log;
   const C(int x, int y, {int z = 42}) : this.log = "x=$x, y=$y, z=$z";

pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.textual_outline.expect

@@ -7,7 +7,7 @@ abstract class I {}
 abstract class GI<T> {}
 
 enum E<S extends num, T extends num> with GM<T>, M implements I, GI<S> {
-  element,
+  element
 }
 
 main() {}

pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.textual_outline_modelled.expect

@@ -3,7 +3,7 @@ abstract class GI<T> {}
 abstract class I {}
 
 enum E<S extends num, T extends num> with GM<T>, M implements I, GI<S> {
-  element,
+  element
 }
 
 main() {}

pkg/front_end/testcases/enhanced_enums/synthetic_enum_constructor.dart.textual_outline.expect

@@ -2,14 +2,23 @@ mixin M on Object {
   void mixinMethod() {}
 }
 
-enum E with M { e1, e2, e3 }
+enum E with M {
+  e1,
+  e2,
+  e3;
+}
 
-enum F { f1, f2, f3 }
+enum F {
+  f1,
+  f2,
+  f3,
+}
 
 enum G {
   g1,
   g2,
-  g3;
+  g3,
+  ;
 
   const G();
 }

pkg/front_end/testcases/enhanced_enums/synthetic_enum_constructor.dart.textual_outline_modelled.expect

@@ -1,11 +1,20 @@
-enum E with M { e1, e2, e3 }
+enum E with M {
+  e1,
+  e2,
+  e3;
+}
 
-enum F { f1, f2, f3 }
+enum F {
+  f1,
+  f2,
+  f3,
+}
 
 enum G {
   g1,
   g2,
-  g3;
+  g3,
+  ;
 
   const G();
 }

pkg/front_end/testcases/extension_types/assign_interface_type.dart.textual_outline.expect

@@ -16,16 +16,5 @@ extension type G<T>(T o) {}
 
 extension type G2<T extends Object>(T o) implements Object {}
 
-test<T1, T2 extends A, T3 extends Object>(
-  Object o,
-  A a,
-  B b,
-  C c,
-  D d,
-  D2 d2,
-  E e,
-  F f,
-  G<T1> g1,
-  G<T2> g2,
-  G2<T3> g3,
-) {}
+test<T1, T2 extends A, T3 extends Object>(Object o, A a, B b, C c, D d, D2 d2,
+    E e, F f, G<T1> g1, G<T2> g2, G2<T3> g3) {}

pkg/front_end/testcases/extension_types/assign_interface_type.dart.textual_outline_modelled.expect

@@ -16,16 +16,5 @@ extension type G<T>(T o) {}
 
 extension type G2<T extends Object>(T o) implements Object {}
 
-test<T1, T2 extends A, T3 extends Object>(
-  Object o,
-  A a,
-  B b,
-  C c,
-  D d,
-  D2 d2,
-  E e,
-  F f,
-  G<T1> g1,
-  G<T2> g2,
-  G2<T3> g3,
-) {}
+test<T1, T2 extends A, T3 extends Object>(Object o, A a, B b, C c, D d, D2 d2,
+    E e, F f, G<T1> g1, G<T2> g2, G2<T3> g3) {}

pkg/front_end/testcases/extension_types/issue53207.dart.textual_outline.expect

@@ -19,14 +19,13 @@ extension type F3<X extends Future<Object>>(X foo) implements Future<Object> {}
 extension type F4<X extends Future<num>>(X foo) implements F3<X> {}
 
 test(
-  E1 e1,
-  E2<Future<String>> e2,
-  E3 e3,
-  E4<Future<double>> e4,
-  E5<Object> e5object,
-  E5<Future<num>> e5future,
-  F1 f1,
-  F2<Future<num>> f2,
-  F3<Future<String>> f3,
-  F4<Future<int>> f4,
-) async {}
+    E1 e1,
+    E2<Future<String>> e2,
+    E3 e3,
+    E4<Future<double>> e4,
+    E5<Object> e5object,
+    E5<Future<num>> e5future,
+    F1 f1,
+    F2<Future<num>> f2,
+    F3<Future<String>> f3,
+    F4<Future<int>> f4) async {}

pkg/front_end/testcases/extension_types/issue53207.dart.textual_outline_modelled.expect

@@ -19,14 +19,13 @@ extension type F3<X extends Future<Object>>(X foo) implements Future<Object> {}
 extension type F4<X extends Future<num>>(X foo) implements F3<X> {}
 
 test(
-  E1 e1,
-  E2<Future<String>> e2,
-  E3 e3,
-  E4<Future<double>> e4,
-  E5<Object> e5object,
-  E5<Future<num>> e5future,
-  F1 f1,
-  F2<Future<num>> f2,
-  F3<Future<String>> f3,
-  F4<Future<int>> f4,
-) async {}
+    E1 e1,
+    E2<Future<String>> e2,
+    E3 e3,
+    E4<Future<double>> e4,
+    E5<Object> e5object,
+    E5<Future<num>> e5future,
+    F1 f1,
+    F2<Future<num>> f2,
+    F3<Future<String>> f3,
+    F4<Future<int>> f4) async {}

pkg/front_end/testcases/extension_types/issue53780.dart.textual_outline.expect

@@ -2,8 +2,6 @@ extension type E<T>(({T t}) it) {
   T get t => it.t;
 }
 
-T run<T>(E<T> e) => switch (e) {
-  E(:var t) => t,
-};
+T run<T>(E<T> e) => switch (e) { E(:var t) => t };
 
 void main() {}

pkg/front_end/testcases/extension_types/issue53780.dart.textual_outline_modelled.expect

@@ -1,6 +1,4 @@
-T run<T>(E<T> e) => switch (e) {
-  E(:var t) => t,
-};
+T run<T>(E<T> e) => switch (e) { E(:var t) => t };
 
 extension type E<T>(({T t}) it) {
   T get t => it.t;

pkg/front_end/testcases/extension_types/issue54070.dart.textual_outline.expect

@@ -2,9 +2,9 @@ void main() {}
 
 class AssertIdentical {
   const AssertIdentical(Object? v1, Object? v2)
-    : assert(identical(v1, v2), "${(v1, v2)}");
+      : assert(identical(v1, v2), "${(v1, v2)}");
   const AssertIdentical.not(Object? v1, Object? v2)
-    : assert(!identical(v1, v2), "${(v1, v2)}");
+      : assert(!identical(v1, v2), "${(v1, v2)}");
 }
 
 class C<T> {

pkg/front_end/testcases/extension_types/issue54070.dart.textual_outline_modelled.expect

@@ -1,8 +1,8 @@
 class AssertIdentical {
   const AssertIdentical(Object? v1, Object? v2)
-    : assert(identical(v1, v2), "${(v1, v2)}");
+      : assert(identical(v1, v2), "${(v1, v2)}");
   const AssertIdentical.not(Object? v1, Object? v2)
-    : assert(!identical(v1, v2), "${(v1, v2)}");
+      : assert(!identical(v1, v2), "${(v1, v2)}");
 }
 
 class C<T> {

pkg/front_end/testcases/extension_types/issue54097.dart.textual_outline.expect

@@ -10,7 +10,9 @@ typedef void H1<X extends E1<X>>();
 
 extension Ext1<X extends E1<X>> on List<X> {}
 
-enum Enum1<X extends E1<X>> { element<Never>() }
+enum Enum1<X extends E1<X>> {
+  element<Never>();
+}
 
 foo1<X extends E1<X>>() {}
 
@@ -30,7 +32,9 @@ typedef void H2<X extends E1<Y>, Y extends X>();
 
 extension Ext2<X extends E1<Y>, Y extends X> on List<X> {}
 
-enum Enum2<X extends E1<Y>, Y extends X> { element<Never, Never>() }
+enum Enum2<X extends E1<Y>, Y extends X> {
+  element<Never, Never>();
+}
 
 foo2<X extends E1<Y>, Y extends X>() {}
 

pkg/front_end/testcases/extension_types/issue54097.dart.textual_outline_modelled.expect

@@ -6,9 +6,13 @@ class A1<X extends E1<X>> {}
 
 class A2<X extends E1<Y>, Y extends X> {}
 
-enum Enum1<X extends E1<X>> { element<Never>() }
+enum Enum1<X extends E1<X>> {
+  element<Never>();
+}
 
-enum Enum2<X extends E1<Y>, Y extends X> { element<Never, Never>() }
+enum Enum2<X extends E1<Y>, Y extends X> {
+  element<Never, Never>();
+}
 
 extension Ext1<X extends E1<X>> on List<X> {}
 

pkg/front_end/testcases/extension_types/issue54649.dart.textual_outline.expect

@@ -3,13 +3,4 @@ extension type N(Future<int> _) {}
 extension type F(Future<int> _) implements Future<int> {}
 
 void test<X, XN extends N, XF extends F>(
-  N n,
-  F f,
-  X x,
-  XN xn,
-  XF xf,
-  N? nq,
-  F? fq,
-  XN? xnq,
-  XF? xfq,
-) async {}
+    N n, F f, X x, XN xn, XF xf, N? nq, F? fq, XN? xnq, XF? xfq) async {}

pkg/front_end/testcases/extension_types/issue54649.dart.textual_outline_modelled.expect

@@ -3,13 +3,4 @@ extension type F(Future<int> _) implements Future<int> {}
 extension type N(Future<int> _) {}
 
 void test<X, XN extends N, XF extends F>(
-  N n,
-  F f,
-  X x,
-  XN xn,
-  XF xf,
-  N? nq,
-  F? fq,
-  XN? xnq,
-  XF? xfq,
-) async {}
+    N n, F f, X x, XN xn, XF xf, N? nq, F? fq, XN? xnq, XF? xfq) async {}

pkg/front_end/testcases/extension_types/non_nullable_if_implements_object.dart.textual_outline.expect

@@ -15,13 +15,12 @@ extension type E7(num it) implements num {}
 test1(E1 e1, E2 e2, E3 e3, E4 e4, E5 e5, E6 e6, E7 e7) {}
 
 test2<
-  X1 extends E1,
-  X2 extends E2,
-  X3 extends E3,
-  X4 extends E4,
-  X5 extends E5,
-  X6 extends E6,
-  X7 extends E7
->(X1 x1, X2 x2, X3 x3, X4 x4, X5 x5, X6 x6, X7 x7) {}
+    X1 extends E1,
+    X2 extends E2,
+    X3 extends E3,
+    X4 extends E4,
+    X5 extends E5,
+    X6 extends E6,
+    X7 extends E7>(X1 x1, X2 x2, X3 x3, X4 x4, X5 x5, X6 x6, X7 x7) {}
 
 test3(E1 e1, E2 e2, E3 e3, E4 e4, E5 e5, E6 e6, E7 e7, String s, bool b) {}

pkg/front_end/testcases/extension_types/non_nullable_if_implements_object.dart.textual_outline_modelled.expect

@@ -15,13 +15,12 @@ extension type E7(num it) implements num {}
 test1(E1 e1, E2 e2, E3 e3, E4 e4, E5 e5, E6 e6, E7 e7) {}
 
 test2<
-  X1 extends E1,
-  X2 extends E2,
-  X3 extends E3,
-  X4 extends E4,
-  X5 extends E5,
-  X6 extends E6,
-  X7 extends E7
->(X1 x1, X2 x2, X3 x3, X4 x4, X5 x5, X6 x6, X7 x7) {}
+    X1 extends E1,
+    X2 extends E2,
+    X3 extends E3,
+    X4 extends E4,
+    X5 extends E5,
+    X6 extends E6,
+    X7 extends E7>(X1 x1, X2 x2, X3 x3, X4 x4, X5 x5, X6 x6, X7 x7) {}
 
 test3(E1 e1, E2 e2, E3 e3, E4 e4, E5 e5, E6 e6, E7 e7, String s, bool b) {}

pkg/front_end/testcases/extension_types/nullability.dart.textual_outline.expect

@@ -8,14 +8,8 @@ extension type E4(E1<int> foo) {}
 
 extension type E5(E2 foo) {}
 
-testNotNonNullable(
-  E1<num?> e1numNullableNNN,
-  E1<double> e1doubleNNN,
-  E2 e2NNN,
-  E3 e3NNN,
-  E4 e4NNN,
-  E5 e5NNN,
-) {}
+testNotNonNullable(E1<num?> e1numNullableNNN, E1<double> e1doubleNNN, E2 e2NNN,
+    E3 e3NNN, E4 e4NNN, E5 e5NNN) {}
 
 testNotNullable(
   E1<num?> e1numNullableNN,
@@ -47,32 +41,30 @@ class A {
   E5? e5ANullable;
 }
 
-testOptionalPositional([
-  E1<num?> e1numNullableOP,
-  E1<double> e1doubleOP,
-  E2 e2OP,
-  E3 e3OP,
-  E4 e4OP,
-  E5 e5OP,
-  E1<num?>? e1numNullableOPNullable,
-  E1<double>? e1doubleOPNullable,
-  E2? e2OPNullable,
-  E3? e3OPNullable,
-  E4? e4OPNullable,
-  E5? e5OPNullable,
-]) {}
+testOptionalPositional(
+    [E1<num?> e1numNullableOP,
+    E1<double> e1doubleOP,
+    E2 e2OP,
+    E3 e3OP,
+    E4 e4OP,
+    E5 e5OP,
+    E1<num?>? e1numNullableOPNullable,
+    E1<double>? e1doubleOPNullable,
+    E2? e2OPNullable,
+    E3? e3OPNullable,
+    E4? e4OPNullable,
+    E5? e5OPNullable]) {}
 
-testNamedNotRequired({
-  E1<num?> e1numNullableNNR,
-  E1<double> e1doubleNNR,
-  E2 e2NNR,
-  E3 e3NNR,
-  E4 e4NNR,
-  E5 e5NNR,
-  E1<num?>? e1numNullableNNRNullable,
-  E1<double>? e1doubleNNRNullable,
-  E2? e2NNRNullable,
-  E3? e3NNRNullable,
-  E4? e4NNRNullable,
-  E5? e5NNRNullable,
-}) {}
+testNamedNotRequired(
+    {E1<num?> e1numNullableNNR,
+    E1<double> e1doubleNNR,
+    E2 e2NNR,
+    E3 e3NNR,
+    E4 e4NNR,
+    E5 e5NNR,
+    E1<num?>? e1numNullableNNRNullable,
+    E1<double>? e1doubleNNRNullable,
+    E2? e2NNRNullable,
+    E3? e3NNRNullable,
+    E4? e4NNRNullable,
+    E5? e5NNRNullable}) {}

pkg/front_end/testcases/extension_types/nullability.dart.textual_outline_modelled.expect

@@ -23,29 +23,22 @@ extension type E4(E1<int> foo) {}
 
 extension type E5(E2 foo) {}
 
-testNamedNotRequired({
-  E1<num?> e1numNullableNNR,
-  E1<double> e1doubleNNR,
-  E2 e2NNR,
-  E3 e3NNR,
-  E4 e4NNR,
-  E5 e5NNR,
-  E1<num?>? e1numNullableNNRNullable,
-  E1<double>? e1doubleNNRNullable,
-  E2? e2NNRNullable,
-  E3? e3NNRNullable,
-  E4? e4NNRNullable,
-  E5? e5NNRNullable,
-}) {}
+testNamedNotRequired(
+    {E1<num?> e1numNullableNNR,
+    E1<double> e1doubleNNR,
+    E2 e2NNR,
+    E3 e3NNR,
+    E4 e4NNR,
+    E5 e5NNR,
+    E1<num?>? e1numNullableNNRNullable,
+    E1<double>? e1doubleNNRNullable,
+    E2? e2NNRNullable,
+    E3? e3NNRNullable,
+    E4? e4NNRNullable,
+    E5? e5NNRNullable}) {}
 
-testNotNonNullable(
-  E1<num?> e1numNullableNNN,
-  E1<double> e1doubleNNN,
-  E2 e2NNN,
-  E3 e3NNN,
-  E4 e4NNN,
-  E5 e5NNN,
-) {}
+testNotNonNullable(E1<num?> e1numNullableNNN, E1<double> e1doubleNNN, E2 e2NNN,
+    E3 e3NNN, E4 e4NNN, E5 e5NNN) {}
 
 testNotNullable(
   E1<num?> e1numNullableNN,
@@ -62,17 +55,16 @@ testNotNullable(
   E5? e5NNNullable,
 ) {}
 
-testOptionalPositional([
-  E1<num?> e1numNullableOP,
-  E1<double> e1doubleOP,
-  E2 e2OP,
-  E3 e3OP,
-  E4 e4OP,
-  E5 e5OP,
-  E1<num?>? e1numNullableOPNullable,
-  E1<double>? e1doubleOPNullable,
-  E2? e2OPNullable,
-  E3? e3OPNullable,
-  E4? e4OPNullable,
-  E5? e5OPNullable,
-]) {}
+testOptionalPositional(
+    [E1<num?> e1numNullableOP,
+    E1<double> e1doubleOP,
+    E2 e2OP,
+    E3 e3OP,
+    E4 e4OP,
+    E5 e5OP,
+    E1<num?>? e1numNullableOPNullable,
+    E1<double>? e1doubleOPNullable,
+    E2? e2OPNullable,
+    E3? e3OPNullable,
+    E4? e4OPNullable,
+    E5? e5OPNullable]) {}

pkg/front_end/testcases/extension_types/nullable_access.dart.textual_outline.expect

@@ -7,10 +7,4 @@ extension type ET(int? i) {
 }
 
 method<X extends ET, Y extends ET?>(
-  ET et1,
-  ET? et2,
-  X x1,
-  X? x2,
-  Y y1,
-  Y? y2,
-) {}
+    ET et1, ET? et2, X x1, X? x2, Y y1, Y? y2) {}

pkg/front_end/testcases/extension_types/nullable_access.dart.textual_outline_modelled.expect

@@ -7,10 +7,4 @@ extension type ET(int? i) {
 }
 
 method<X extends ET, Y extends ET?>(
-  ET et1,
-  ET? et2,
-  X x1,
-  X? x2,
-  Y y1,
-  Y? y2,
-) {}
+    ET et1, ET? et2, X x1, X? x2, Y y1, Y? y2) {}

pkg/front_end/testcases/general/DeltaBlue.dart.textual_outline.expect

@@ -8,14 +8,13 @@ class Strength {
   final int value;
   final String name;
   const Strength(this.value, this.name);
-  Strength nextWeaker() =>
-      const <Strength>[
+  Strength nextWeaker() => const <Strength>[
         STRONG_PREFERRED,
         PREFERRED,
         STRONG_DEFAULT,
         NORMAL,
         WEAK_DEFAULT,
-        WEAKEST,
+        WEAKEST
       ][value];
   static bool stronger(Strength s1, Strength s2) {}
   static bool weaker(Strength s1, Strength s2) {}
@@ -109,12 +108,8 @@ class ScaleConstraint extends BinaryConstraint {
   final Variable scale;
   final Variable offset;
   ScaleConstraint(
-    Variable src,
-    this.scale,
-    this.offset,
-    Variable dest,
-    Strength strength,
-  ) : super(src, dest, strength);
+      Variable src, this.scale, this.offset, Variable dest, Strength strength)
+      : super(src, dest, strength);
   void addToGraph() {}
   void removeFromGraph() {}
   void markInputs(int mark) {}
@@ -124,7 +119,7 @@ class ScaleConstraint extends BinaryConstraint {
 
 class EqualityConstraint extends BinaryConstraint {
   EqualityConstraint(Variable v1, Variable v2, Strength strength)
-    : super(v1, v2, strength);
+      : super(v1, v2, strength);
   void execute() {}
 }
 

pkg/front_end/testcases/general/DeltaBlue.dart.textual_outline_modelled.expect

@@ -61,7 +61,7 @@ class EditConstraint extends UnaryConstraint {
 
 class EqualityConstraint extends BinaryConstraint {
   EqualityConstraint(Variable v1, Variable v2, Strength strength)
-    : super(v1, v2, strength);
+      : super(v1, v2, strength);
   void execute() {}
 }
 
@@ -86,12 +86,8 @@ class Planner {
 
 class ScaleConstraint extends BinaryConstraint {
   ScaleConstraint(
-    Variable src,
-    this.scale,
-    this.offset,
-    Variable dest,
-    Strength strength,
-  ) : super(src, dest, strength);
+      Variable src, this.scale, this.offset, Variable dest, Strength strength)
+      : super(src, dest, strength);
   final Variable offset;
   final Variable scale;
   void addToGraph() {}
@@ -107,14 +103,13 @@ class StayConstraint extends UnaryConstraint {
 }
 
 class Strength {
-  Strength nextWeaker() =>
-      const <Strength>[
+  Strength nextWeaker() => const <Strength>[
         STRONG_PREFERRED,
         PREFERRED,
         STRONG_DEFAULT,
         NORMAL,
         WEAK_DEFAULT,
-        WEAKEST,
+        WEAKEST
       ][value];
   const Strength(this.value, this.name);
   final String name;

pkg/front_end/testcases/general/annotation_top.dart.textual_outline.expect

@@ -1,5 +1,6 @@
 @a
 @A(1)
+
 library test;
 
 const Object a = const Object();

pkg/front_end/testcases/general/annotation_variable_declaration.dart.textual_outline.expect

@@ -8,13 +8,9 @@ class Bar {
 class Baz {
   Baz(@foo constructorFormal);
   factory Baz.bazFactory(@foo factoryFormal) => throw '';
-  fisk(
-    @foo formal1,
-    @Bar() formal2,
-    @Bar.named(foo) formal3,
-    @foo @Bar.named(foo) formal4, [
-    @foo optional,
-  ]) {}
+  fisk(@foo formal1, @Bar() formal2, @Bar.named(foo) formal3,
+      @foo @Bar.named(foo) formal4,
+      [@foo optional]) {}
   hest({@foo named}) => null;
 }
 

pkg/front_end/testcases/general/annotation_variable_declaration.dart.textual_outline_modelled.expect

@@ -6,13 +6,9 @@ class Bar {
 class Baz {
   Baz(@foo constructorFormal);
   factory Baz.bazFactory(@foo factoryFormal) => throw '';
-  fisk(
-    @foo formal1,
-    @Bar() formal2,
-    @Bar.named(foo) formal3,
-    @foo @Bar.named(foo) formal4, [
-    @foo optional,
-  ]) {}
+  fisk(@foo formal1, @Bar() formal2, @Bar.named(foo) formal3,
+      @foo @Bar.named(foo) formal4,
+      [@foo optional]) {}
   hest({@foo named}) => null;
 }
 

pkg/front_end/testcases/general/assign_to_initializing_formal.dart.textual_outline.expect

@@ -3,9 +3,9 @@ import "package:expect/expect.dart";
 class A {
   var x, y;
   A(this.x)
-    : y = (() {
-        x = 3;
-      });
+      : y = (() {
+          x = 3;
+        });
 }
 
 main() {}

pkg/front_end/testcases/general/assign_to_initializing_formal.dart.textual_outline_modelled.expect

@@ -2,9 +2,9 @@ import "package:expect/expect.dart";
 
 class A {
   A(this.x)
-    : y = (() {
-        x = 3;
-      });
+      : y = (() {
+          x = 3;
+        });
   var x, y;
 }
 

pkg/front_end/testcases/general/bounds_type_aliases.dart.textual_outline.expect

@@ -38,24 +38,22 @@ typedef S7 = G<Object>;
 
 typedef S8 = G<int>;
 
-typedef Typedef1 =
-    void Function<
-      T1 extends F,
-      T2 extends F<dynamic>,
-      T3 extends F<Class>,
-      T4 extends F<Class<dynamic>>,
-      T5 extends F<ConcreteClass>,
-      T6 extends F<Class<ConcreteClass>>,
-      T7 extends F<Object>,
-      T8 extends F<int>,
-      S1 extends G,
-      S2 extends G<dynamic>,
-      S3 extends G<Class>,
-      S4 extends G<Class<dynamic>>,
-      S5 extends G<ConcreteClass>,
-      S6 extends G<Class<ConcreteClass>>,
-      S7 extends G<Object>,
-      S8 extends G<int>
-    >();
+typedef Typedef1 = void Function<
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>>();
 
 main() {}

pkg/front_end/testcases/general/bounds_type_aliases.dart.textual_outline_modelled.expect

@@ -40,22 +40,20 @@ typedef T7 = F<Object>;
 
 typedef T8 = F<int>;
 
-typedef Typedef1 =
-    void Function<
-      T1 extends F,
-      T2 extends F<dynamic>,
-      T3 extends F<Class>,
-      T4 extends F<Class<dynamic>>,
-      T5 extends F<ConcreteClass>,
-      T6 extends F<Class<ConcreteClass>>,
-      T7 extends F<Object>,
-      T8 extends F<int>,
-      S1 extends G,
-      S2 extends G<dynamic>,
-      S3 extends G<Class>,
-      S4 extends G<Class<dynamic>>,
-      S5 extends G<ConcreteClass>,
-      S6 extends G<Class<ConcreteClass>>,
-      S7 extends G<Object>,
-      S8 extends G<int>
-    >();
+typedef Typedef1 = void Function<
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>>();

pkg/front_end/testcases/general/bounds_type_arguments.dart.textual_outline.expect

@@ -8,24 +8,8 @@ class G<X extends Class<X>> {}
 
 typedef H<X> = Class2;
 
-void staticMethod<
-  T1,
-  T2,
-  T3,
-  T4,
-  T5,
-  T6,
-  T7,
-  T8,
-  S1,
-  S2,
-  S3,
-  S4,
-  S5,
-  S6,
-  S7,
-  S8
->() {}
+void staticMethod<T1, T2, T3, T4, T5, T6, T7, T8, S1, S2, S3, S4, S5, S6, S7,
+    S8>() {}
 
 class Class1<T1, T2, T3, T4, T5, T6, T7, T8, S1, S2, S3, S4, S5, S6, S7, S8> {
   Class1();
@@ -34,24 +18,8 @@ class Class1<T1, T2, T3, T4, T5, T6, T7, T8, S1, S2, S3, S4, S5, S6, S7, S8> {
 }
 
 class Class2 {
-  void instanceMethod<
-    T1,
-    T2,
-    T3,
-    T4,
-    T5,
-    T6,
-    T7,
-    T8,
-    S1,
-    S2,
-    S3,
-    S4,
-    S5,
-    S6,
-    S7,
-    S8
-  >() {}
+  void instanceMethod<T1, T2, T3, T4, T5, T6, T7, T8, S1, S2, S3, S4, S5, S6,
+      S7, S8>() {}
 }
 
 test() {}

pkg/front_end/testcases/general/bounds_type_arguments.dart.textual_outline_modelled.expect

@@ -7,24 +7,8 @@ class Class1<T1, T2, T3, T4, T5, T6, T7, T8, S1, S2, S3, S4, S5, S6, S7, S8> {
 }
 
 class Class2 {
-  void instanceMethod<
-    T1,
-    T2,
-    T3,
-    T4,
-    T5,
-    T6,
-    T7,
-    T8,
-    S1,
-    S2,
-    S3,
-    S4,
-    S5,
-    S6,
-    S7,
-    S8
-  >() {}
+  void instanceMethod<T1, T2, T3, T4, T5, T6, T7, T8, S1, S2, S3, S4, S5, S6,
+      S7, S8>() {}
 }
 
 class ConcreteClass implements Class<ConcreteClass> {}
@@ -39,21 +23,5 @@ typedef F<X extends Class<X>> = X;
 
 typedef H<X> = Class2;
 
-void staticMethod<
-  T1,
-  T2,
-  T3,
-  T4,
-  T5,
-  T6,
-  T7,
-  T8,
-  S1,
-  S2,
-  S3,
-  S4,
-  S5,
-  S6,
-  S7,
-  S8
->() {}
+void staticMethod<T1, T2, T3, T4, T5, T6, T7, T8, S1, S2, S3, S4, S5, S6, S7,
+    S8>() {}

pkg/front_end/testcases/general/bounds_type_parameters.dart.textual_outline.expect

@@ -9,437 +9,425 @@ class G<X extends Class<X>> {}
 class H<X extends (Class<X>, int)> {}
 
 typedef Typedef1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> = void Function();
+        T1 extends F,
+        T2 extends F<dynamic>,
+        T3 extends F<Class>,
+        T4 extends F<Class<dynamic>>,
+        T5 extends F<ConcreteClass>,
+        T6 extends F<Class<ConcreteClass>>,
+        T7 extends F<Object>,
+        T8 extends F<int>,
+        S1 extends G,
+        S2 extends G<dynamic>,
+        S3 extends G<Class>,
+        S4 extends G<Class<dynamic>>,
+        S5 extends G<ConcreteClass>,
+        S6 extends G<Class<ConcreteClass>>,
+        S7 extends G<Object>,
+        S8 extends G<int>,
+        U1 extends (F, int),
+        U2 extends (F<dynamic>, int),
+        U3 extends (F<Class>, int),
+        U4 extends (F<Class<dynamic>>, int),
+        U5 extends (F<ConcreteClass>, int),
+        U6 extends (F<Class<ConcreteClass>>, int),
+        U7 extends (F<Object>, int),
+        U8 extends (F<int>, int),
+        V1 extends ({G a, int b}),
+        V2 extends ({G<dynamic> a, int b}),
+        V3 extends ({G<Class> a, int b}),
+        V4 extends ({G<Class<dynamic>> a, int b}),
+        V5 extends ({G<ConcreteClass> a, int b}),
+        V6 extends ({G<Class<ConcreteClass>> a, int b}),
+        V7 extends ({G<Object> a, int b}),
+        V8 extends ({G<int> a, int b}),
+        W1 extends H,
+        W2 extends H<dynamic>,
+        W3 extends H<(Class, int)>,
+        W4 extends H<(Class<dynamic>, int)>,
+        W5 extends H<(ConcreteClass, int)>,
+        W6 extends H<(Class<ConcreteClass>, int)>,
+        W7 extends H<(Object, int)>,
+        W8 extends H<(int, int)>>
+    = void Function();
 
-typedef Typedef2 =
-    void Function<
-      T1 extends F,
-      T2 extends F<dynamic>,
-      T3 extends F<Class>,
-      T4 extends F<Class<dynamic>>,
-      T5 extends F<ConcreteClass>,
-      T6 extends F<Class<ConcreteClass>>,
-      T7 extends F<Object>,
-      T8 extends F<int>,
-      S1 extends G,
-      S2 extends G<dynamic>,
-      S3 extends G<Class>,
-      S4 extends G<Class<dynamic>>,
-      S5 extends G<ConcreteClass>,
-      S6 extends G<Class<ConcreteClass>>,
-      S7 extends G<Object>,
-      S8 extends G<int>,
-      U1 extends (F, int),
-      U2 extends (F<dynamic>, int),
-      U3 extends (F<Class>, int),
-      U4 extends (F<Class<dynamic>>, int),
-      U5 extends (F<ConcreteClass>, int),
-      U6 extends (F<Class<ConcreteClass>>, int),
-      U7 extends (F<Object>, int),
-      U8 extends (F<int>, int),
-      V1 extends ({G a, int b}),
-      V2 extends ({G<dynamic> a, int b}),
-      V3 extends ({G<Class> a, int b}),
-      V4 extends ({G<Class<dynamic>> a, int b}),
-      V5 extends ({G<ConcreteClass> a, int b}),
-      V6 extends ({G<Class<ConcreteClass>> a, int b}),
-      V7 extends ({G<Object> a, int b}),
-      V8 extends ({G<int> a, int b}),
-      W1 extends H,
-      W2 extends H<dynamic>,
-      W3 extends H<(Class, int)>,
-      W4 extends H<(Class<dynamic>, int)>,
-      W5 extends H<(ConcreteClass, int)>,
-      W6 extends H<(Class<ConcreteClass>, int)>,
-      W7 extends H<(Object, int)>,
-      W8 extends H<(int, int)>
-    >();
+typedef Typedef2 = void Function<
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>>();
 
 typedef void Typedef3<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
->();
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>>();
 
 class Class1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> {}
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> {}
 
 class Class2<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> = Object
-    with Class;
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> = Object with Class;
 
 mixin Mixin1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> {}
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> {}
 
 enum Enum1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> {
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> {
   a<
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int)
-  >(),
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int)>()
 }
 
 extension Extension<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
->
-    on Class {}
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> on Class {}
 
 void method1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
->() {}
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>>() {}
 
 test() {}
 

pkg/front_end/testcases/general/bounds_type_parameters.dart.textual_outline_modelled.expect

@@ -1,89 +1,86 @@
 class Class1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> {}
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> {}
 
 class Class2<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> = Object
-    with Class;
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> = Object with Class;
 
 class ConcreteClass implements Class<ConcreteClass> {}
 
@@ -92,355 +89,346 @@ class G<X extends Class<X>> {}
 class H<X extends (Class<X>, int)> {}
 
 enum Enum1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> {
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> {
   a<
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    ConcreteClass,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    G<ConcreteClass>,
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    ({ConcreteClass a, int b}),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int),
-    (ConcreteClass, int)
-  >(),
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      ConcreteClass,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      G<ConcreteClass>,
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      ({ConcreteClass a, int b}),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int),
+      (ConcreteClass, int)>()
 }
 
 extension Extension<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
->
-    on Class {}
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> on Class {}
 
 main() {}
 
 mixin Class<T> {}
 
 mixin Mixin1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> {}
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>> {}
 
 test() {}
 
 typedef F<X extends Class<X>> = X;
 
 typedef Typedef1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
-> = void Function();
+        T1 extends F,
+        T2 extends F<dynamic>,
+        T3 extends F<Class>,
+        T4 extends F<Class<dynamic>>,
+        T5 extends F<ConcreteClass>,
+        T6 extends F<Class<ConcreteClass>>,
+        T7 extends F<Object>,
+        T8 extends F<int>,
+        S1 extends G,
+        S2 extends G<dynamic>,
+        S3 extends G<Class>,
+        S4 extends G<Class<dynamic>>,
+        S5 extends G<ConcreteClass>,
+        S6 extends G<Class<ConcreteClass>>,
+        S7 extends G<Object>,
+        S8 extends G<int>,
+        U1 extends (F, int),
+        U2 extends (F<dynamic>, int),
+        U3 extends (F<Class>, int),
+        U4 extends (F<Class<dynamic>>, int),
+        U5 extends (F<ConcreteClass>, int),
+        U6 extends (F<Class<ConcreteClass>>, int),
+        U7 extends (F<Object>, int),
+        U8 extends (F<int>, int),
+        V1 extends ({G a, int b}),
+        V2 extends ({G<dynamic> a, int b}),
+        V3 extends ({G<Class> a, int b}),
+        V4 extends ({G<Class<dynamic>> a, int b}),
+        V5 extends ({G<ConcreteClass> a, int b}),
+        V6 extends ({G<Class<ConcreteClass>> a, int b}),
+        V7 extends ({G<Object> a, int b}),
+        V8 extends ({G<int> a, int b}),
+        W1 extends H,
+        W2 extends H<dynamic>,
+        W3 extends H<(Class, int)>,
+        W4 extends H<(Class<dynamic>, int)>,
+        W5 extends H<(ConcreteClass, int)>,
+        W6 extends H<(Class<ConcreteClass>, int)>,
+        W7 extends H<(Object, int)>,
+        W8 extends H<(int, int)>>
+    = void Function();
 
-typedef Typedef2 =
-    void Function<
-      T1 extends F,
-      T2 extends F<dynamic>,
-      T3 extends F<Class>,
-      T4 extends F<Class<dynamic>>,
-      T5 extends F<ConcreteClass>,
-      T6 extends F<Class<ConcreteClass>>,
-      T7 extends F<Object>,
-      T8 extends F<int>,
-      S1 extends G,
-      S2 extends G<dynamic>,
-      S3 extends G<Class>,
-      S4 extends G<Class<dynamic>>,
-      S5 extends G<ConcreteClass>,
-      S6 extends G<Class<ConcreteClass>>,
-      S7 extends G<Object>,
-      S8 extends G<int>,
-      U1 extends (F, int),
-      U2 extends (F<dynamic>, int),
-      U3 extends (F<Class>, int),
-      U4 extends (F<Class<dynamic>>, int),
-      U5 extends (F<ConcreteClass>, int),
-      U6 extends (F<Class<ConcreteClass>>, int),
-      U7 extends (F<Object>, int),
-      U8 extends (F<int>, int),
-      V1 extends ({G a, int b}),
-      V2 extends ({G<dynamic> a, int b}),
-      V3 extends ({G<Class> a, int b}),
-      V4 extends ({G<Class<dynamic>> a, int b}),
-      V5 extends ({G<ConcreteClass> a, int b}),
-      V6 extends ({G<Class<ConcreteClass>> a, int b}),
-      V7 extends ({G<Object> a, int b}),
-      V8 extends ({G<int> a, int b}),
-      W1 extends H,
-      W2 extends H<dynamic>,
-      W3 extends H<(Class, int)>,
-      W4 extends H<(Class<dynamic>, int)>,
-      W5 extends H<(ConcreteClass, int)>,
-      W6 extends H<(Class<ConcreteClass>, int)>,
-      W7 extends H<(Object, int)>,
-      W8 extends H<(int, int)>
-    >();
+typedef Typedef2 = void Function<
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>>();
 
 typedef void Typedef3<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
->();
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>>();
 
 void method1<
-  T1 extends F,
-  T2 extends F<dynamic>,
-  T3 extends F<Class>,
-  T4 extends F<Class<dynamic>>,
-  T5 extends F<ConcreteClass>,
-  T6 extends F<Class<ConcreteClass>>,
-  T7 extends F<Object>,
-  T8 extends F<int>,
-  S1 extends G,
-  S2 extends G<dynamic>,
-  S3 extends G<Class>,
-  S4 extends G<Class<dynamic>>,
-  S5 extends G<ConcreteClass>,
-  S6 extends G<Class<ConcreteClass>>,
-  S7 extends G<Object>,
-  S8 extends G<int>,
-  U1 extends (F, int),
-  U2 extends (F<dynamic>, int),
-  U3 extends (F<Class>, int),
-  U4 extends (F<Class<dynamic>>, int),
-  U5 extends (F<ConcreteClass>, int),
-  U6 extends (F<Class<ConcreteClass>>, int),
-  U7 extends (F<Object>, int),
-  U8 extends (F<int>, int),
-  V1 extends ({G a, int b}),
-  V2 extends ({G<dynamic> a, int b}),
-  V3 extends ({G<Class> a, int b}),
-  V4 extends ({G<Class<dynamic>> a, int b}),
-  V5 extends ({G<ConcreteClass> a, int b}),
-  V6 extends ({G<Class<ConcreteClass>> a, int b}),
-  V7 extends ({G<Object> a, int b}),
-  V8 extends ({G<int> a, int b}),
-  W1 extends H,
-  W2 extends H<dynamic>,
-  W3 extends H<(Class, int)>,
-  W4 extends H<(Class<dynamic>, int)>,
-  W5 extends H<(ConcreteClass, int)>,
-  W6 extends H<(Class<ConcreteClass>, int)>,
-  W7 extends H<(Object, int)>,
-  W8 extends H<(int, int)>
->() {}
+    T1 extends F,
+    T2 extends F<dynamic>,
+    T3 extends F<Class>,
+    T4 extends F<Class<dynamic>>,
+    T5 extends F<ConcreteClass>,
+    T6 extends F<Class<ConcreteClass>>,
+    T7 extends F<Object>,
+    T8 extends F<int>,
+    S1 extends G,
+    S2 extends G<dynamic>,
+    S3 extends G<Class>,
+    S4 extends G<Class<dynamic>>,
+    S5 extends G<ConcreteClass>,
+    S6 extends G<Class<ConcreteClass>>,
+    S7 extends G<Object>,
+    S8 extends G<int>,
+    U1 extends (F, int),
+    U2 extends (F<dynamic>, int),
+    U3 extends (F<Class>, int),
+    U4 extends (F<Class<dynamic>>, int),
+    U5 extends (F<ConcreteClass>, int),
+    U6 extends (F<Class<ConcreteClass>>, int),
+    U7 extends (F<Object>, int),
+    U8 extends (F<int>, int),
+    V1 extends ({G a, int b}),
+    V2 extends ({G<dynamic> a, int b}),
+    V3 extends ({G<Class> a, int b}),
+    V4 extends ({G<Class<dynamic>> a, int b}),
+    V5 extends ({G<ConcreteClass> a, int b}),
+    V6 extends ({G<Class<ConcreteClass>> a, int b}),
+    V7 extends ({G<Object> a, int b}),
+    V8 extends ({G<int> a, int b}),
+    W1 extends H,
+    W2 extends H<dynamic>,
+    W3 extends H<(Class, int)>,
+    W4 extends H<(Class<dynamic>, int)>,
+    W5 extends H<(ConcreteClass, int)>,
+    W6 extends H<(Class<ConcreteClass>, int)>,
+    W7 extends H<(Object, int)>,
+    W8 extends H<(int, int)>>() {}

pkg/front_end/testcases/general/conditional_import.dart.textual_outline.expect

@@ -1,12 +1,10 @@
 import "conditional_import.dart"
     if (dart.library.io) "dart:io"
-    if (dart.library.html) "dart:html"
-    as a;
+    if (dart.library.html) "dart:html" as a;
 
 import "conditional_import.dart"
     if (dart.library.html) "dart:html"
-    if (dart.library.io) "dart:io"
-    as b;
+    if (dart.library.io) "dart:io" as b;
 
 import "conditional_import.dart" if (dart.library.foo) "dart:foo" as c;
 

pkg/front_end/testcases/general/conditional_import.dart.textual_outline_modelled.expect

@@ -1,12 +1,10 @@
 import "conditional_import.dart" if (dart.library.foo) "dart:foo" as c;
 import "conditional_import.dart"
     if (dart.library.html) "dart:html"
-    if (dart.library.io) "dart:io"
-    as b;
+    if (dart.library.io) "dart:io" as b;
 import "conditional_import.dart"
     if (dart.library.io) "dart:io"
-    if (dart.library.html) "dart:html"
-    as a;
+    if (dart.library.html) "dart:html" as a;
 
 class HttpRequest {}
 

pkg/front_end/testcases/general/constants/const_asserts.dart.textual_outline.expect

@@ -1,16 +1,14 @@
 class Foo {
   final int x;
   const Foo(this.x)
-    : assert(x > 0, "x is not positive"),
-      assert(x > 0),
-      assert(x > 0, ""),
-      assert(
-        const bool.fromEnvironment("foo") == false,
-        "foo was ${const bool.fromEnvironment("foo")}",
-      ),
-      assert(const bool.fromEnvironment("foo") == false);
+      : assert(x > 0, "x is not positive"),
+        assert(x > 0),
+        assert(x > 0, ""),
+        assert(const bool.fromEnvironment("foo") == false,
+            "foo was ${const bool.fromEnvironment("foo")}"),
+        assert(const bool.fromEnvironment("foo") == false);
   const Foo.withMessage(this.x)
-    : assert(x < 0, "btw foo was ${const bool.fromEnvironment("foo")}");
+      : assert(x < 0, "btw foo was ${const bool.fromEnvironment("foo")}");
   const Foo.withInvalidMessage(this.x) : assert(x < 0, x);
   const Foo.withInvalidCondition(this.x) : assert(x);
 }

pkg/front_end/testcases/general/constants/const_asserts.dart.textual_outline_modelled.expect

@@ -7,18 +7,16 @@ class Bar {
 
 class Foo {
   const Foo(this.x)
-    : assert(x > 0, "x is not positive"),
-      assert(x > 0),
-      assert(x > 0, ""),
-      assert(
-        const bool.fromEnvironment("foo") == false,
-        "foo was ${const bool.fromEnvironment("foo")}",
-      ),
-      assert(const bool.fromEnvironment("foo") == false);
+      : assert(x > 0, "x is not positive"),
+        assert(x > 0),
+        assert(x > 0, ""),
+        assert(const bool.fromEnvironment("foo") == false,
+            "foo was ${const bool.fromEnvironment("foo")}"),
+        assert(const bool.fromEnvironment("foo") == false);
   const Foo.withInvalidCondition(this.x) : assert(x);
   const Foo.withInvalidMessage(this.x) : assert(x < 0, x);
   const Foo.withMessage(this.x)
-    : assert(x < 0, "btw foo was ${const bool.fromEnvironment("foo")}");
+      : assert(x < 0, "btw foo was ${const bool.fromEnvironment("foo")}");
   final int x;
 }
 

pkg/front_end/testcases/general/constants/const_collections.dart.textual_outline.expect

@@ -31,7 +31,7 @@ const List<String> barWithMapSpread = [...foo, ...quux];
 
 const List<String> barWithCustomIterableSpread1 = [
   ...bar,
-  ...const CustomIterable(),
+  ...const CustomIterable()
 ];
 
 const List<String> barWithCustomIterableSpread2 = [...bar, ...CustomIterable()];
@@ -60,7 +60,7 @@ const Set<String> quxWithMapSpread = {...baz, ...quux};
 
 const Set<String> quxWithCustomIterableSpread1 = {
   ...baz,
-  ...const CustomIterable(),
+  ...const CustomIterable()
 };
 
 const Set<String> quxWithCustomIterableSpread2 = {...baz, ...CustomIterable()};
@@ -98,7 +98,7 @@ const Map<String, String> customMap = const CustomMap();
 const Map<String, String> mapWithCustomMap3 = {...customMap};
 
 const Map<dynamic, int> mapWithNonPrimitiveEqualsKey = {
-  const WithEquals(42): 42,
+  const WithEquals(42): 42
 };
 
 const Map<int, int> mapWithDuplicates = {42: 42, 42: 42};
@@ -159,11 +159,9 @@ class CustomMap implements Map<String, String> {
   @override
   void removeWhere(bool predicate(String key, String value)) =>
       throw new UnimplementedError();
-  String update(
-    String key,
-    String update(String value), {
-    String ifAbsent()?,
-  }) => throw new UnimplementedError();
+  String update(String key, String update(String value),
+          {String ifAbsent()?}) =>
+      throw new UnimplementedError();
   Map<K2, V2> map<K2, V2>(MapEntry<K2, V2> f(String key, String value)) =>
       throw new UnimplementedError();
 }

pkg/front_end/testcases/general/constants/const_collections.dart.textual_outline_modelled.expect

@@ -40,11 +40,9 @@ class CustomMap implements Map<String, String> {
       throw new UnimplementedError();
   @override
   String remove(Object? key) => throw new UnimplementedError();
-  String update(
-    String key,
-    String update(String value), {
-    String ifAbsent()?,
-  }) => throw new UnimplementedError();
+  String update(String key, String update(String value),
+          {String ifAbsent()?}) =>
+      throw new UnimplementedError();
   @override
   bool containsKey(Object? key) => throw new UnimplementedError();
   @override
@@ -88,7 +86,7 @@ const List<String> bar = [...foo, "!"];
 
 const List<String> barWithCustomIterableSpread1 = [
   ...bar,
-  ...const CustomIterable(),
+  ...const CustomIterable()
 ];
 
 const List<String> barWithCustomIterableSpread2 = [...bar, ...CustomIterable()];
@@ -130,7 +128,7 @@ const Map<String, String> quuzWithNullSpread = {...quux, ...?nullMap};
 const Map<String, String> quuzWithSetSpread = {...quux, ...baz};
 
 const Map<dynamic, int> mapWithNonPrimitiveEqualsKey = {
-  const WithEquals(42): 42,
+  const WithEquals(42): 42
 };
 
 const Map<int, int> mapWithDuplicates = {42: 42, 42: 42};
@@ -143,7 +141,7 @@ const Set<String> qux = {...baz, "!"};
 
 const Set<String> quxWithCustomIterableSpread1 = {
   ...baz,
-  ...const CustomIterable(),
+  ...const CustomIterable()
 };
 
 const Set<String> quxWithCustomIterableSpread2 = {...baz, ...CustomIterable()};

pkg/front_end/testcases/general/constants/const_exponential_compare.dart.textual_outline.expect

@@ -1,37 +1,11 @@
 class Class {
   final Class? next1;
   final Class? next2;
-  const Class([Class? next]) : next1 = next, next2 = next;
+  const Class([Class? next])
+      : next1 = next,
+        next2 = next;
 }
 
-const Class test = const Class(
-  Class(
-    Class(
-      Class(
-        Class(
-          Class(
-            Class(
-              Class(
-                Class(
-                  Class(
-                    Class(
-                      Class(
-                        Class(
-                          Class(
-                            Class(
-                              Class(Class(Class(Class(Class(Class(Class())))))),
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    ),
-  ),
-);
+const Class test = const Class(Class(Class(Class(Class(Class(Class(Class(Class(
+    Class(Class(Class(Class(Class(
+        Class(Class(Class(Class(Class(Class(Class(Class())))))))))))))))))))));

pkg/front_end/testcases/general/constants/const_exponential_compare.dart.textual_outline_modelled.expect

@@ -1,37 +1,11 @@
 class Class {
-  const Class([Class? next]) : next1 = next, next2 = next;
+  const Class([Class? next])
+      : next1 = next,
+        next2 = next;
   final Class? next1;
   final Class? next2;
 }
 
-const Class test = const Class(
-  Class(
-    Class(
-      Class(
-        Class(
-          Class(
-            Class(
-              Class(
-                Class(
-                  Class(
-                    Class(
-                      Class(
-                        Class(
-                          Class(
-                            Class(
-                              Class(Class(Class(Class(Class(Class(Class())))))),
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    ),
-  ),
-);
+const Class test = const Class(Class(Class(Class(Class(Class(Class(Class(Class(
+    Class(Class(Class(Class(Class(
+        Class(Class(Class(Class(Class(Class(Class(Class())))))))))))))))))))));

pkg/front_end/testcases/general/constants/from_lib/main.dart.textual_outline.expect

@@ -1,9 +1,17 @@
 import 'main_lib.dart' as a;
 
-const map = <int, String>{...a.map};
+const map = <int, String>{
+  ...a.map,
+};
 
-const set = <int>{...a.set, ...a.list};
+const set = <int>{
+  ...a.set,
+  ...a.list,
+};
 
-const list = <int>[...a.list, ...a.set];
+const list = <int>[
+  ...a.list,
+  ...a.set,
+];
 
 main() {}

pkg/front_end/testcases/general/constants/from_lib/main.dart.textual_outline_modelled.expect

@@ -1,9 +1,17 @@
 import 'main_lib.dart' as a;
 
-const list = <int>[...a.list, ...a.set];
+const list = <int>[
+  ...a.list,
+  ...a.set,
+];
 
-const map = <int, String>{...a.map};
+const map = <int, String>{
+  ...a.map,
+};
 
-const set = <int>{...a.set, ...a.list};
+const set = <int>{
+  ...a.set,
+  ...a.list,
+};
 
 main() {}

pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.textual_outline.expect

@@ -1,7 +1,9 @@
 class MyClass {
   final int a;
   final int b;
-  const MyClass(i1, i2) : a = (i1 >>> i2), b = (i1 >>> i2);
+  const MyClass(i1, i2)
+      : a = (i1 >>> i2),
+        b = (i1 >>> i2);
 }
 
 test() {}

pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.textual_outline_modelled.expect

@@ -1,5 +1,7 @@
 class MyClass {
-  const MyClass(i1, i2) : a = (i1 >>> i2), b = (i1 >>> i2);
+  const MyClass(i1, i2)
+      : a = (i1 >>> i2),
+        b = (i1 >>> i2);
   final int a;
   final int b;
 }