[parser] Add beginConstructor

This adds a beginConstructor listener method and calls this before constructor instead of beginMethod. This makes it possible for listeners to fully separate handling of constructors from methods.

Change-Id: Ibcbcf76ccb6d97314d395c4c0efcb4f9d073519a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/462140
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>

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

@@ -135,6 +135,31 @@ class ForwardingListener implements Listener {
     listener?.beginConstLiteral(token);
   }
 
+  @override
+  void beginConstructor(
+    DeclarationKind declarationKind,
+    Token? augmentToken,
+    Token? externalToken,
+    Token? staticToken,
+    Token? covariantToken,
+    Token? varFinalOrConst,
+    Token? getOrSet,
+    Token name,
+    String? enclosingDeclarationName,
+  ) {
+    listener?.beginConstructor(
+      declarationKind,
+      augmentToken,
+      externalToken,
+      staticToken,
+      covariantToken,
+      varFinalOrConst,
+      getOrSet,
+      name,
+      enclosingDeclarationName,
+    );
+  }
+
   @override
   void beginConstructorReference(Token start) {
     listener?.beginConstructorReference(start);

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

@@ -1160,7 +1160,6 @@ abstract class Listener implements UnescapeErrorListener {
 
   /// Handle the beginning of a class-like method declaration.  Substructures:
   /// - metadata
-  /// Note that this is ended with [endConstructor] or [endMethod].
   void beginMethod(
     DeclarationKind declarationKind,
     Token? augmentToken,
@@ -1194,6 +1193,20 @@ abstract class Listener implements UnescapeErrorListener {
     logEvent("Method");
   }
 
+  /// Handle the beginning of a constructor declaration.  Substructures:
+  /// - metadata
+  void beginConstructor(
+    DeclarationKind declarationKind,
+    Token? augmentToken,
+    Token? externalToken,
+    Token? staticToken,
+    Token? covariantToken,
+    Token? varFinalOrConst,
+    Token? getOrSet,
+    Token name,
+    String? enclosingDeclarationName,
+  ) {}
+
   /// Handle the end of a constructor declaration.  Substructures:
   /// - metadata
   /// - return type

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

@@ -5622,19 +5622,33 @@ class Parser {
       }
     }
 
-    // TODO(danrubel): Consider parsing the name before calling beginMethod
-    // rather than passing the name token into beginMethod.
-    listener.beginMethod(
-      kind,
-      augmentToken,
-      externalToken,
-      staticToken,
-      covariantToken,
-      varFinalOrConst,
-      getOrSet,
-      name,
-      enclosingDeclarationName,
-    );
+    if (isConstructor) {
+      listener.beginConstructor(
+        kind,
+        augmentToken,
+        externalToken,
+        staticToken,
+        covariantToken,
+        varFinalOrConst,
+        getOrSet,
+        name,
+        enclosingDeclarationName,
+      );
+    } else {
+      // TODO(danrubel): Consider parsing the name before calling beginMethod
+      // rather than passing the name token into beginMethod.
+      listener.beginMethod(
+        kind,
+        augmentToken,
+        externalToken,
+        staticToken,
+        covariantToken,
+        varFinalOrConst,
+        getOrSet,
+        name,
+        enclosingDeclarationName,
+      );
+    }
 
     Token token = typeInfo.parseType(beforeType, this);
     assert(

pkg/analyzer/lib/src/fasta/ast_builder.dart

@@ -340,6 +340,31 @@ class AstBuilder extends StackListener {
   @override
   void beginConstantPattern(Token? constKeyword) {}
 
+  @override
+  void beginConstructor(
+    DeclarationKind declarationKind,
+    Token? augmentToken,
+    Token? externalToken,
+    Token? staticToken,
+    Token? covariantToken,
+    Token? varFinalOrConst,
+    Token? getOrSet,
+    Token name,
+    String? enclosingDeclarationName,
+  ) {
+    _beginMethod(
+      declarationKind,
+      augmentToken,
+      externalToken,
+      staticToken,
+      covariantToken,
+      varFinalOrConst,
+      getOrSet,
+      name,
+      enclosingDeclarationName,
+    );
+  }
+
   @override
   void beginEnumDeclaration(
     Token beginToken,
@@ -471,33 +496,17 @@ class AstBuilder extends StackListener {
     Token name,
     String? enclosingDeclarationName,
   ) {
-    _Modifiers modifiers = _Modifiers();
-    if (augmentToken != null) {
-      assert(augmentToken.isModifier);
-      modifiers.augmentKeyword = augmentToken;
-    }
-    if (externalToken != null) {
-      assert(externalToken.isModifier);
-      modifiers.externalKeyword = externalToken;
-    }
-    if (staticToken != null) {
-      assert(staticToken.isModifier);
-      var builder = _classLikeBuilder;
-      if (builder is! _ClassDeclarationBuilder ||
-          builder.name.lexeme != name.lexeme ||
-          getOrSet != null) {
-        modifiers.staticKeyword = staticToken;
-      }
-    }
-    if (covariantToken != null) {
-      assert(covariantToken.isModifier);
-      modifiers.covariantKeyword = covariantToken;
-    }
-    if (varFinalOrConst != null) {
-      assert(varFinalOrConst.isModifier);
-      modifiers.finalConstOrVarKeyword = varFinalOrConst;
-    }
-    push(modifiers);
+    _beginMethod(
+      declarationKind,
+      augmentToken,
+      externalToken,
+      staticToken,
+      covariantToken,
+      varFinalOrConst,
+      getOrSet,
+      name,
+      enclosingDeclarationName,
+    );
   }
 
   @override
@@ -5888,6 +5897,46 @@ class AstBuilder extends StackListener {
     }
   }
 
+  void _beginMethod(
+    DeclarationKind declarationKind,
+    Token? augmentToken,
+    Token? externalToken,
+    Token? staticToken,
+    Token? covariantToken,
+    Token? varFinalOrConst,
+    Token? getOrSet,
+    Token name,
+    String? enclosingDeclarationName,
+  ) {
+    _Modifiers modifiers = _Modifiers();
+    if (augmentToken != null) {
+      assert(augmentToken.isModifier);
+      modifiers.augmentKeyword = augmentToken;
+    }
+    if (externalToken != null) {
+      assert(externalToken.isModifier);
+      modifiers.externalKeyword = externalToken;
+    }
+    if (staticToken != null) {
+      assert(staticToken.isModifier);
+      var builder = _classLikeBuilder;
+      if (builder is! _ClassDeclarationBuilder ||
+          builder.name.lexeme != name.lexeme ||
+          getOrSet != null) {
+        modifiers.staticKeyword = staticToken;
+      }
+    }
+    if (covariantToken != null) {
+      assert(covariantToken.isModifier);
+      modifiers.covariantKeyword = covariantToken;
+    }
+    if (varFinalOrConst != null) {
+      assert(varFinalOrConst.isModifier);
+      modifiers.finalConstOrVarKeyword = varFinalOrConst;
+    }
+    push(modifiers);
+  }
+
   ConstructorDeclarationImpl _buildConstructorDeclaration({
     required Token beginToken,
     required Token endToken,

pkg/analyzer/test/generated/parser_fasta_listener.dart

@@ -163,6 +163,32 @@ class ForwardingTestListener extends ForwardingListener {
     begin('ConstLiteral');
   }
 
+  @override
+  void beginConstructor(
+    DeclarationKind declarationKind,
+    Token? augmentToken,
+    Token? externalToken,
+    Token? staticToken,
+    Token? covariantToken,
+    Token? varFinalOrConst,
+    Token? getOrSet,
+    Token name,
+    String? enclosingDeclarationName,
+  ) {
+    super.beginConstructor(
+      declarationKind,
+      augmentToken,
+      externalToken,
+      staticToken,
+      covariantToken,
+      varFinalOrConst,
+      getOrSet,
+      name,
+      enclosingDeclarationName,
+    );
+    begin('Method');
+  }
+
   @override
   void beginConstructorReference(Token start) {
     super.beginConstructorReference(start);

pkg/front_end/lib/src/source/outline_builder.dart

@@ -2180,6 +2180,31 @@ class OutlineBuilder extends StackListenerImpl {
     push(MethodBody.Regular);
   }
 
+  @override
+  void beginConstructor(
+    DeclarationKind declarationKind,
+    Token? augmentToken,
+    Token? externalToken,
+    Token? staticToken,
+    Token? covariantToken,
+    Token? varFinalOrConst,
+    Token? getOrSet,
+    Token name,
+    String? enclosingDeclarationName,
+  ) {
+    _beginMethod(
+      declarationKind,
+      augmentToken,
+      externalToken,
+      staticToken,
+      covariantToken,
+      varFinalOrConst,
+      getOrSet,
+      name,
+      enclosingDeclarationName,
+    );
+  }
+
   @override
   void beginMethod(
     DeclarationKind declarationKind,
@@ -2191,6 +2216,30 @@ class OutlineBuilder extends StackListenerImpl {
     Token? getOrSet,
     Token name,
     String? enclosingDeclarationName,
+  ) {
+    _beginMethod(
+      declarationKind,
+      augmentToken,
+      externalToken,
+      staticToken,
+      covariantToken,
+      varFinalOrConst,
+      getOrSet,
+      name,
+      enclosingDeclarationName,
+    );
+  }
+
+  void _beginMethod(
+    DeclarationKind declarationKind,
+    Token? augmentToken,
+    Token? externalToken,
+    Token? staticToken,
+    Token? covariantToken,
+    Token? varFinalOrConst,
+    Token? getOrSet,
+    Token name,
+    String? enclosingDeclarationName,
   ) {
     inConstructor = name.lexeme == enclosingDeclarationName && getOrSet == null;
     DeclarationContext declarationContext;

pkg/front_end/lib/src/util/parser_ast.dart

@@ -1776,8 +1776,6 @@ class ParserASTListener extends AbstractParserAstListener {
           // beginExtensionDeclarationPrelude,
           // beginClassOrNamedMixinApplicationPrelude
           // beginTopLevelMember or beginUncategorizedTopLevelDeclaration.
-        } else if (begin == "Method" && end == "Constructor") {
-          // beginMethod is ended by one of endMethod or endConstructor.
         } else if (begin == "Fields" && end == "TopLevelFields") {
           // beginFields is ended by one of endTopLevelFields or endFields.
         } else if (begin == "ForStatement" && end == "ForIn") {

pkg/front_end/lib/src/util/parser_ast_helper.dart

@@ -1924,6 +1924,33 @@ abstract class AbstractParserAstListener implements Listener {
     seen(data);
   }
 
+  @override
+  void beginConstructor(
+    DeclarationKind declarationKind,
+    Token? augmentToken,
+    Token? externalToken,
+    Token? staticToken,
+    Token? covariantToken,
+    Token? varFinalOrConst,
+    Token? getOrSet,
+    Token name,
+    String? enclosingDeclarationName,
+  ) {
+    ConstructorBegin data = new ConstructorBegin(
+      ParserAstType.BEGIN,
+      declarationKind: declarationKind,
+      augmentToken: augmentToken,
+      externalToken: externalToken,
+      staticToken: staticToken,
+      covariantToken: covariantToken,
+      varFinalOrConst: varFinalOrConst,
+      getOrSet: getOrSet,
+      name: name,
+      enclosingDeclarationName: enclosingDeclarationName,
+    );
+    seen(data);
+  }
+
   @override
   void endConstructor(
     DeclarationKind kind,
@@ -7077,6 +7104,47 @@ class MethodEnd extends ParserAstNode implements BeginAndEndTokenParserAstNode {
   R accept<R>(ParserAstVisitor<R> v) => v.visitMethodEnd(this);
 }
 
+class ConstructorBegin extends ParserAstNode {
+  final DeclarationKind declarationKind;
+  final Token? augmentToken;
+  final Token? externalToken;
+  final Token? staticToken;
+  final Token? covariantToken;
+  final Token? varFinalOrConst;
+  final Token? getOrSet;
+  final Token name;
+  final String? enclosingDeclarationName;
+
+  ConstructorBegin(
+    ParserAstType type, {
+    required this.declarationKind,
+    this.augmentToken,
+    this.externalToken,
+    this.staticToken,
+    this.covariantToken,
+    this.varFinalOrConst,
+    this.getOrSet,
+    required this.name,
+    this.enclosingDeclarationName,
+  }) : super("Constructor", type);
+
+  @override
+  Map<String, Object?> get deprecatedArguments => {
+    "declarationKind": declarationKind,
+    "augmentToken": augmentToken,
+    "externalToken": externalToken,
+    "staticToken": staticToken,
+    "covariantToken": covariantToken,
+    "varFinalOrConst": varFinalOrConst,
+    "getOrSet": getOrSet,
+    "name": name,
+    "enclosingDeclarationName": enclosingDeclarationName,
+  };
+
+  @override
+  R accept<R>(ParserAstVisitor<R> v) => v.visitConstructorBegin(this);
+}
+
 class ConstructorEnd extends ParserAstNode
     implements BeginAndEndTokenParserAstNode {
   final DeclarationKind kind;
@@ -10716,6 +10784,7 @@ abstract class ParserAstVisitor<R> {
   R visitMemberEnd(MemberEnd node);
   R visitMethodBegin(MethodBegin node);
   R visitMethodEnd(MethodEnd node);
+  R visitConstructorBegin(ConstructorBegin node);
   R visitConstructorEnd(ConstructorEnd node);
   R visitMetadataStarBegin(MetadataStarBegin node);
   R visitMetadataStarEnd(MetadataStarEnd node);
@@ -11580,6 +11649,9 @@ class RecursiveParserAstVisitor implements ParserAstVisitor<void> {
   @override
   void visitMethodEnd(MethodEnd node) => node.visitChildren(this);
 
+  @override
+  void visitConstructorBegin(ConstructorBegin node) => node.visitChildren(this);
+
   @override
   void visitConstructorEnd(ConstructorEnd node) => node.visitChildren(this);
 
@@ -13015,6 +13087,10 @@ class RecursiveParserAstVisitorWithDefaultNodeAsync
   @override
   Future<void> visitMethodEnd(MethodEnd node) => defaultNode(node);
 
+  @override
+  Future<void> visitConstructorBegin(ConstructorBegin node) =>
+      defaultNode(node);
+
   @override
   Future<void> visitConstructorEnd(ConstructorEnd node) => defaultNode(node);
 

pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.expect

@@ -79,7 +79,7 @@ beginCompilationUnit(class)
         beginMetadataStar(this)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, this, C2)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, this, C2)
             handleNoType({)
             handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this)
             handleIdentifier(this, methodDeclaration)
@@ -167,7 +167,7 @@ beginCompilationUnit(class)
         beginMetadataStar(this)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, this, C4)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, this, C4)
             handleNoType({)
             handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this)
             handleIdentifier(this, methodDeclaration)

pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.intertwined.expect

@@ -106,7 +106,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, this, DeclarationKind.Class, C2, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, this, C2)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, this, C2)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword))
@@ -275,7 +275,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, this, DeclarationKind.Class, C4, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, this, C4)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, this, C4)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword))

pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.expect

@@ -173,7 +173,7 @@ beginCompilationUnit(m)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -835,7 +835,7 @@ beginCompilationUnit(m)
         beginMetadataStar(ET)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ET, ET)
+          beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ET, ET)
             handleNoType({)
             handleIdentifier(ET, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.intertwined.expect

@@ -77,7 +77,7 @@ parseUnit(m)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -1130,7 +1130,7 @@ parseUnit(m)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, ET, DeclarationKind.ExtensionType, ET, false)
-                listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ET, ET)
+                listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ET, ET)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(ET, methodDeclaration)

pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.expect

@@ -98,7 +98,7 @@ beginCompilationUnit(extension)
         beginMetadataStar(this)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E2)
+          beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E2)
             handleNoType({)
             handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this)
             handleIdentifier(this, methodDeclaration)
@@ -200,7 +200,7 @@ beginCompilationUnit(extension)
         beginMetadataStar(this)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E4)
+          beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E4)
             handleNoType({)
             handleRecoverableError(Message[Template(ExpectedIdentifierButGotKeyword), 'this' can't be used as an identifier because it's a keyword., Try renaming this to be an identifier that isn't a keyword., {lexeme: this}], this, this)
             handleIdentifier(this, methodDeclaration)

pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect

@@ -122,7 +122,7 @@ parseUnit(extension)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, this, DeclarationKind.ExtensionType, E2, false)
-                listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E2)
+                listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E2)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword))
@@ -307,7 +307,7 @@ parseUnit(extension)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, this, DeclarationKind.ExtensionType, E4, false)
-                listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E4)
+                listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, this, E4)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   reportRecoverableErrorWithToken(this, Template(ExpectedIdentifierButGotKeyword))

pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.expect

@@ -32,7 +32,7 @@ beginCompilationUnit(class)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Color, Color)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Color, Color)
             handleNoType(const)
             handleIdentifier(Color, methodDeclaration)
             handleIdentifier(red, methodDeclarationContinuation)

pkg/front_end/parser_testcases/dot_shorthands/const_no_identifier_recovery.dart.intertwined.expect

@@ -53,7 +53,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, Color, DeclarationKind.Class, Color, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Color, Color)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Color, Color)
                 listener: handleNoType(const)
                 ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
                   listener: handleIdentifier(Color, methodDeclaration)

pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.expect

@@ -32,7 +32,7 @@ beginCompilationUnit(class)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Color, Color)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Color, Color)
             handleNoType(const)
             handleIdentifier(Color, methodDeclaration)
             handleIdentifier(red, methodDeclarationContinuation)

pkg/front_end/parser_testcases/dot_shorthands/const_property_recovery.dart.intertwined.expect

@@ -53,7 +53,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, Color, DeclarationKind.Class, Color, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Color, Color)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Color, Color)
                 listener: handleNoType(const)
                 ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
                   listener: handleIdentifier(Color, methodDeclaration)

pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.expect

@@ -83,7 +83,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -97,7 +97,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(named, methodDeclarationContinuation)

pkg/front_end/parser_testcases/enhanced_enums/entries_with_type_arguments.dart.intertwined.expect

@@ -127,7 +127,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -156,7 +156,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.expect

@@ -25,7 +25,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -126,7 +126,7 @@ beginCompilationUnit(class)
         beginMetadataStar(D)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
             handleNoType({)
             handleIdentifier(D, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/bracket_mismatch_01.dart.intertwined.expect

@@ -35,7 +35,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -308,7 +308,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, D, DeclarationKind.Class, D, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(D, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.expect

@@ -137,7 +137,7 @@ beginCompilationUnit(class)
         beginMetadataStar(foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
             handleNoType({)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -155,7 +155,7 @@ beginCompilationUnit(class)
         beginMetadataStar(foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -182,7 +182,7 @@ beginCompilationUnit(class)
         beginMetadataStar(foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -240,7 +240,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -259,7 +259,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -281,7 +281,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(:)
@@ -307,7 +307,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -375,7 +375,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -394,7 +394,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -416,7 +416,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(:)
@@ -442,7 +442,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -473,7 +473,7 @@ beginCompilationUnit(class)
         beginMetadataStar(external)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
             handleNoType(external)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -497,7 +497,7 @@ beginCompilationUnit(class)
         beginMetadataStar(external)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
             handleNoType(external)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_general.crash_dart.intertwined.expect

@@ -35,7 +35,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -73,7 +73,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -138,7 +138,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -283,7 +283,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -332,7 +332,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -388,7 +388,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -460,7 +460,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -640,7 +640,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -689,7 +689,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -745,7 +745,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -817,7 +817,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -901,7 +901,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, external, null, null, null, null, external, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
                 listener: handleNoType(external)
                 ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -960,7 +960,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, external, null, null, null, null, external, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, external, null, null, null, null, Foo, Foo)
                 listener: handleNoType(external)
                 ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.expect

@@ -45,7 +45,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
             handleNoType({)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -64,7 +64,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -92,7 +92,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_get.crash_dart.intertwined.expect

@@ -34,7 +34,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), get, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -73,7 +73,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -139,7 +139,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.expect

@@ -41,7 +41,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
             handleVoidKeyword(void)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -60,7 +60,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
             handleVoidKeyword(void)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -88,7 +88,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
             handleVoidKeyword(void)
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_return_type.crash_dart.intertwined.expect

@@ -34,7 +34,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, null, {, VoidType(), null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -73,7 +73,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -139,7 +139,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, foo, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.expect

@@ -41,7 +41,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
             handleNoType({)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -60,7 +60,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -88,7 +88,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_bad_name_set.crash_dart.intertwined.expect

@@ -34,7 +34,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), set, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -73,7 +73,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -139,7 +139,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.expect

@@ -58,7 +58,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -84,7 +84,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -102,7 +102,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_get.dart.intertwined.expect

@@ -69,7 +69,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -131,7 +131,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -168,7 +168,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.expect

@@ -15,7 +15,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType({)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -30,7 +30,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -54,7 +54,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -71,7 +71,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_ok.dart.intertwined.expect

@@ -35,7 +35,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -67,7 +67,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -126,7 +126,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -162,7 +162,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.expect

@@ -89,7 +89,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType({)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -105,7 +105,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, /, /)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
             handleNoType(})
             handleOperatorName(operator, /)
             handleNoTypeVariables(:)
@@ -130,7 +130,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -152,7 +152,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, /, /)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
             handleNoType(.)
             handleOperatorName(operator, /)
             handleNoTypeVariables(:)
@@ -193,7 +193,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, /, /)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
             handleNoType(})
             handleOperatorName(operator, /)
             handleNoTypeVariables(:)
@@ -240,7 +240,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, /, /)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
             handleNoType(.)
             handleOperatorName(operator, /)
             handleNoTypeVariables(:)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_operator.crash_dart.intertwined.expect

@@ -35,7 +35,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -75,7 +75,7 @@ parseUnit(class)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
                   parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Class, Foo, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
+                    listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
                     listener: handleNoType(})
                     parseOperatorName(})
                       listener: handleOperatorName(operator, /)
@@ -132,7 +132,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -183,7 +183,7 @@ parseUnit(class)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
                   parseMethod(., null, null, null, null, null, null, null, ., NoType(), null, operator, DeclarationKind.Class, Foo, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
+                    listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
                     listener: handleNoType(.)
                     parseOperatorName(.)
                       listener: handleOperatorName(operator, /)
@@ -280,7 +280,7 @@ parseUnit(class)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
                   parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Class, Foo, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
+                    listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
                     listener: handleNoType(})
                     parseOperatorName(})
                       listener: handleOperatorName(operator, /)
@@ -388,7 +388,7 @@ parseUnit(class)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
                   parseMethod(., null, null, null, null, null, null, null, ., NoType(), null, operator, DeclarationKind.Class, Foo, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
+                    listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, Foo)
                     listener: handleNoType(.)
                     parseOperatorName(.)
                       listener: handleOperatorName(operator, /)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.expect

@@ -33,7 +33,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleVoidKeyword(void)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -49,7 +49,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleVoidKeyword(void)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -74,7 +74,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleVoidKeyword(void)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -92,7 +92,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleVoidKeyword(void)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_return_type.dart.intertwined.expect

@@ -34,7 +34,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, null, {, VoidType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -67,7 +67,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -127,7 +127,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -164,7 +164,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.expect

@@ -49,7 +49,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -74,7 +74,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -92,7 +92,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/constructor_recovery_set.dart.intertwined.expect

@@ -67,7 +67,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -127,7 +127,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -164,7 +164,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, Foo, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.expect

@@ -75,7 +75,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType({)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -118,7 +118,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Bar)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Bar, Bar)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Bar, Bar)
             handleNoType({)
             handleIdentifier(Bar, methodDeclaration)
             handleNoTypeVariables(()
@@ -161,7 +161,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Baz)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Baz, Baz)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Baz, Baz)
             handleNoType({)
             handleIdentifier(Baz, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/issue_22313.dart.intertwined.expect

@@ -101,7 +101,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -187,7 +187,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Bar, DeclarationKind.Class, Bar, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Bar, Bar)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Bar, Bar)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Bar, methodDeclaration)
@@ -273,7 +273,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, Baz, DeclarationKind.Class, Baz, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Baz, Baz)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Baz, Baz)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Baz, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.expect

@@ -47,7 +47,7 @@ beginCompilationUnit(const)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Annotation, Annotation)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Annotation, Annotation)
             handleNoType(const)
             handleIdentifier(Annotation, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/issue_22314.dart.intertwined.expect

@@ -77,7 +77,7 @@ parseUnit(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, Annotation, DeclarationKind.Class, Annotation, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Annotation, Annotation)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, Annotation, Annotation)
                 listener: handleNoType(const)
                 ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
                   listener: handleIdentifier(Annotation, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.expect

@@ -979,7 +979,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()
@@ -1070,7 +1070,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/issue_26810.dart.intertwined.expect

@@ -2102,7 +2102,7 @@ parseUnit(abstract)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)
@@ -2350,7 +2350,7 @@ parseUnit(abstract)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.expect

@@ -979,7 +979,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()
@@ -1070,7 +1070,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/issue_26810_and.dart.intertwined.expect

@@ -2106,7 +2106,7 @@ parseUnit(abstract)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)
@@ -2354,7 +2354,7 @@ parseUnit(abstract)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.expect

@@ -979,7 +979,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()
@@ -1070,7 +1070,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/issue_26810_or.dart.intertwined.expect

@@ -2106,7 +2106,7 @@ parseUnit(abstract)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)
@@ -2354,7 +2354,7 @@ parseUnit(abstract)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Key, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.expect

@@ -33,7 +33,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -49,7 +49,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, /, /)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
             handleNoType(})
             handleOperatorName(operator, /)
             handleNoTypeVariables(:)

pkg/front_end/parser_testcases/error_recovery/issue_39230.crash_dart.intertwined.expect

@@ -35,7 +35,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -75,7 +75,7 @@ parseUnit(class)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
                   parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, operator, DeclarationKind.Class, C, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
+                    listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, C)
                     listener: handleNoType(})
                     parseOperatorName(})
                       listener: handleOperatorName(operator, /)

pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.expect

@@ -49,7 +49,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -63,7 +63,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_1.dart.intertwined.expect

@@ -66,7 +66,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -95,7 +95,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.expect

@@ -64,7 +64,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -78,7 +78,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma.dart.intertwined.expect

@@ -87,7 +87,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -116,7 +116,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.expect

@@ -52,7 +52,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -66,7 +66,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_1_comma_ok.dart.intertwined.expect

@@ -80,7 +80,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -109,7 +109,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.expect

@@ -37,7 +37,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -51,7 +51,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_1_ok.dart.intertwined.expect

@@ -59,7 +59,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -88,7 +88,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.expect

@@ -44,7 +44,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -58,7 +58,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_2.dart.intertwined.expect

@@ -61,7 +61,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -90,7 +90,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.expect

@@ -59,7 +59,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -73,7 +73,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma.dart.intertwined.expect

@@ -82,7 +82,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -111,7 +111,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.expect

@@ -52,7 +52,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -66,7 +66,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_2_comma_ok.dart.intertwined.expect

@@ -79,7 +79,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -108,7 +108,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.expect

@@ -37,7 +37,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -51,7 +51,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_2_ok.dart.intertwined.expect

@@ -58,7 +58,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -87,7 +87,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.expect

@@ -37,7 +37,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -51,7 +51,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_3.dart.intertwined.expect

@@ -54,7 +54,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -83,7 +83,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.expect

@@ -48,7 +48,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -62,7 +62,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma.dart.intertwined.expect

@@ -71,7 +71,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -100,7 +100,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.expect

@@ -36,7 +36,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -50,7 +50,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_3_comma_ok.dart.intertwined.expect

@@ -64,7 +64,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -93,7 +93,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.expect

@@ -25,7 +25,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()
@@ -39,7 +39,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+          beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             handleNoType(const)
             handleIdentifier(E, methodDeclaration)
             handleIdentifier(foo, methodDeclarationContinuation)

pkg/front_end/parser_testcases/error_recovery/issue_48380_3_ok.dart.intertwined.expect

@@ -47,7 +47,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -76,7 +76,7 @@ parseUnit(enum)
             listener: endMetadataStar(0)
           listener: beginMember()
           parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
+            listener: beginConstructor(DeclarationKind.Enum, null, null, null, null, const, null, E, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.expect

@@ -41,7 +41,7 @@ beginCompilationUnit(class)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType({)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()
@@ -64,7 +64,7 @@ beginCompilationUnit(class)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleIdentifier(y, methodDeclarationContinuation)
@@ -107,7 +107,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B, B)
             handleNoType({)
             handleIdentifier(B, methodDeclaration)
             handleNoTypeVariables(()
@@ -172,7 +172,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B2)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
             handleNoType({)
             handleIdentifier(B2, methodDeclaration)
             handleNoTypeVariables(()
@@ -239,7 +239,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B3)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
             handleNoType({)
             handleIdentifier(B3, methodDeclaration)
             handleNoTypeVariables(()
@@ -288,7 +288,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B3)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
             handleNoType(;)
             handleIdentifier(B3, methodDeclaration)
             handleIdentifier(y, methodDeclarationContinuation)
@@ -342,7 +342,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType(;)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -407,7 +407,7 @@ beginCompilationUnit(class)
         beginMetadataStar(D)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
             handleNoType({)
             handleIdentifier(D, methodDeclaration)
             handleNoTypeVariables(()
@@ -486,7 +486,7 @@ beginCompilationUnit(class)
         beginMetadataStar(E)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, E, E)
             handleNoType(;)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/issue_48411.dart.intertwined.expect

@@ -35,7 +35,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -77,7 +77,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -155,7 +155,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B, DeclarationKind.Class, B, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B, B)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B, methodDeclaration)
@@ -286,7 +286,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B2, DeclarationKind.Class, B2, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B2, methodDeclaration)
@@ -424,7 +424,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B3, DeclarationKind.Class, B3, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B3, methodDeclaration)
@@ -529,7 +529,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, B3, DeclarationKind.Class, B3, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(B3, methodDeclaration)
@@ -624,7 +624,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -763,7 +763,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, D, DeclarationKind.Class, D, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(D, methodDeclaration)
@@ -924,7 +924,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, E, DeclarationKind.Class, E, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, E, E)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.expect

@@ -15,7 +15,7 @@ beginCompilationUnit(class)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType({)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()
@@ -38,7 +38,7 @@ beginCompilationUnit(class)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleIdentifier(y, methodDeclarationContinuation)
@@ -81,7 +81,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B, B)
             handleNoType({)
             handleIdentifier(B, methodDeclaration)
             handleNoTypeVariables(()
@@ -145,7 +145,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B2)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
             handleNoType({)
             handleIdentifier(B2, methodDeclaration)
             handleNoTypeVariables(()
@@ -211,7 +211,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B3)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
             handleNoType({)
             handleIdentifier(B3, methodDeclaration)
             handleNoTypeVariables(()
@@ -259,7 +259,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B3)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
             handleNoType(;)
             handleIdentifier(B3, methodDeclaration)
             handleIdentifier(y, methodDeclarationContinuation)
@@ -313,7 +313,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType(;)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -377,7 +377,7 @@ beginCompilationUnit(class)
         beginMetadataStar(D)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
             handleNoType({)
             handleIdentifier(D, methodDeclaration)
             handleNoTypeVariables(()
@@ -455,7 +455,7 @@ beginCompilationUnit(class)
         beginMetadataStar(E)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, E, E)
             handleNoType(;)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/issue_48411_prime.dart.intertwined.expect

@@ -35,7 +35,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -77,7 +77,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -155,7 +155,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B, DeclarationKind.Class, B, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B, B)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B, B)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B, methodDeclaration)
@@ -283,7 +283,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B2, DeclarationKind.Class, B2, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B2, B2)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B2, methodDeclaration)
@@ -418,7 +418,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, B3, DeclarationKind.Class, B3, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B3, methodDeclaration)
@@ -520,7 +520,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, B3, DeclarationKind.Class, B3, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, B3, B3)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(B3, methodDeclaration)
@@ -615,7 +615,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -751,7 +751,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, D, DeclarationKind.Class, D, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(D, methodDeclaration)
@@ -909,7 +909,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, E, DeclarationKind.Class, E, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E, E)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, E, E)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(E, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.expect

@@ -85,7 +85,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -146,7 +146,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -226,7 +226,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -262,7 +262,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/issue_48411_prime_1.dart.intertwined.expect

@@ -35,7 +35,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -160,7 +160,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -342,7 +342,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -422,7 +422,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)

pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.expect

@@ -86,7 +86,7 @@ beginCompilationUnit(var)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()
@@ -115,7 +115,7 @@ beginCompilationUnit(var)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()
@@ -171,7 +171,7 @@ beginCompilationUnit(var)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()
@@ -204,7 +204,7 @@ beginCompilationUnit(var)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()
@@ -264,7 +264,7 @@ beginCompilationUnit(var)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()
@@ -295,7 +295,7 @@ beginCompilationUnit(var)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/error_recovery/issue_54284.dart.intertwined.expect

@@ -209,7 +209,7 @@ parseUnit(var)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -281,7 +281,7 @@ parseUnit(var)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -402,7 +402,7 @@ parseUnit(var)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -487,7 +487,7 @@ parseUnit(var)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -621,7 +621,7 @@ parseUnit(var)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -695,7 +695,7 @@ parseUnit(var)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A, A)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, A, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)

pkg/front_end/parser_testcases/general/issue_41121.dart.expect

@@ -68,7 +68,7 @@ beginCompilationUnit(class)
         beginMetadataStar(ConfigurationService)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService, ConfigurationService)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService, ConfigurationService)
             handleNoType(;)
             handleIdentifier(ConfigurationService, methodDeclaration)
             handleNoTypeVariables(()
@@ -115,7 +115,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, configuration, ConfigurationService)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, configuration, ConfigurationService)
             handleVoidKeyword(void)
             handleIdentifier(configuration, methodDeclaration)
             handleNoTypeVariables(()
@@ -165,7 +165,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Configuration)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, configuration, ConfigurationService)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, configuration, ConfigurationService)
             handleIdentifier(Configuration, typeReference)
             handleNoTypeArguments(get)
             handleType(Configuration, null)
@@ -220,7 +220,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, method, ConfigurationService)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, method, ConfigurationService)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -246,7 +246,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, ConfigurationService)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, ConfigurationService)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/general/issue_41121.dart.intertwined.expect

@@ -52,7 +52,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, ConfigurationService, DeclarationKind.Class, ConfigurationService, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService, ConfigurationService)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, ConfigurationService, ConfigurationService)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(ConfigurationService, methodDeclaration)
@@ -156,7 +156,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), set, configuration, DeclarationKind.Class, ConfigurationService, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, configuration, ConfigurationService)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, set, configuration, ConfigurationService)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(configuration, methodDeclaration)
@@ -266,7 +266,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, SimpleType(), get, configuration, DeclarationKind.Class, ConfigurationService, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, configuration, ConfigurationService)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, get, configuration, ConfigurationService)
                 listener: handleIdentifier(Configuration, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(Configuration, null)
@@ -402,7 +402,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(}, null, null, null, null, null, null, null, }, VoidType(), null, method, DeclarationKind.Class, ConfigurationService, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, method, ConfigurationService)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, method, ConfigurationService)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -465,7 +465,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, Foo, DeclarationKind.Class, ConfigurationService, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, ConfigurationService)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, ConfigurationService)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect

@@ -57,7 +57,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNewAsIdentifier(new)
@@ -74,7 +74,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
             handleNoType(;)
             handleIdentifier(C, methodDeclaration)
             handleIdentifier(constructor_field_initializer, methodDeclarationContinuation)
@@ -277,7 +277,7 @@ beginCompilationUnit(class)
         beginMetadataStar(D)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
             handleNoType(;)
             handleIdentifier(D, methodDeclaration)
             handleIdentifier(super_invocation, methodDeclarationContinuation)
@@ -304,7 +304,7 @@ beginCompilationUnit(class)
         beginMetadataStar(D)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
             handleNoType(;)
             handleIdentifier(D, methodDeclaration)
             handleIdentifier(this_redirection, methodDeclarationContinuation)

pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect

@@ -35,7 +35,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -71,7 +71,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C, C)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, C, C)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -504,7 +504,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, D, DeclarationKind.Class, D, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(D, methodDeclaration)
@@ -568,7 +568,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, D, DeclarationKind.Class, D, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D, D)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, D, D)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(D, methodDeclaration)

pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.expect

@@ -22,7 +22,7 @@ beginCompilationUnit(class)
         beginMetadataStar(operator)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, operator)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, operator)
             handleNoType({)
             handleOperatorName(operator, ^)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/general/operator_hat_class.crash_dart.intertwined.expect

@@ -36,7 +36,7 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, operator, DeclarationKind.Class, operator, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator, operator)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, operator, operator)
                 listener: handleNoType({)
                 parseOperatorName({)
                   listener: handleOperatorName(operator, ^)

pkg/front_end/parser_testcases/inline_class/extension_type.dart.expect

@@ -113,7 +113,7 @@ beginCompilationUnit(extension)
         beginMetadataStar(ExtensionType4)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
+          beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
             handleNoType({)
             handleIdentifier(ExtensionType4, methodDeclaration)
             handleIdentifier(constructor, methodDeclarationContinuation)
@@ -136,7 +136,7 @@ beginCompilationUnit(extension)
         beginMetadataStar(ExtensionType4)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
+          beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
             handleNoType(;)
             handleIdentifier(ExtensionType4, methodDeclaration)
             handleIdentifier(redirect, methodDeclarationContinuation)

pkg/front_end/parser_testcases/inline_class/extension_type.dart.intertwined.expect

@@ -172,7 +172,7 @@ parseUnit(extension)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, ExtensionType4, DeclarationKind.ExtensionType, ExtensionType4, false)
-                listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
+                listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(ExtensionType4, methodDeclaration)
@@ -216,7 +216,7 @@ parseUnit(extension)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, ExtensionType4, DeclarationKind.ExtensionType, ExtensionType4, false)
-                listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
+                listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, null, null, ExtensionType4, ExtensionType4)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(ExtensionType4, methodDeclaration)

pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.expect

@@ -113,7 +113,7 @@ beginCompilationUnit(extension)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
+          beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
             handleNoType(const)
             handleIdentifier(ExtensionType4, methodDeclaration)
             handleIdentifier(constructor, methodDeclarationContinuation)
@@ -136,7 +136,7 @@ beginCompilationUnit(extension)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
+          beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
             handleNoType(const)
             handleIdentifier(ExtensionType4, methodDeclaration)
             handleIdentifier(redirect, methodDeclarationContinuation)

pkg/front_end/parser_testcases/inline_class/extension_type_const.dart.intertwined.expect

@@ -171,7 +171,7 @@ parseUnit(extension)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod({, null, null, null, null, null, null, const, const, NoType(), null, ExtensionType4, DeclarationKind.ExtensionType, ExtensionType4, false)
-                listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
+                listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
                 listener: handleNoType(const)
                 ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
                   listener: handleIdentifier(ExtensionType4, methodDeclaration)
@@ -214,7 +214,7 @@ parseUnit(extension)
                 listener: endMetadataStar(0)
               listener: beginMember()
               parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, ExtensionType4, DeclarationKind.ExtensionType, ExtensionType4, false)
-                listener: beginMethod(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
+                listener: beginConstructor(DeclarationKind.ExtensionType, null, null, null, null, const, null, ExtensionType4, ExtensionType4)
                 listener: handleNoType(const)
                 ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
                   listener: handleIdentifier(ExtensionType4, methodDeclaration)

pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.expect

@@ -37,7 +37,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -86,7 +86,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(a, methodDeclarationContinuation)
@@ -150,7 +150,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(b, methodDeclarationContinuation)
@@ -214,7 +214,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(c, methodDeclarationContinuation)
@@ -278,7 +278,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(d, methodDeclarationContinuation)

pkg/front_end/parser_testcases/nnbd/issue_40834_01.dart.intertwined.expect

@@ -69,7 +69,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -178,7 +178,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -324,7 +324,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -470,7 +470,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -616,7 +616,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(.)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.expect

@@ -37,7 +37,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/nnbd/issue_40834_02.dart.intertwined.expect

@@ -69,7 +69,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.expect

@@ -37,7 +37,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+          beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/nnbd/issue_40834_03.dart.intertwined.expect

@@ -69,7 +69,7 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(()
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
+                listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, Foo, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)