[CFE] Strong/weak suites takes error-and-ok-comments into account

A line marked with "// error" should get an error (or it's an error),
and one marked with "// ok" should not get an error (and if it does it's
an error).

Some tests are left unhandled and are programatically ignored in this
first CL. A bug (https://github.com/dart-lang/sdk/issues/54635) has
been filed to sort those out.

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

pkg/front_end/test/fasta/testing/suite.dart

@@ -128,6 +128,7 @@ import '../../testing_utils.dart' show checkEnvironment;
 import '../../utils/kernel_chain.dart'
     show
         ComponentResult,
+        ErrorCommentChecker,
         MatchContext,
         MatchExpectation,
         Print,
@@ -190,6 +191,10 @@ const String EXPECTATIONS = '''
   {
     "name": "SemiFuzzCrash",
     "group": "Fail"
+  },
+  {
+    "name": "ErrorCommentCheckFailure",
+    "group": "Fail"
   }
 ]
 ''';
@@ -251,6 +256,7 @@ class FastaContext extends ChainContext with MatchContext {
       this.soundNullSafety)
       : steps = <Step>[
           new Outline(compileMode, updateComments: updateComments),
+          new ErrorCommentChecker(compileMode),
           const Print(),
           new Verify(compileMode == CompileMode.full
               ? VerificationStage.afterConstantEvaluation

pkg/front_end/test/spell_checking_list_tests.txt

@@ -124,6 +124,7 @@ caption
 captions
 carefully
 categorization
+categorize
 causal
 cb
 cc
@@ -442,6 +443,7 @@ kitty
 ko
 koo
 la
+lambdas
 lat
 launch
 launching
@@ -688,6 +690,7 @@ sigint
 signalled
 sigwinch
 silence
+simplistic
 slashes
 slight
 sliver

pkg/front_end/test/utils/kernel_chain.dart

@@ -5,8 +5,18 @@
 library fasta.testing.kernel_chain;
 
 import 'dart:async';
+
 import 'dart:io' show Directory, File, IOSink, Platform;
 
+import 'dart:typed_data';
+
+import 'package:_fe_analyzer_shared/src/scanner/abstract_scanner.dart'
+    show ScannerConfiguration;
+import 'package:_fe_analyzer_shared/src/scanner/token.dart';
+
+import 'package:_fe_analyzer_shared/src/scanner/utf8_bytes_scanner.dart'
+    show Utf8BytesScanner;
+
 import 'package:_fe_analyzer_shared/src/util/relativize.dart'
     show isWindows, relativizeUri;
 
@@ -34,6 +44,7 @@ import 'package:kernel/ast.dart'
         Block,
         Component,
         Library,
+        LibraryPart,
         Procedure,
         ReturnStatement,
         Source,
@@ -61,7 +72,8 @@ import 'package:testing/testing.dart'
         Step,
         TestDescription;
 
-import '../fasta/testing/suite.dart' show CompilationSetup;
+import '../fasta/testing/suite.dart' show CompilationSetup, CompileMode;
+
 import '../test_utils.dart';
 
 final Uri platformBinariesLocation = computePlatformBinariesLocation();
@@ -144,6 +156,266 @@ $actual""",
   }
 }
 
+class ErrorCommentChecker
+    extends Step<ComponentResult, ComponentResult, ChainContext> {
+  final CompileMode compileMode;
+  const ErrorCommentChecker(this.compileMode);
+  static const bool throwOnNoMatch = false;
+
+  @override
+  String get name => "ErrorCommentChecker";
+
+  static const Set<String> ignoreBecauseOfFailures = {
+    "extension_types/conflicting_static_and_instance",
+    "extension_types/implements_conflicts",
+    "general/bounds_enums",
+    "general/bounds_type_parameters",
+    "general/covariant_equals",
+    "general/getter_vs_setter_type",
+    "general/nested_variance",
+    "general/nested_variance2",
+    "general/new_as_selector",
+    "general/top_level_variance_test",
+    "general/top_level_variance2",
+    "general/type_variable_uses",
+    "generic_metadata/alias_from_opt_in",
+    "inference/block_bodied_lambdas_infer_bottom_sync",
+    "inference/future_then_conditional",
+    "inference/future_then_ifNull",
+    "inference/generic_methods_infer_js_builtin",
+    "inference/instantiate_to_bounds_generic2_has_bound_defined_after",
+    "inference/instantiate_to_bounds_generic2_has_bound_defined_before",
+    "inference/void_return_type_subtypes_dynamic",
+    "nnbd_mixed/hierarchy/in_dill_out_in/in_out_in",
+    "nnbd_mixed/hierarchy/in_out_dill_in/in_out_in",
+    "nnbd/getter_vs_setter_type_nnbd",
+    "nnbd/getter_vs_setter_type",
+    "nnbd/null_access",
+    "patterns/exhaustiveness/bool_switch",
+    "patterns/exhaustiveness/enum_switch",
+    "patterns/for_final_variable",
+    "patterns/pattern_types",
+    "records/type_record_as_supertype"
+  };
+
+  @override
+  Future<Result<ComponentResult>> run(
+      ComponentResult result, ChainContext context) {
+    if (compileMode != CompileMode.full) return Future.value(pass(result));
+    // TODO(jensj): Delete this once failures are fixed.
+    if (ignoreBecauseOfFailures.contains(result.description.shortName)) {
+      return Future.value(pass(result));
+    }
+
+    Component component = result.component;
+    for (Library lib in component.libraries) {
+      if (!result.userLibraries.contains(lib.importUri)) continue;
+      if (!lib.fileUri.isScheme("file")) continue;
+      List<Uri> uris = [];
+      List<String> filenames = [];
+      for (LibraryPart part in lib.parts) {
+        // This is a bit simplistic but will probably work for our use here.
+        uris.add(lib.fileUri.resolve(part.partUri));
+        filenames.add(uris.last.pathSegments.last);
+      }
+      uris.add(lib.fileUri);
+      filenames.add(uris.last.pathSegments.last);
+
+      Set<String> expectProblemOn = {};
+      Set<String> expectNoProblemOn = {};
+      for (Uri uri in uris) {
+        Set<int> expectErrorOnLines = {};
+        Set<int> expectNoErrorOnLines = {};
+        Map<int, List<CommentToken>> linesToComments =
+            extractCommentsFromLines(uri);
+        categorizeCommentLines(
+            linesToComments, expectErrorOnLines, expectNoErrorOnLines);
+        for (int line in expectErrorOnLines) {
+          expectProblemOn.add("${uri.pathSegments.last}:$line");
+        }
+        for (int line in expectNoErrorOnLines) {
+          expectNoProblemOn.add("${uri.pathSegments.last}:$line");
+        }
+      }
+
+      // Now check.
+      if (expectProblemOn.isNotEmpty || expectNoProblemOn.isNotEmpty) {
+        List<String> failures = [];
+        Set<String> notYetSeen = new Set<String>.of(expectProblemOn);
+        // Sanity check: No overlap between error and no-error expectations.
+        Set<String> overlap = expectProblemOn.intersection(expectNoProblemOn);
+        if (overlap.isNotEmpty) {
+          for (String fileAndLine in overlap) {
+            failures.add("Test error: "
+                "$fileAndLine is marked as both error and no error.");
+          }
+        }
+
+        List<String>? libraryProblems = lib.problemsAsJson;
+        RegExp extractLineRegExp = RegExp(
+            "(${filenames.map((e) => RegExp.escape(e)).join("|")}):(\\d+)");
+
+        if (libraryProblems != null) {
+          for (String jsonString in libraryProblems) {
+            DiagnosticMessageFromJson message =
+                new DiagnosticMessageFromJson.fromJson(jsonString);
+            // By taking all of these we accept it if it's just mentioned in a
+            // context message too. Is that the precision we want?
+            for (String plainTextProblem in message.plainTextFormatted) {
+              List<RegExpMatch> matches =
+                  extractLineRegExp.allMatches(plainTextProblem).toList();
+              if (matches.isEmpty && throwOnNoMatch) {
+                throw "Couldn't extract any offsets from "
+                    "'$plainTextProblem' with '$extractLineRegExp'";
+              }
+              for (RegExpMatch match in matches) {
+                String lineString = match.group(0)!;
+                notYetSeen.remove(lineString);
+                if (expectNoProblemOn.contains(lineString)) {
+                  failures.add("Found error at $lineString "
+                      "but didn't expect any:\n"
+                      "$plainTextProblem");
+                }
+              }
+            }
+          }
+        }
+
+        for (String line in notYetSeen) {
+          failures.add("Expected error on $line but didn't find any.");
+        }
+
+        if (failures.isNotEmpty) {
+          return new Future.value(new Result<ComponentResult>(
+              result,
+              context.expectationSet["ErrorCommentCheckFailure"],
+              "Found ${failures.length} failures:\n\n * "
+              "${failures.join("\n\n * ")}\n"));
+        }
+      }
+    }
+
+    return Future.value(pass(result));
+  }
+
+  void categorizeCommentLines(Map<int, List<CommentToken>> linesToComments,
+      Set<int> expectErrorOnLines, Set<int> expectNoErrorOnLines) {
+    for (MapEntry<int, List<CommentToken>> entry in linesToComments.entries) {
+      for (CommentToken comment in entry.value) {
+        String message = comment.lexeme.trim().toLowerCase();
+        while (message.startsWith("//") || message.startsWith("/*")) {
+          message = message.substring(2).trim();
+        }
+        // TODO(jensj): Possibly reduce these cases by updating tests.
+        // See discussion in
+        // https://dart-review.googlesource.com/c/sdk/+/346301.
+        if (message == "error" ||
+            message == "error." ||
+            message == "error */" ||
+            message == "error*/" ||
+            message.startsWith("error in strong mode") ||
+            message.startsWith("error:") ||
+            message.startsWith("error,") ||
+            message.startsWith("error.") ||
+            message.startsWith("error - ") ||
+            message.startsWith("error (") ||
+            message.startsWith("error on ") ||
+            message.startsWith("error in ") ||
+            message.startsWith("error since ") ||
+            message.startsWith("error because ") ||
+            message.startsWith("not ok.") ||
+            message.startsWith("note: illegal ") ||
+            message.startsWith("parse error:") ||
+            message.startsWith("parse error,") ||
+            message.startsWith("compile-time error") ||
+            message.endsWith(" compile-time error")) {
+          expectErrorOnLines.add(entry.key);
+        } else if (message == "ok" ||
+            message == "ok." ||
+            message == "ok," ||
+            message == "ok */" ||
+            message.startsWith("ok: ") ||
+            message.startsWith("ok, ") ||
+            message.startsWith("ok (") ||
+            message.startsWith("ok because ") ||
+            message.startsWith("ok to ") ||
+            message.startsWith("now ok") ||
+            message.startsWith("no error.") ||
+            message.startsWith("no error:") ||
+            message.startsWith("no error ") ||
+            message.startsWith("not a compile time error") ||
+            message.startsWith("not an error") ||
+            message == "shouldn't result in a compile-time error.") {
+          expectNoErrorOnLines.add(entry.key);
+        }
+      }
+    }
+  }
+
+  Map<int, List<CommentToken>> extractCommentsFromLines(Uri uri) {
+    if (!uri.isScheme("file")) return const {};
+    File f = new File.fromUri(uri);
+    if (!f.existsSync()) return const {};
+    Uint8List rawBytes = f.readAsBytesSync();
+
+    Uint8List bytes = new Uint8List(rawBytes.length + 1);
+    bytes.setRange(0, rawBytes.length, rawBytes);
+
+    Utf8BytesScanner scanner = new Utf8BytesScanner(
+      bytes,
+      configuration: const ScannerConfiguration(
+          enableExtensionMethods: true,
+          enableNonNullable: true,
+          enableTripleShift: true),
+      includeComments: true,
+      languageVersionChanged: (scanner, languageVersion) {
+        // Nothing - but don't overwrite the previous settings.
+      },
+    );
+    Token firstToken = scanner.tokenize();
+    List<int> lineStarts = scanner.lineStarts;
+
+    Token? token = firstToken;
+    Token? previousToken;
+    Source lineStartsHelper = new Source(lineStarts, const [], null, null);
+    Map<int, List<CommentToken>> linesToComments = {};
+    while (token != null && !token.isEof) {
+      CommentToken? precedingComments = token.precedingComments;
+      while (precedingComments != null) {
+        int commentLine = lineStartsHelper
+            .getLocation(Uri.base /* dummy */, precedingComments.offset)
+            .line;
+        int tokenLine = lineStartsHelper
+            .getLocation(Uri.base /* dummy */, token.offset)
+            .line;
+        int likelyAboutLine = tokenLine;
+        if (previousToken != null) {
+          int previousTokenLine = lineStartsHelper
+              .getLocation(Uri.base /* dummy */, previousToken.offset)
+              .line;
+          if (previousTokenLine == commentLine) likelyAboutLine = commentLine;
+        }
+        if (!precedingComments.lexeme.startsWith("// Copyright (c)") &&
+            !precedingComments.lexeme
+                .startsWith("// for details. All rights reserved.") &&
+            !precedingComments.lexeme.startsWith("// BSD-style license")) {
+          (linesToComments[likelyAboutLine] ??= []).add(precedingComments);
+        }
+
+        Token? next = precedingComments.next;
+        if (next is CommentToken) {
+          precedingComments = next;
+        } else {
+          precedingComments = null;
+        }
+      }
+      previousToken = token;
+      token = token.next;
+    }
+    return linesToComments;
+  }
+}
+
 class Print extends Step<ComponentResult, ComponentResult, ChainContext> {
   const Print();
 

pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart

@@ -4,8 +4,9 @@
 
 // Test that it is an error to mix in a non-mixin class post 3.0.
 
+// Error
 class A with Comparable<int> {
   int compareTo(int x) => 0;
-} /* Error */
+}
 
 class B with Error {} /* Error */

pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.expect

@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //

pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.transformed.expect

@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //

pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.expect

@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //

pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.modular.expect

@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //

pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.outline.expect

@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //

pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.weak.transformed.expect

@@ -2,18 +2,18 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:7:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:8:14: Error: The class 'Comparable' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class A with Comparable<int> {
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:7: Error: Can't use 'Error' as a mixin because it has constructors.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:7: Error: Can't use 'Error' as a mixin because it has constructors.
 // class B with Error {} /* Error */
 //       ^
 // sdk/lib/core/errors.dart:73:3: Context: This constructor prevents using 'Error' as a mixin.
 //   Error(); // Prevent use as mixin.
 //   ^
 //
-// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:11:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
+// pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart:12:14: Error: The class 'Error' can't be used as a mixin because it isn't a mixin class nor a mixin.
 // class B with Error {} /* Error */
 //              ^
 //

pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart

@@ -28,8 +28,8 @@ class E1 {
 
 class E2 {
   E2._();
-  factory E2.new() => E2._(); // Error.
-  E2();
+  factory E2.new() => E2._();
+  E2(); // Error.
 }
 
 class E3 {

pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.expect

@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.

pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.strong.transformed.expect

@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.

pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.expect

@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.

pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.modular.expect

@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.

pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.outline.expect

@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.

pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart.weak.transformed.expect

@@ -24,10 +24,10 @@ library;
 //   ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:32:3: Error: 'E2' is already declared in this scope.
-//   E2();
+//   E2(); // Error.
 //   ^^
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:31:11: Context: Previous declaration of 'E2'.
-//   factory E2.new() => E2._(); // Error.
+//   factory E2.new() => E2._();
 //           ^^
 //
 // pkg/front_end/testcases/constructor_tearoffs/explicit_new_as_unnamed.dart:38:11: Error: 'E3' is already declared in this scope.

pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart

@@ -13,20 +13,19 @@ void m<X>(X x) {}
 // Generic function instantiation to a type parameter is supported implicitly.
 class B<X> {
   final void Function(X) f;
-  const B() : f = m;
+  const B() : f = m; // OK.
 }
 
-// But it is not supported explicitly.
+// And it is also supported explicitly.
 class C<X> {
   final f;
-  const C() : f = m<X>; // Error, but should be accepted.
+  const C() : f = m<X>; // OK.
 }
 
 void main() {
   const A<int>(<int>[1]); // OK.
   const b = B<String>(); // OK.
   print(b.f.runtimeType); // OK: 'String => void'.
-  const c = C<
-      String>(); // Compile-time error in `C`, but should be accepted when it works.
-  print(c.f.runtimeType); // (Never executed, so we don't know).
+  const c = C<String>(); // OK.
+  print(c.f.runtimeType); // OK: 'String => void'.
 }

pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart

@@ -95,7 +95,7 @@ testArgs() {
   var c3a = f3a(42);
   expect(42, c3a.field);
   () {
-    f3a(); // error
+    f3a(); // error 
     f3a(42, 87); // error
   };
 

pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.expect

@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.

pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.strong.transformed.expect

@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.

pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.expect

@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.

pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.modular.expect

@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.

pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart.weak.transformed.expect

@@ -142,7 +142,7 @@ static method testArgs() → dynamic {
   self::expect(42, c3a.{self::Class3::field}{core::int});
   () → Null {
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:98:8: Error: Too few positional arguments: 1 required, 0 given.
-    f3a(); // error
+    f3a(); // error 
        ^" in f3a{<inapplicable>}.();
     invalid-expression "pkg/front_end/testcases/constructor_tearoffs/redirecting_factory_tear_off.dart:99:8: Error: Too many positional arguments: 1 allowed, but 2 found.
 Try removing the extra positional arguments.

pkg/front_end/testcases/dart2js/native.dart

@@ -17,14 +17,14 @@ set topLevelSetter(_) {}
 
 topLevelFunction() {}
 
-// NON_NATIVE_EXTERNAL               //# 01: compile-time error
-external get externalTopLevelGetter; //# 01: continued
+// NON_NATIVE_EXTERNAL
+external get externalTopLevelGetter;
 
-// NON_NATIVE_EXTERNAL                  //# 02: compile-time error
-external set externalTopLevelSetter(_); //# 02: continued
+// NON_NATIVE_EXTERNAL
+external set externalTopLevelSetter(_);
 
-// NON_NATIVE_EXTERNAL               //# 03: compile-time error
-external externalTopLevelFunction(); //# 03: continued
+// NON_NATIVE_EXTERNAL
+external externalTopLevelFunction();
 
 get nativeTopLevelGetter native;
 
@@ -36,17 +36,17 @@ class Class {
   Class.generative();
   factory Class.fact() => null;
 
-  // NON_NATIVE_EXTERNAL               //# 08: compile-time error
-  external Class.externalGenerative(); //# 08: continued
+  // NON_NATIVE_EXTERNAL
+  external Class.externalGenerative();
 
-  // NON_NATIVE_EXTERNAL                 //# 09: compile-time error
-  external factory Class.externalFact(); //# 09: continued
+  // NON_NATIVE_EXTERNAL
+  external factory Class.externalFact();
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 10: compile-time error
-  Class.nativeGenerative() native; //# 10: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  Class.nativeGenerative() native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 11: compile-time error
-  factory Class.nativeFact() native; //# 11: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  factory Class.nativeFact() native;
 
   var instanceField;
   get instanceGetter => null;
@@ -58,36 +58,36 @@ class Class {
   static set staticSetter(_) {}
   static staticMethod() {}
 
-  // NON_NATIVE_EXTERNAL               //# 22: compile-time error
-  external get externalInstanceGetter; //# 22: continued
+  // NON_NATIVE_EXTERNAL
+  external get externalInstanceGetter;
 
-  // NON_NATIVE_EXTERNAL                  //# 23: compile-time error
-  external set externalInstanceSetter(_); //# 23: continued
+  // NON_NATIVE_EXTERNAL
+  external set externalInstanceSetter(_);
 
-  // NON_NATIVE_EXTERNAL             //# 24: compile-time error
-  external externalInstanceMethod(); //# 24: continued
+  // NON_NATIVE_EXTERNAL
+  external externalInstanceMethod();
 
-  // NON_NATIVE_EXTERNAL                    //# 25: compile-time error
-  external static get externalStaticGetter; //# 25: continued
+  // NON_NATIVE_EXTERNAL
+  external static get externalStaticGetter;
 
-  // NON_NATIVE_EXTERNAL                       //# 26: compile-time error
-  external static set externalStaticSetter(_); //# 26: continued
+  // NON_NATIVE_EXTERNAL
+  external static set externalStaticSetter(_);
 
-  // NON_NATIVE_EXTERNAL                  //# 27: compile-time error
-  external static externalStaticMethod(); //# 27: continued
+  // NON_NATIVE_EXTERNAL
+  external static externalStaticMethod();
 
   get nativeInstanceGetter native;
   set nativeInstanceSetter(_) native;
   nativeInstanceMethod() native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 28: compile-time error
-  static get nativeStaticGetter native; //# 28: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static get nativeStaticGetter native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 29: compile-time error
-  static set nativeStaticSetter(_) native; //# 29: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static set nativeStaticSetter(_) native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 30: compile-time error
-  static nativeStaticMethod() native; //# 30: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static nativeStaticMethod() native;
 }
 
 @Native('d')
@@ -96,10 +96,10 @@ class NativeClass {
 
   factory NativeClass.fact() => null;
 
-  // NON_NATIVE_EXTERNAL                     //# 31: compile-time error
-  external NativeClass.externalGenerative(); //# 31: continued
-  // NON_NATIVE_EXTERNAL                       //# 32: compile-time error
-  external factory NativeClass.externalFact(); //# 32: continued
+  // NON_NATIVE_EXTERNAL
+  external NativeClass.externalGenerative();
+  // NON_NATIVE_EXTERNAL
+  external factory NativeClass.externalFact();
 
   NativeClass.nativeGenerative() native;
   factory NativeClass.nativeFact() native;
@@ -116,23 +116,23 @@ class NativeClass {
 
   var instanceNamedField;
 
-  // NON_NATIVE_EXTERNAL               //# 36: compile-time error
-  external get externalInstanceGetter; //# 36: continued
+  // NON_NATIVE_EXTERNAL
+  external get externalInstanceGetter;
 
-  // NON_NATIVE_EXTERNAL                  //# 37: compile-time error
-  external set externalInstanceSetter(_); //# 37: continued
+  // NON_NATIVE_EXTERNAL
+  external set externalInstanceSetter(_);
 
-  // NON_NATIVE_EXTERNAL             //# 38: compile-time error
-  external externalInstanceMethod(); //# 38: continued
+  // NON_NATIVE_EXTERNAL
+  external externalInstanceMethod();
 
-  // NON_NATIVE_EXTERNAL                    //# 39: compile-time error
-  external static get externalStaticGetter; //# 39: continued
+  // NON_NATIVE_EXTERNAL
+  external static get externalStaticGetter;
 
-  // NON_NATIVE_EXTERNAL                       //# 40: compile-time error
-  external static set externalStaticSetter(_); //# 40: continued
+  // NON_NATIVE_EXTERNAL
+  external static set externalStaticSetter(_);
 
-  // NON_NATIVE_EXTERNAL                  //# 41: compile-time error
-  external static externalStaticMethod(); //# 41: continued
+  // NON_NATIVE_EXTERNAL
+  external static externalStaticMethod();
 
   get nativeInstanceGetter native;
   set nativeInstanceSetter(_) native;
@@ -150,19 +150,19 @@ main() {
   topLevelGetter;
   topLevelSetter = null;
   topLevelFunction();
-  externalTopLevelGetter; //# 01: continued
-  externalTopLevelSetter = null; //# 02: continued
-  externalTopLevelFunction(); //# 03: continued
+  externalTopLevelGetter;
+  externalTopLevelSetter = null;
+  externalTopLevelFunction();
   nativeTopLevelGetter;
   nativeTopLevelSetter = null;
   nativeTopLevelFunction();
 
   var c1 = new Class.generative();
   new Class.fact();
-  new Class.externalGenerative(); //# 08: continued
-  new Class.externalFact(); //# 09: continued
-  new Class.nativeGenerative(); //# 10: continued
-  new Class.nativeFact(); //# 11: continued
+  new Class.externalGenerative();
+  new Class.externalFact();
+  new Class.nativeGenerative();
+  new Class.nativeFact();
   c1.instanceField;
   c1.instanceGetter;
   c1.instanceSetter = null;
@@ -171,23 +171,23 @@ main() {
   Class.staticGetter;
   Class.staticSetter = null;
   Class.staticMethod();
-  c1.externalInstanceGetter; //# 22: continued
-  c1.externalInstanceSetter = null; //# 23: continued
-  c1.externalInstanceMethod(); //# 24: continued
-  Class.externalStaticGetter; //# 25: continued
-  Class.externalStaticSetter = null; //# 26: continued
-  Class.externalStaticMethod(); //# 27: continued
+  c1.externalInstanceGetter;
+  c1.externalInstanceSetter = null;
+  c1.externalInstanceMethod();
+  Class.externalStaticGetter;
+  Class.externalStaticSetter = null;
+  Class.externalStaticMethod();
   c1.nativeInstanceGetter;
   c1.nativeInstanceSetter = null;
   c1.nativeInstanceMethod();
-  Class.nativeStaticGetter; //# 28: continued
-  Class.nativeStaticSetter = null; //# 29: continued
-  Class.nativeStaticMethod(); //# 30: continued
+  Class.nativeStaticGetter;
+  Class.nativeStaticSetter = null;
+  Class.nativeStaticMethod();
 
   var c2 = new NativeClass.generative();
   new NativeClass.fact();
-  new NativeClass.externalGenerative(); //# 31: continued
-  new NativeClass.externalFact(); //# 32: continued
+  new NativeClass.externalGenerative();
+  new NativeClass.externalFact();
   new NativeClass.nativeGenerative();
   new NativeClass.nativeFact();
   c2.instanceField;
@@ -198,12 +198,12 @@ main() {
   NativeClass.staticGetter;
   NativeClass.staticSetter = null;
   NativeClass.staticMethod();
-  c2.externalInstanceGetter; //# 36: continued
-  c2.externalInstanceSetter = null; //# 37: continued
-  c2.externalInstanceMethod(); //# 38: continued
-  NativeClass.externalStaticGetter; //# 39: continued
-  NativeClass.externalStaticSetter = null; //# 40: continued
-  NativeClass.externalStaticMethod(); //# 41: continued
+  c2.externalInstanceGetter;
+  c2.externalInstanceSetter = null;
+  c2.externalInstanceMethod();
+  NativeClass.externalStaticGetter;
+  NativeClass.externalStaticSetter = null;
+  NativeClass.externalStaticMethod();
   c2.nativeInstanceGetter;
   c2.nativeInstanceSetter = null;
   c2.nativeInstanceMethod();

pkg/front_end/testcases/dart2js/native_legacy.dart

@@ -15,14 +15,14 @@ set topLevelSetter(_) {}
 
 topLevelFunction() {}
 
-// NON_NATIVE_EXTERNAL               //# 01: compile-time error
-external get externalTopLevelGetter; //# 01: continued
+// NON_NATIVE_EXTERNAL
+external get externalTopLevelGetter;
 
-// NON_NATIVE_EXTERNAL                  //# 02: compile-time error
-external set externalTopLevelSetter(_); //# 02: continued
+// NON_NATIVE_EXTERNAL
+external set externalTopLevelSetter(_);
 
-// NON_NATIVE_EXTERNAL               //# 03: compile-time error
-external externalTopLevelFunction(); //# 03: continued
+// NON_NATIVE_EXTERNAL
+external externalTopLevelFunction();
 
 get nativeTopLevelGetter native;
 
@@ -34,17 +34,17 @@ class Class {
   Class.generative();
   factory Class.fact() => null as dynamic;
 
-  // NON_NATIVE_EXTERNAL               //# 08: compile-time error
-  external Class.externalGenerative(); //# 08: continued
+  // NON_NATIVE_EXTERNAL
+  external Class.externalGenerative();
 
-  // NON_NATIVE_EXTERNAL                 //# 09: compile-time error
-  external factory Class.externalFact(); //# 09: continued
+  // NON_NATIVE_EXTERNAL
+  external factory Class.externalFact();
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 10: compile-time error
-  Class.nativeGenerative() native; //# 10: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  Class.nativeGenerative() native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 11: compile-time error
-  factory Class.nativeFact() native; //# 11: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  factory Class.nativeFact() native;
 
   var instanceField;
   get instanceGetter => null;
@@ -56,36 +56,36 @@ class Class {
   static set staticSetter(_) {}
   static staticMethod() {}
 
-  // NON_NATIVE_EXTERNAL               //# 22: compile-time error
-  external get externalInstanceGetter; //# 22: continued
+  // NON_NATIVE_EXTERNAL
+  external get externalInstanceGetter;
 
-  // NON_NATIVE_EXTERNAL                  //# 23: compile-time error
-  external set externalInstanceSetter(_); //# 23: continued
+  // NON_NATIVE_EXTERNAL
+  external set externalInstanceSetter(_);
 
-  // NON_NATIVE_EXTERNAL             //# 24: compile-time error
-  external externalInstanceMethod(); //# 24: continued
+  // NON_NATIVE_EXTERNAL
+  external externalInstanceMethod();
 
-  // NON_NATIVE_EXTERNAL                    //# 25: compile-time error
-  external static get externalStaticGetter; //# 25: continued
+  // NON_NATIVE_EXTERNAL
+  external static get externalStaticGetter;
 
-  // NON_NATIVE_EXTERNAL                       //# 26: compile-time error
-  external static set externalStaticSetter(_); //# 26: continued
+  // NON_NATIVE_EXTERNAL
+  external static set externalStaticSetter(_);
 
-  // NON_NATIVE_EXTERNAL                  //# 27: compile-time error
-  external static externalStaticMethod(); //# 27: continued
+  // NON_NATIVE_EXTERNAL
+  external static externalStaticMethod();
 
   get nativeInstanceGetter native;
   set nativeInstanceSetter(_) native;
   nativeInstanceMethod() native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 28: compile-time error
-  static get nativeStaticGetter native; //# 28: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static get nativeStaticGetter native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 29: compile-time error
-  static set nativeStaticSetter(_) native; //# 29: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static set nativeStaticSetter(_) native;
 
-  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS //# 30: compile-time error
-  static nativeStaticMethod() native; //# 30: continued
+  // NATIVE_NON_INSTANCE_IN_NON_NATIVE_CLASS
+  static nativeStaticMethod() native;
 }
 
 @Native('d')
@@ -94,10 +94,10 @@ class NativeClass {
 
   factory NativeClass.fact() => null as dynamic;
 
-  // NON_NATIVE_EXTERNAL                     //# 31: compile-time error
-  external NativeClass.externalGenerative(); //# 31: continued
-  // NON_NATIVE_EXTERNAL                       //# 32: compile-time error
-  external factory NativeClass.externalFact(); //# 32: continued
+  // NON_NATIVE_EXTERNAL
+  external NativeClass.externalGenerative();
+  // NON_NATIVE_EXTERNAL
+  external factory NativeClass.externalFact();
 
   NativeClass.nativeGenerative() native;
   factory NativeClass.nativeFact() native;
@@ -114,23 +114,23 @@ class NativeClass {
 
   var instanceNamedField;
 
-  // NON_NATIVE_EXTERNAL               //# 36: compile-time error
-  external get externalInstanceGetter; //# 36: continued
+  // NON_NATIVE_EXTERNAL
+  external get externalInstanceGetter;
 
-  // NON_NATIVE_EXTERNAL                  //# 37: compile-time error
-  external set externalInstanceSetter(_); //# 37: continued
+  // NON_NATIVE_EXTERNAL
+  external set externalInstanceSetter(_);
 
-  // NON_NATIVE_EXTERNAL             //# 38: compile-time error
-  external externalInstanceMethod(); //# 38: continued
+  // NON_NATIVE_EXTERNAL
+  external externalInstanceMethod();
 
-  // NON_NATIVE_EXTERNAL                    //# 39: compile-time error
-  external static get externalStaticGetter; //# 39: continued
+  // NON_NATIVE_EXTERNAL
+  external static get externalStaticGetter;
 
-  // NON_NATIVE_EXTERNAL                       //# 40: compile-time error
-  external static set externalStaticSetter(_); //# 40: continued
+  // NON_NATIVE_EXTERNAL
+  external static set externalStaticSetter(_);
 
-  // NON_NATIVE_EXTERNAL                  //# 41: compile-time error
-  external static externalStaticMethod(); //# 41: continued
+  // NON_NATIVE_EXTERNAL
+  external static externalStaticMethod();
 
   get nativeInstanceGetter native;
   set nativeInstanceSetter(_) native;
@@ -148,19 +148,19 @@ main() {
   topLevelGetter;
   topLevelSetter = null;
   topLevelFunction();
-  externalTopLevelGetter; //# 01: continued
-  externalTopLevelSetter = null; //# 02: continued
-  externalTopLevelFunction(); //# 03: continued
+  externalTopLevelGetter;
+  externalTopLevelSetter = null;
+  externalTopLevelFunction();
   nativeTopLevelGetter;
   nativeTopLevelSetter = null;
   nativeTopLevelFunction();
 
   var c1 = new Class.generative();
   new Class.fact();
-  new Class.externalGenerative(); //# 08: continued
-  new Class.externalFact(); //# 09: continued
-  new Class.nativeGenerative(); //# 10: continued
-  new Class.nativeFact(); //# 11: continued
+  new Class.externalGenerative();
+  new Class.externalFact();
+  new Class.nativeGenerative();
+  new Class.nativeFact();
   c1.instanceField;
   c1.instanceGetter;
   c1.instanceSetter = null;
@@ -169,23 +169,23 @@ main() {
   Class.staticGetter;
   Class.staticSetter = null;
   Class.staticMethod();
-  c1.externalInstanceGetter; //# 22: continued
-  c1.externalInstanceSetter = null; //# 23: continued
-  c1.externalInstanceMethod(); //# 24: continued
-  Class.externalStaticGetter; //# 25: continued
-  Class.externalStaticSetter = null; //# 26: continued
-  Class.externalStaticMethod(); //# 27: continued
+  c1.externalInstanceGetter;
+  c1.externalInstanceSetter = null;
+  c1.externalInstanceMethod();
+  Class.externalStaticGetter;
+  Class.externalStaticSetter = null;
+  Class.externalStaticMethod();
   c1.nativeInstanceGetter;
   c1.nativeInstanceSetter = null;
   c1.nativeInstanceMethod();
-  Class.nativeStaticGetter; //# 28: continued
-  Class.nativeStaticSetter = null; //# 29: continued
-  Class.nativeStaticMethod(); //# 30: continued
+  Class.nativeStaticGetter;
+  Class.nativeStaticSetter = null;
+  Class.nativeStaticMethod();
 
   var c2 = new NativeClass.generative();
   new NativeClass.fact();
-  new NativeClass.externalGenerative(); //# 31: continued
-  new NativeClass.externalFact(); //# 32: continued
+  new NativeClass.externalGenerative();
+  new NativeClass.externalFact();
   new NativeClass.nativeGenerative();
   new NativeClass.nativeFact();
   c2.instanceField;
@@ -196,12 +196,12 @@ main() {
   NativeClass.staticGetter;
   NativeClass.staticSetter = null;
   NativeClass.staticMethod();
-  c2.externalInstanceGetter; //# 36: continued
-  c2.externalInstanceSetter = null; //# 37: continued
-  c2.externalInstanceMethod(); //# 38: continued
-  NativeClass.externalStaticGetter; //# 39: continued
-  NativeClass.externalStaticSetter = null; //# 40: continued
-  NativeClass.externalStaticMethod(); //# 41: continued
+  c2.externalInstanceGetter;
+  c2.externalInstanceSetter = null;
+  c2.externalInstanceMethod();
+  NativeClass.externalStaticGetter;
+  NativeClass.externalStaticSetter = null;
+  NativeClass.externalStaticMethod();
   c2.nativeInstanceGetter;
   c2.nativeInstanceSetter = null;
   c2.nativeInstanceMethod();

pkg/front_end/testcases/enhanced_enums/declared_values.dart

@@ -18,7 +18,7 @@ enum E3 {
   element;
 
   static const List<E3> values = [E3.element]; // Error in E3.
-  int values = 42; // Duplicate.
+  int values = 42; // Error: Duplicate.
 }
 
 enum E4 {

pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.expect

@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.

pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.transformed.expect

@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.

pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.expect

@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.

pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.modular.expect

@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.

pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.outline.expect

@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.

pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.transformed.expect

@@ -11,7 +11,7 @@ library;
 //       ^^^^^^
 //
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:21:7: Error: 'values' is already declared in this scope.
-//   int values = 42; // Duplicate.
+//   int values = 42; // Error: Duplicate.
 //       ^^^^^^
 // pkg/front_end/testcases/enhanced_enums/declared_values.dart:20:25: Context: Previous declaration of 'values'.
 //   static const List<E3> values = [E3.element]; // Error in E3.

pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// Error.
 abstract mixin class A extends Enum {
-  // Error.
   int get foo => index;
 }
 

pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.expect

@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //

pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.transformed.expect

@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //

pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.expect

@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //

pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.modular.expect

@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //

pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.outline.expect

@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //

pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.transformed.expect

@@ -2,11 +2,11 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'Enum' can't be extended outside of its library because it's an interface class.
 // abstract mixin class A extends Enum {
 //                                ^
 //
-// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:5:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
+// pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart:6:32: Error: The class 'A' can't be used as a mixin because it extends a class other than 'Object'.
 // abstract mixin class A extends Enum {
 //                                ^
 //

pkg/front_end/testcases/enhanced_enums/missed_checks.dart

@@ -6,8 +6,9 @@ enum E1 {
   element.new(); // Ok: invocation of the unnamed constructor.
 }
 
+// Error.
 enum E2<values> {
-  element; // Error.
+  element;
 }
 
 enum E3<element> {

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

@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.strong.transformed.expect

@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)

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

@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.modular.expect

@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.outline.expect

@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -112,10 +112,10 @@ static method main() → dynamic
 Extra constant evaluation status:
 Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:5:6 -> ListConstant(const <E1*>[const E1{_Enum.index: 0, _Enum._name: "element"}])
 Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:6:3 -> InstanceConstant(const E1{_Enum.index: 0, _Enum._name: "element"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:9:6 -> ListConstant(const <E2<dynamic>*>[const E2<dynamic>{_Enum.index: 0, _Enum._name: "element"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:10:3 -> InstanceConstant(const E2<dynamic>{_Enum.index: 0, _Enum._name: "element"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:13:6 -> ListConstant(const <E3<dynamic>*>[const E3<dynamic>{_Enum.index: 0, _Enum._name: "element"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:14:3 -> InstanceConstant(const E3<dynamic>{_Enum.index: 0, _Enum._name: "element"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:17:6 -> ListConstant(const <values*>[const values{_Enum.index: 0, _Enum._name: "element"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:18:3 -> InstanceConstant(const values{_Enum.index: 0, _Enum._name: "element"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:10:6 -> ListConstant(const <E2<dynamic>*>[const E2<dynamic>{_Enum.index: 0, _Enum._name: "element"}])
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:11:3 -> InstanceConstant(const E2<dynamic>{_Enum.index: 0, _Enum._name: "element"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:14:6 -> ListConstant(const <E3<dynamic>*>[const E3<dynamic>{_Enum.index: 0, _Enum._name: "element"}])
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:15:3 -> InstanceConstant(const E3<dynamic>{_Enum.index: 0, _Enum._name: "element"})
+Evaluated: ListLiteral @ org-dartlang-testcase:///missed_checks.dart:18:6 -> ListConstant(const <values*>[const values{_Enum.index: 0, _Enum._name: "element"}])
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///missed_checks.dart:19:3 -> InstanceConstant(const values{_Enum.index: 0, _Enum._name: "element"})
 Extra constant evaluation: evaluated: 28, effectively constant: 8

pkg/front_end/testcases/enhanced_enums/missed_checks.dart.weak.transformed.expect

@@ -2,37 +2,37 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:6: Error: Conflicts with type variable 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:6: Error: Conflicts with type variable 'values'.
 // enum E2<values> {
 //      ^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:9:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:10:9: Context: This is the type variable.
 // enum E2<values> {
 //         ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:3: Error: Conflicts with type variable 'element'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:15:3: Error: Conflicts with type variable 'element'.
 //   element; // Error.
 //   ^^^^^^^
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:13:9: Context: This is the type variable.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:14:9: Context: This is the type variable.
 // enum E3<element> {
 //         ^^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:17:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:6: Error: The name 'values' is not a valid name for an enum. Try using a different name.
 // enum values { // Error.
 //      ^^^^^^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:33:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:34:16: Error: A concrete instance member named '==' can't be inherited from 'SuperclassWithEquals' in a class that implements 'Enum'.
 // abstract class A1 extends SuperclassWithEquals implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:35:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:36:16: Error: A concrete instance member named 'hashCode' can't be inherited from 'SuperclassWithHashCode' in a class that implements 'Enum'.
 // abstract class A2 extends SuperclassWithHashCode implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:37:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:38:16: Error: A concrete instance member named 'values' can't be inherited from 'SuperclassWithValues' in a class that implements 'Enum'.
 // abstract class A3 extends SuperclassWithValues implements Enum {} // Error.
 //                ^
 //
-// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:18:3: Error: Couldn't find constructor 'values'.
+// pkg/front_end/testcases/enhanced_enums/missed_checks.dart:19:3: Error: Couldn't find constructor 'values'.
 //   element;
 //   ^
 //
@@ -132,6 +132,6 @@ org-dartlang-testcase:///missed_checks.dart:
 - E1. (from org-dartlang-testcase:///missed_checks.dart:5:6)
 - _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
 - Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- E2. (from org-dartlang-testcase:///missed_checks.dart:9:6)
-- E3. (from org-dartlang-testcase:///missed_checks.dart:13:6)
-- values. (from org-dartlang-testcase:///missed_checks.dart:17:6)
+- E2. (from org-dartlang-testcase:///missed_checks.dart:10:6)
+- E3. (from org-dartlang-testcase:///missed_checks.dart:14:6)
+- values. (from org-dartlang-testcase:///missed_checks.dart:18:6)

pkg/front_end/testcases/extensions/check_bounds.dart

@@ -21,36 +21,36 @@ test(A a) {
   Class<A> classA = new Class<A>();
   Class<B> classB = new Class<B>();
 
-  classA.method(); // Expect method not found.
-  Extension(classA).method(); // Expect bounds mismatch.
-  Extension<A>(classA).method(); // Expect bounds mismatch.
+  classA.method(); // Error: Expect method not found.
+  Extension(classA).method(); // Error: Expect bounds mismatch.
+  Extension<A>(classA).method(); // Error: Expect bounds mismatch.
   Extension<B>(classB).method();
-  Extension(classA).genericMethod(a); // Expect bounds mismatch.
-  Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
-  Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
-  Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
-  Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
-  Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
+  Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
+  Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
   Extension<B>(classB).genericMethod<B>(a);
 
   classB.method();
   Extension(classB).method();
-  Extension<A>(classB).method(); // Expect bounds mismatch.
+  Extension<A>(classB).method(); // Error: Expect bounds mismatch.
   Extension<B>(classB).method();
 
-  classB.genericMethod(a); // Expect bounds mismatch.
-  classB.genericMethod<A>(a); // Expect bounds mismatch.
+  classB.genericMethod(a); // Error: Expect bounds mismatch.
+  classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
   classB.genericMethod<B>(a);
-  Extension(classB).genericMethod(a); // Expect bounds mismatch.
-  Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+  Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
   Extension(classB).genericMethod<B>(a);
-  Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
-  Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
-  Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
-  Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
+  Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
+  Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
   Extension<B>(classB).genericMethod<B>(a);
 }
 
@@ -58,44 +58,44 @@ final A a = new A();
 final Class<A> classA = new Class<A>();
 final Class<B> classB = new Class<B>();
 
-final field1 = classA.method(); // Expect method not found.
-final field2 = Extension(classA).method(); // Expect bounds mismatch.
-final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+final field1 = classA.method(); // Error: Expect method not found.
+final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
+final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 final field4 = Extension<B>(classA).method();
-final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
-final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
-final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
+final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
+final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 final field9 =
-    Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field10 =
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 final field11 =
-    Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+    Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 final field12 =
-    Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field13 = Extension<B>(classB).genericMethod<B>(a);
 
 final field14 = classB.method();
 final field15 = Extension(classB).method();
-final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 final field17 = Extension<B>(classB).method();
 
-final field18 = classB.genericMethod(a); // Expect bounds mismatch.
-final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
+final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field20 = classB.genericMethod<B>(a);
-final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 final field22 =
-    Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field23 = Extension(classB).genericMethod<B>(a);
 final field24 =
-    Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 final field25 =
-    Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field26 =
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 final field27 =
-    Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+    Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 final field28 =
-    Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+    Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 final field29 = Extension<B>(classB).genericMethod<B>(a);

pkg/front_end/testcases/extensions/check_bounds.dart.strong.expect

@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);

pkg/front_end/testcases/extensions/check_bounds.dart.strong.transformed.expect

@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);

pkg/front_end/testcases/extensions/check_bounds.dart.weak.expect

@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);

pkg/front_end/testcases/extensions/check_bounds.dart.weak.modular.expect

@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);

pkg/front_end/testcases/extensions/check_bounds.dart.weak.outline.expect

@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}

pkg/front_end/testcases/extensions/check_bounds.dart.weak.transformed.expect

@@ -6,14 +6,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-// final field1 = classA.method(); // Expect method not found.
+// final field1 = classA.method(); // Error: Expect method not found.
 //                       ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:62:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field2 = Extension(classA).method(); // Expect bounds mismatch.
+// final field2 = Extension(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -23,7 +23,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field3 = Extension<A>(classA).method(); // Expect bounds mismatch.
+// final field3 = Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -40,7 +40,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -50,7 +50,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field5 = Extension(classA).genericMethod(a); // Expect bounds mismatch.
+// final field5 = Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -60,7 +60,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -70,7 +70,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field6 = Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+// final field6 = Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -79,14 +79,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                                   ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:67:16: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+// final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -96,7 +96,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -106,7 +106,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field8 = Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+// final field8 = Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //                ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -116,7 +116,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -126,7 +126,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -135,14 +135,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:72:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -152,7 +152,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -162,7 +162,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -178,7 +178,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field16 = Extension<A>(classB).method(); // Expect bounds mismatch.
+// final field16 = Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //                 ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -188,7 +188,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field18 = classB.genericMethod(a); // Expect bounds mismatch.
+// final field18 = classB.genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -198,7 +198,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-// final field19 = classB.genericMethod<A>(a); // Expect bounds mismatch.
+// final field19 = classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -214,7 +214,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-// final field21 = Extension(classB).genericMethod(a); // Expect bounds mismatch.
+// final field21 = Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                                   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -224,7 +224,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                       ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -240,7 +240,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -250,7 +250,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -260,7 +260,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -270,7 +270,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -279,14 +279,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                           ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:96:5: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//     Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -296,7 +296,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -306,7 +306,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//     Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//     Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -322,14 +322,14 @@ library;
 //  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try correcting the name to the name of an existing method, or defining a method named 'method'.
-//   classA.method(); // Expect method not found.
+//   classA.method(); // Error: Expect method not found.
 //          ^^^^^^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:25:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|method'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).method(); // Expect bounds mismatch.
+//   Extension(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -339,7 +339,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).method(); // Expect bounds mismatch.
+//   Extension<A>(classA).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -349,7 +349,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -359,7 +359,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -369,7 +369,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -379,7 +379,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -388,14 +388,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                      ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:30:3: Error: Inferred type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -405,7 +405,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -415,7 +415,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -425,7 +425,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -435,7 +435,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -444,14 +444,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:33:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -461,7 +461,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -471,7 +471,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -487,7 +487,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).method(); // Expect bounds mismatch.
+//   Extension<A>(classB).method(); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -497,7 +497,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   classB.genericMethod(a); // Expect bounds mismatch.
+//   classB.genericMethod(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -507,7 +507,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   classB.genericMethod<A>(a); // Expect bounds mismatch.
+//   classB.genericMethod<A>(a); // Error: Expect bounds mismatch.
 //          ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -523,7 +523,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -533,7 +533,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                     ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -549,7 +549,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -559,7 +559,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -569,7 +569,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -579,7 +579,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -588,14 +588,14 @@ library;
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //                                         ^
 //
 // pkg/front_end/testcases/extensions/check_bounds.dart:51:3: Error: Type argument 'A' doesn't conform to the bound 'B' of the type variable 'T' on 'Extension|genericMethod'.
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+//   Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
 //   ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:13:21: Context: This is the type variable whose bound isn't conformed to.
 // extension Extension<T extends B> on Class<T> {
@@ -605,7 +605,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try specifying type arguments explicitly so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -615,7 +615,7 @@ library;
 //  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 //  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   Extension<B>(classB).genericMethod<A>(a); // Expect bounds mismatch.
+//   Extension<B>(classB).genericMethod<A>(a); // Error: Expect bounds mismatch.
 //                        ^
 // pkg/front_end/testcases/extensions/check_bounds.dart:15:17: Context: This is the type variable whose bound isn't conformed to.
 //   genericMethod<S extends B>(S s) {}
@@ -968,7 +968,7 @@ static final field dynamic field1 = invalid-expression "pkg/front_end/testcases/
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-final field1 = classA.method(); // Expect method not found.
+final field1 = classA.method(); // Error: Expect method not found.
                       ^^^^^^" in self::classA{<unresolved>}.method();
 static final field dynamic field2 = self::Extension|method<self::A>(self::classA);
 static final field dynamic field3 = self::Extension|method<self::A>(self::classA);
@@ -983,14 +983,14 @@ static final field dynamic field6 = self::Extension|genericMethod<self::A, self:
 static final field dynamic field7 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:67:51: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-final field7 = Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+final field7 = Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                                   ^" in self::a as{TypeError} self::B);
 static final field dynamic field8 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field9 = self::Extension|genericMethod<self::A, self::A>(self::classA, self::a);
 static final field dynamic field10 = self::Extension|genericMethod<self::A, self::B>(self::classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:72:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field11 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field12 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1022,7 +1022,7 @@ static final field dynamic field25 = self::Extension|genericMethod<self::A, self
 static final field dynamic field26 = self::Extension|genericMethod<self::A, self::B>(self::classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:96:43: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-    Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+    Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                           ^" in self::a as{TypeError} self::B);
 static final field dynamic field27 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
 static final field dynamic field28 = self::Extension|genericMethod<self::B, self::A>(self::classB, self::a);
@@ -1045,7 +1045,7 @@ static method test(self::A a) → dynamic {
  - 'Class' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
 Try correcting the name to the name of an existing method, or defining a method named 'method'.
-  classA.method(); // Expect method not found.
+  classA.method(); // Error: Expect method not found.
          ^^^^^^" in classA{<unresolved>}.method();
   self::Extension|method<self::A>(classA);
   self::Extension|method<self::A>(classA);
@@ -1055,14 +1055,14 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:30:38: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                      ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::A>(classA, a);
   self::Extension|genericMethod<self::A, self::B>(classA, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:33:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classA).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classA).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
@@ -1094,7 +1094,7 @@ Try correcting the name to the name of an existing method, or defining a method
   self::Extension|genericMethod<self::A, self::B>(classB, invalid-expression "pkg/front_end/testcases/extensions/check_bounds.dart:51:41: Error: The argument type 'A' can't be assigned to the parameter type 'B'.
  - 'A' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
  - 'B' is from 'pkg/front_end/testcases/extensions/check_bounds.dart'.
-  Extension<A>(classB).genericMethod<B>(a); // Expect bounds mismatch.
+  Extension<A>(classB).genericMethod<B>(a); // Error: Expect bounds mismatch.
                                         ^" in a as{TypeError} self::B);
   self::Extension|genericMethod<self::B, self::A>(classB, a);
   self::Extension|genericMethod<self::B, self::A>(classB, a);

pkg/front_end/testcases/general/bounds_catch.dart

@@ -41,165 +41,138 @@ t5a() {
 }
 
 t6a() {
-  try {} on F<Class<ConcreteClass>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<Class<ConcreteClass>> catch (e) {}
 }
 
 t7a() {
-  try {} on F<Object> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on F<Object> catch (e) {}
 }
 
 t8a() {
-  try {} on F<int> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on F<int> catch (e) {}
 }
 
 s1a() {
-  try {} on G catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G catch (e) {}
 }
 
 s2a() {
-  try {} on G<dynamic> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<dynamic> catch (e) {}
 }
 
 s3a() {
-  try {} on G<Class> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class> catch (e) {}
 }
 
 s4a() {
-  try {} on G<Class<dynamic>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class<dynamic>> catch (e) {}
 }
 
 s5a() {
-  try {} on G<ConcreteClass> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<ConcreteClass> catch (e) {}
 }
 
 s6a() {
-  try {} on G<Class<ConcreteClass>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class<ConcreteClass>> catch (e) {}
 }
 
 s7a() {
-  try {} on G<Object> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on G<Object> catch (e) {}
 }
 
 s8a() {
-  try {} on G<int> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on G<int> catch (e) {}
 }
 
 t1b() {
-  try {} on F catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F catch (e) {}
 }
 
 t2b() {
-  try {} on F<dynamic> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<dynamic> catch (e) {}
 }
 
 t3b() {
-  try {} on F<Class> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<Class> catch (e) {}
 }
 
 t4b() {
-  try {} on F<Class<dynamic>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<Class<dynamic>> catch (e) {}
 }
 
 t5b() {
-  try {} on F<ConcreteClass> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<ConcreteClass> catch (e) {}
 }
 
 t6b() {
-  try {} on F<Class<ConcreteClass>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on F<Class<ConcreteClass>> catch (e) {}
 }
 
 t7b() {
-  try {} on F<Object> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on F<Object> catch (e) {}
 }
 
 t8b() {
-  try {} on F<int> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on F<int> catch (e) {}
 }
 
 s1b() {
-  try {} on G catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G catch (e) {}
 }
 
 s2b() {
-  try {} on G<dynamic> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<dynamic> catch (e) {}
 }
 
 s3b() {
-  try {} on G<Class> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class> catch (e) {}
 }
 
 s4b() {
-  try {} on G<Class<dynamic>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class<dynamic>> catch (e) {}
 }
 
 s5b() {
-  try {} on G<ConcreteClass> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<ConcreteClass> catch (e) {}
 }
 
 s6b() {
-  try {} on G<Class<ConcreteClass>> catch (e) {
-    // Ok
-  }
+  // Ok
+  try {} on G<Class<ConcreteClass>> catch (e) {}
 }
 
 s7b() {
-  try {} on G<Object> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on G<Object> catch (e) {}
 }
 
 s8b() {
-  try {} on G<int> catch (e) {
-    // Error
-  }
+  // Error
+  try {} on G<int> catch (e) {}
 }
 
 main() {}

pkg/front_end/testcases/general/bounds_catch.dart.strong.expect

@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}

pkg/front_end/testcases/general/bounds_catch.dart.strong.transformed.expect

@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}

pkg/front_end/testcases/general/bounds_catch.dart.weak.expect

@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}

pkg/front_end/testcases/general/bounds_catch.dart.weak.modular.expect

@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}

pkg/front_end/testcases/general/bounds_catch.dart.weak.transformed.expect

@@ -6,73 +6,73 @@ library;
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:56:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:55:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:98:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:90:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:104:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:95:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:146:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:130:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<Object> catch (e) {
+//   try {} on F<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:152:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
+// pkg/front_end/testcases/general/bounds_catch.dart:135:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'F'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on F<int> catch (e) {
+//   try {} on F<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:9:11: Context: This is the type variable whose bound isn't conformed to.
 // typedef F<X extends Class<X>> = X;
 //           ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:194:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:170:13: Error: Type argument 'Object' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Object' is from 'dart:core'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<Object> catch (e) {
+//   try {} on G<Object> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}
 //         ^
 //
-// pkg/front_end/testcases/general/bounds_catch.dart:200:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
+// pkg/front_end/testcases/general/bounds_catch.dart:175:13: Error: Type argument 'int' doesn't conform to the bound 'Class<X>' of the type variable 'X' on 'G'.
 //  - 'Class' is from 'pkg/front_end/testcases/general/bounds_catch.dart'.
 // Try changing type arguments so that they conform to the bounds.
-//   try {} on G<int> catch (e) {
+//   try {} on G<int> catch (e) {}
 //             ^
 // pkg/front_end/testcases/general/bounds_catch.dart:11:9: Context: This is the type variable whose bound isn't conformed to.
 // class G<X extends Class<X>> {}

pkg/front_end/testcases/general/covariant_equals.dart

@@ -45,7 +45,7 @@ test(A a, B b, C c_dynamic, C<int> c_int, C<String> c_string, D d) {
   c_int == c_dynamic; // ok
   c_int == c_int; // ok
   c_int == c_string; // error
-  c_int == d; // ok}
+  c_int == d; // ok
 
   c_string == a; // error
   c_string == b; // error

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart

@@ -1,13 +1,10 @@
 class Foo {
-  foo.x() {
-    // Not OK.
-  }
-  foo.x() : initializer = true {
-    // Not OK.
-  }
-  foo() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  foo.x() { }
+  // Not OK.
+  foo.x() : initializer = true { }
+  // Not OK.
+  foo() : initializer = true { }
   get Foo => 0;
   get Foo {
     return 0;

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.expect

@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.strong.transformed.expect

@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.expect

@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.modular.expect

@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.outline.expect

@@ -2,254 +2,254 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart.weak.transformed.expect

@@ -2,343 +2,343 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:3: Error: 'Foo.x' is already declared in this scope.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //   ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:2:3: Context: Previous declaration of 'Foo.x'.
-//   foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:3:3: Context: Previous declaration of 'Foo.x'.
+//   foo.x() { }
 //   ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:3: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:3: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Error: 'Foo' is already declared in this scope.
 //   get Foo {
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:11:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:7: Context: Previous declaration of 'Foo'.
 //   get Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
 //   get Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   get Foo.X {
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:3: Error: Constructors can't be a getter.
+// Try removing 'get'.
+//   get Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X => 0;
+//       ^^^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   get Foo : bla = null => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.X {
+//   get Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo : bla = null => 0;
+//   get Foo.X : bla = null {
 //   ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Error: 'Foo.X' is already declared in this scope.
+//   get Foo.X : bla = null {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:13:7: Context: Previous declaration of 'Foo.X'.
+//   get Foo.X {
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   get Foo.X : bla = null {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:3: Error: Constructors can't be a getter.
-// Try removing 'get'.
-//   get Foo.X : bla = null {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: 'Foo.X' is already declared in this scope.
-//   get Foo.X : bla = null {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo.X'.
-//   get Foo.X {
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   set Foo => 0;
 //       ^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: A class member can't have the same name as the enclosing class.
+// Try renaming the member.
+//   set Foo {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: 'Foo' is already declared in this scope.
+//   set Foo {
+//       ^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo'.
+//   set Foo => 0;
+//       ^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: A class member can't have the same name as the enclosing class.
-// Try renaming the member.
-//   set Foo {
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo' is already declared in this scope.
-//   set Foo {
-//       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Context: Previous declaration of 'Foo'.
-//   set Foo => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
 //   set Foo.X => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X => 0;
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:7: Context: Previous declaration of 'Foo.X'.
 //   get Foo.X : bla = null {
 //       ^^^^^
 //
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   set Foo.X {
+//       ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:3: Error: Constructors can't be a setter.
+// Try removing 'set'.
+//   set Foo.X {
+//   ^^^
+//
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Error: 'Foo.X' is already declared in this scope.
+//   set Foo.X {
+//       ^^^^^
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Context: Previous declaration of 'Foo.X'.
+//   set Foo.X => 0;
+//       ^^^^^
+//
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   set Foo.X {
+//   set Foo : bla = null => 0;
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set Foo.X {
-//   ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo.X' is already declared in this scope.
-//   set Foo.X {
-//       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:7: Context: Previous declaration of 'Foo.X'.
-//   set Foo.X => 0;
-//       ^^^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   set Foo : bla = null => 0;
-//       ^^^
-//
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:3: Error: Constructors can't be a setter.
-// Try removing 'set'.
 //   set Foo : bla = null => 0;
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Error: 'Foo' is already declared in this scope.
 //   set Foo : bla = null => 0;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:7: Context: Previous declaration of 'Foo'.
 //   get Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
 //   set Foo.X : bla = null {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
 //   set Foo.X : bla = null {
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Error: 'Foo.X' is already declared in this scope.
 //   set Foo.X : bla = null {
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:18: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:18: Error: An external constructor can't have any initializers.
 //   external Foo() : bla = null;
 //                  ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:35:12: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:12: Error: 'Foo' is already declared in this scope.
 //   external Foo() : bla = null;
 //            ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:7: Context: Previous declaration of 'Foo'.
 //   set Foo : bla = null => 0;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:33: Error: An external or native method can't have a body.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:33: Error: An external or native method can't have a body.
 //   external Foo.X() : bla = null {
 //                                 ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:20: Error: An external constructor can't have any initializers.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:20: Error: An external constructor can't have any initializers.
 //   external Foo.X() : bla = null {
 //                    ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:12: Error: 'Foo.X' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:12: Error: 'Foo.X' is already declared in this scope.
 //   external Foo.X() : bla = null {
 //            ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:7: Context: Previous declaration of 'Foo.X'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:7: Context: Previous declaration of 'Foo.X'.
 //   set Foo.X : bla = null {
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: 'Foo' is already declared in this scope.
 //   int Foo;
 //       ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:9:7: Context: Previous declaration of 'Foo'.
 //   get Foo {
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
 //   int A, Foo, B;
 //          ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: 'Foo' is already declared in this scope.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: 'Foo' is already declared in this scope.
 //   int A, Foo, B;
 //          ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Context: Previous declaration of 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Context: Previous declaration of 'Foo'.
 //   int Foo;
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo {
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:7: Error: Conflicts with the implicit setter of the field 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:7: Error: Conflicts with the implicit setter of the field 'Foo'.
 //   set Foo => 0;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:10: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:10: Error: Conflicts with setter 'Foo'.
 //   int A, Foo, B;
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:39:7: Error: Conflicts with setter 'Foo'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:36:7: Error: Conflicts with setter 'Foo'.
 //   int Foo;
 //       ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:5:13: Error: 'initializer' isn't an instance field of this class.
-//   foo.x() : initializer = true {
+//   foo.x() : initializer = true { }
 //             ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-//   foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+//   foo() : initializer = true { }
 //           ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:14:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
 //   get Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   get Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:17:15: Error: 'bla' isn't an instance field of this class.
 //   get Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:18:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:23:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:20:11: Error: A setter should have exactly one formal parameter.
 //   set Foo => 0;
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:25:12: Error: Can't return a value from a void function.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:22:12: Error: Can't return a value from a void function.
 //     return 0;
 //            ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:11: Error: A setter should have exactly one formal parameter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:21:11: Error: A setter should have exactly one formal parameter.
 //   set Foo {
 //           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:27:16: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:24:16: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo.X => 0;
 //                ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:26:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:13: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:13: Error: 'bla' isn't an instance field of this class.
 //   set Foo : bla = null => 0;
 //             ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:31:27: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:28:27: Error: Constructors can't have a return type.
 // Try removing the return type.
 //   set Foo : bla = null => 0;
 //                           ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:32:15: Error: 'bla' isn't an instance field of this class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:29:15: Error: 'bla' isn't an instance field of this class.
 //   set Foo.X : bla = null {
 //               ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:33:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:30:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:5: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:34:5: Error: Constructors can't have a return type.
 // Try removing the return type.
 //     return 0;
 //     ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:7: Error: Field 'A' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //       ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:40:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:37:15: Error: Field 'B' should be initialized because its type 'int' doesn't allow null.
 //   int A, Foo, B;
 //               ^
 //
@@ -351,20 +351,20 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:8:11: Error: 'initializer' isn't an instance field of this class.
-  foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:7:11: Error: 'initializer' isn't an instance field of this class.
+  foo() : initializer = true { }
           ^^^^^^^^^^^" {}
   constructor X() → self::Foo
     : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:15:16: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:12:16: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo.X => 0;
                ^";
   constructor •() → self::Foo
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:13: Error: 'bla' isn't an instance field of this class.
+    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:13: Error: 'bla' isn't an instance field of this class.
   get Foo : bla = null => 0;
             ^^^"
-    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:19:27: Error: Constructors can't have a return type.
+    invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_general.crash_dart:16:27: Error: Constructors can't have a return type.
 Try removing the return type.
   get Foo : bla = null => 0;
                           ^";

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart

@@ -1,11 +1,8 @@
 class Foo {
-  get foo.x() {
-    // Not OK.
-  }
-  get foo.x() : initializer = true {
-    // Not OK.
-  }
-  get foo() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  get foo.x() { }
+  // Not OK.
+  get foo.x() : initializer = true { }
+  // Not OK.
+  get foo() : initializer = true { }
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.expect

@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.strong.transformed.expect

@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.expect

@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.modular.expect

@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.outline.expect

@@ -2,43 +2,43 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 import self as self;

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart.weak.transformed.expect

@@ -2,51 +2,51 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() {
+//   get foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   get foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   get foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   get foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get foo() : initializer = true {
+//   get foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   get foo.x() : initializer = true {
+//   get foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   get foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   get foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -56,7 +56,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  get foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_get.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  get foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart

@@ -1,11 +1,8 @@
 class Foo {
-  void foo.x() {
-    // Not OK.
-  }
-  void foo.x() : initializer = true {
-    // Not OK.
-  }
-  void foo() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  void foo.x() { }
+  // Not OK.
+  void foo.x() : initializer = true { }
+  // Not OK.
+  void foo() : initializer = true {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.strong.transformed.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.modular.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.outline.expect

@@ -2,38 +2,38 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 import self as self;

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.weak.transformed.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo.x() { }
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() {
+//   void foo.x() { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:8: Error: 'Foo.x' is already declared in this scope.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //        ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:2:8: Context: Previous declaration of 'Foo.x'.
-//   void foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:3:8: Context: Previous declaration of 'Foo.x'.
+//   void foo.x() { }
 //        ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:8: Error: The name of a constructor must match the name of the enclosing class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:8: Error: The name of a constructor must match the name of the enclosing class.
+//   void foo() : initializer = true {}
 //        ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:3: Error: Constructors can't have a return type.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:3: Error: Constructors can't have a return type.
 // Try removing the return type.
-//   void foo() : initializer = true {
+//   void foo() : initializer = true {}
 //   ^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:5:18: Error: 'initializer' isn't an instance field of this class.
-//   void foo.x() : initializer = true {
+//   void foo.x() : initializer = true { }
 //                  ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-//   void foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+//   void foo() : initializer = true {}
 //                ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:8:16: Error: 'initializer' isn't an instance field of this class.
-  void foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_return_type.crash_dart:7:16: Error: 'initializer' isn't an instance field of this class.
+  void foo() : initializer = true {}
                ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart

@@ -1,11 +1,8 @@
 class Foo {
-  set foo.x() {
-    // Not OK.
-  }
-  set foo.x() : initializer = true {
-    // Not OK.
-  }
-  set foo() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  set foo.x() { }
+  // Not OK.
+  set foo.x() : initializer = true { }
+  // Not OK.
+  set foo() : initializer = true { }
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.strong.transformed.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.modular.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.outline.expect

@@ -2,38 +2,38 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 import self as self;

pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart.weak.transformed.expect

@@ -2,46 +2,46 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo.x() { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() {
+//   set foo.x() { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:7: Error: 'Foo.x' is already declared in this scope.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:2:7: Context: Previous declaration of 'Foo.x'.
-//   set foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:3:7: Context: Previous declaration of 'Foo.x'.
+//   set foo.x() { }
 //       ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:7: Error: The name of a constructor must match the name of the enclosing class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:7: Error: The name of a constructor must match the name of the enclosing class.
+//   set foo() : initializer = true { }
 //       ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:3: Error: Constructors can't be a setter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:3: Error: Constructors can't be a setter.
 // Try removing 'set'.
-//   set foo() : initializer = true {
+//   set foo() : initializer = true { }
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:5:17: Error: 'initializer' isn't an instance field of this class.
-//   set foo.x() : initializer = true {
+//   set foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-//   set foo() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+//   set foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
 import self as self;
@@ -51,7 +51,7 @@ class Foo extends core::Object {
   constructor x() → self::Foo
     : super core::Object::•() {}
   constructor foo() → self::Foo
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:8:15: Error: 'initializer' isn't an instance field of this class.
-  set foo() : initializer = true {
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_bad_name_set.crash_dart:7:15: Error: 'initializer' isn't an instance field of this class.
+  set foo() : initializer = true { }
               ^^^^^^^^^^^" {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart

@@ -1,14 +1,10 @@
 class Foo {
-  get Foo() {
-    // Not OK.
-  }
-  get Foo() : initializer = true {
-    // Not OK.
-  }
-  get Foo.x() {
-    // Not OK.
-  }
-  get Foo.x() : initializer = true {
-    // Not OK.
-  }
+  // Not OK.
+  get Foo() { }
+  // Not OK.
+  get Foo() : initializer = true { }
+  // Not OK.
+  get Foo.x() { }
+  // Not OK.
+  get Foo.x() : initializer = true { }
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.expect

@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}

pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.strong.transformed.expect

@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}

pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.expect

@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}

pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.modular.expect

@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}

pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.outline.expect

@@ -2,41 +2,41 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 import self as self;

pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart.weak.transformed.expect

@@ -2,49 +2,49 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:10: Error: A getter can't have formal parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() {
+//   get Foo() { }
 //          ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:2:7: Error: A class member can't have the same name as the enclosing class.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:3:7: Error: A class member can't have the same name as the enclosing class.
 // Try renaming the member.
-//   get Foo() {
+//   get Foo() { }
 //       ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:10: Error: A getter can't have formal parameters.
 // Try removing '(...)'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //          ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() {
+//   get Foo.x() { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:3: Error: Constructors can't be a getter.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:3: Error: Constructors can't be a getter.
 // Try removing 'get'.
-//   get Foo.x() : initializer = true {
+//   get Foo.x() : initializer = true { }
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:7: Error: 'Foo.x' is already declared in this scope.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:7: Error: 'Foo.x' is already declared in this scope.
+//   get Foo.x() : initializer = true { }
 //       ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:8:7: Context: Previous declaration of 'Foo.x'.
-//   get Foo.x() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:7:7: Context: Previous declaration of 'Foo.x'.
+//   get Foo.x() { }
 //       ^^^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-//   get Foo() : initializer = true {
+//   get Foo() : initializer = true { }
 //               ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:11:17: Error: 'initializer' isn't an instance field of this class.
-//   get Foo.x() : initializer = true {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:9:17: Error: 'initializer' isn't an instance field of this class.
+//   get Foo.x() : initializer = true { }
 //                 ^^^^^^^^^^^
 //
 import self as self;
@@ -53,7 +53,7 @@ import "dart:core" as core;
 class Foo extends core::Object {
   constructor •() → self::Foo
     : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/error_recovery/constructor_recovery_get.dart:5:15: Error: 'initializer' isn't an instance field of this class.
-  get Foo() : initializer = true {
+  get Foo() : initializer = true { }
               ^^^^^^^^^^^" {}
   constructor x() → self::Foo
     : super core::Object::•() {}

pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart

@@ -1,14 +1,10 @@
 class Foo {
-  Foo() / : super() {
-    // Not OK.
-  }
-  Foo()./ : super() {
-    // Not OK.
-  }
-  foo() / : super() {
-    // Not OK.
-  }
-  foo()./ : super() {
-    // Not OK.
-  }
+  // Not OK.
+  Foo() / : super() {}
+  // Not OK.
+  Foo()./ : super() {}
+  // Not OK.
+  foo() / : super() {}
+  // Not OK.
+  foo()./ : super() {}
 }

pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.expect

@@ -2,135 +2,135 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Expected '{' before this.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Expected '{' before this.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: The name of a constructor must match the name of the enclosing class.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator '/' should have exactly one parameter.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator '/' should have exactly one parameter.
+//   Foo() / : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected '{' before this.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:3: Error: 'Foo' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:3: Context: Previous declaration of 'Foo'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:3: Context: Previous declaration of 'Foo'.
+//   Foo() / : super() {}
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected a class member, but got '.'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator '/' should have exactly one parameter.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: 'Foo./' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Context: Previous declaration of 'Foo./'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Context: Previous declaration of 'Foo./'.
+//   Foo() / : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Expected '{' before this.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Expected '{' before this.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator '/' should have exactly one parameter.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator '/' should have exactly one parameter.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: 'Foo./' is already declared in this scope.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: 'Foo./' is already declared in this scope.
+//   foo() / : super() {}
 //         ^^^^^
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Context: Previous declaration of 'Foo./'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected '{' before this.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected '{' before this.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:3: Error: 'foo' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:3: Error: 'foo' is already declared in this scope.
+//   foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:3: Context: Previous declaration of 'foo'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:3: Context: Previous declaration of 'foo'.
+//   foo() / : super() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected a class member, but got '.'.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected a class member, but got '.'.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator '/' should have exactly one parameter.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator '/' should have exactly one parameter.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: 'Foo./' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: 'Foo./' is already declared in this scope.
+//   foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Context: Previous declaration of 'Foo./'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Context: Previous declaration of 'Foo./'.
+//   foo() / : super() {}
 //         ^^^^^
 //
 import self as self;

pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.strong.transformed.expect

@@ -2,135 +2,135 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Expected '{' before this.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Expected '{' before this.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: The name of a constructor must match the name of the enclosing class.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator '/' should have exactly one parameter.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator '/' should have exactly one parameter.
+//   Foo() / : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected '{' before this.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:3: Error: 'Foo' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:3: Context: Previous declaration of 'Foo'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:3: Context: Previous declaration of 'Foo'.
+//   Foo() / : super() {}
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected a class member, but got '.'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator '/' should have exactly one parameter.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: 'Foo./' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Context: Previous declaration of 'Foo./'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Context: Previous declaration of 'Foo./'.
+//   Foo() / : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Expected '{' before this.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Expected '{' before this.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator '/' should have exactly one parameter.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator '/' should have exactly one parameter.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: 'Foo./' is already declared in this scope.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: 'Foo./' is already declared in this scope.
+//   foo() / : super() {}
 //         ^^^^^
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Context: Previous declaration of 'Foo./'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected '{' before this.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected '{' before this.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:3: Error: 'foo' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:3: Error: 'foo' is already declared in this scope.
+//   foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:3: Context: Previous declaration of 'foo'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:3: Context: Previous declaration of 'foo'.
+//   foo() / : super() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected a class member, but got '.'.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected a class member, but got '.'.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator '/' should have exactly one parameter.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator '/' should have exactly one parameter.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: 'Foo./' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: 'Foo./' is already declared in this scope.
+//   foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Context: Previous declaration of 'Foo./'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Context: Previous declaration of 'Foo./'.
+//   foo() / : super() {}
 //         ^^^^^
 //
 import self as self;

pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart.weak.expect

@@ -2,135 +2,135 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Expected '{' before this.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Expected '{' before this.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo() / : super() {
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: The name of a constructor must match the name of the enclosing class.
+//   Foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Error: Operator '/' should have exactly one parameter.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Error: Operator '/' should have exactly one parameter.
+//   Foo() / : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected '{' before this.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:3: Error: 'Foo' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:3: Context: Previous declaration of 'Foo'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:3: Context: Previous declaration of 'Foo'.
+//   Foo() / : super() {}
 //   ^^^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:8: Error: Expected a class member, but got '.'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //        ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: The name of a constructor must match the name of the enclosing class.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: Operator '/' should have exactly one parameter.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^
 //
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Error: 'Foo./' is already declared in this scope.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:2:9: Context: Previous declaration of 'Foo./'.
-//   Foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:3:9: Context: Previous declaration of 'Foo./'.
+//   Foo() / : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Expected '{' before this.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Expected '{' before this.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo() / : super() {
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: Operator '/' should have exactly one parameter.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: Operator '/' should have exactly one parameter.
+//   foo() / : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Error: 'Foo./' is already declared in this scope.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Error: 'Foo./' is already declared in this scope.
+//   foo() / : super() {}
 //         ^^^^^
 // pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:5:9: Context: Previous declaration of 'Foo./'.
-//   Foo()./ : super() {
+//   Foo()./ : super() {}
 //         ^^^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected '{' before this.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected '{' before this.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:3: Error: 'foo' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:3: Error: 'foo' is already declared in this scope.
+//   foo()./ : super() {}
 //   ^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:3: Context: Previous declaration of 'foo'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:3: Context: Previous declaration of 'foo'.
+//   foo() / : super() {}
 //   ^^^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:8: Error: Expected a class member, but got '.'.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:8: Error: Expected a class member, but got '.'.
+//   foo()./ : super() {}
 //        ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator declarations must be preceded by the keyword 'operator'.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator declarations must be preceded by the keyword 'operator'.
 // Try adding the keyword 'operator'.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: A method declaration needs an explicit list of parameters.
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: A method declaration needs an explicit list of parameters.
 // Try adding a parameter list to the method declaration.
-//   foo()./ : super() {
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: The name of a constructor must match the name of the enclosing class.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: The name of a constructor must match the name of the enclosing class.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: Operator '/' should have exactly one parameter.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: Operator '/' should have exactly one parameter.
+//   foo()./ : super() {}
 //         ^
 //
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:11:9: Error: 'Foo./' is already declared in this scope.
-//   foo()./ : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:9:9: Error: 'Foo./' is already declared in this scope.
+//   foo()./ : super() {}
 //         ^^^^^
-// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:8:9: Context: Previous declaration of 'Foo./'.
-//   foo() / : super() {
+// pkg/front_end/testcases/general/error_recovery/constructor_recovery_operator.crash_dart:7:9: Context: Previous declaration of 'Foo./'.
+//   foo() / : super() {}
 //         ^^^^^
 //
 import self as self;