[cfe] Support augmentation library imports

This adds support for the `import augment <uri>` import syntax when
the 'macros' experiment is enabled.

The CL also include propagation of the augment modifier on class methods
which was missed in a previous CL.

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

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

@@ -319,14 +319,15 @@ class ForwardingListener implements Listener {
   @override
   void beginMethod(
       DeclarationKind declarationKind,
+      Token? augmentToken,
       Token? externalToken,
       Token? staticToken,
       Token? covariantToken,
       Token? varFinalOrConst,
       Token? getOrSet,
       Token name) {
-    listener?.beginMethod(declarationKind, externalToken, staticToken,
-        covariantToken, varFinalOrConst, getOrSet, name);
+    listener?.beginMethod(declarationKind, augmentToken, externalToken,
+        staticToken, covariantToken, varFinalOrConst, getOrSet, name);
   }
 
   @override
@@ -892,8 +893,8 @@ class ForwardingListener implements Listener {
   }
 
   @override
-  void endImport(Token importKeyword, Token? semicolon) {
-    listener?.endImport(importKeyword, semicolon);
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
+    listener?.endImport(importKeyword, augmentToken, semicolon);
   }
 
   @override

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

@@ -833,7 +833,7 @@ class Listener implements UnescapeErrorListener {
   /// - conditional uris
   /// - prefix identifier
   /// - combinators
-  void endImport(Token importKeyword, Token? semicolon) {
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
     logEvent("Import");
   }
 
@@ -1009,6 +1009,7 @@ class Listener implements UnescapeErrorListener {
   /// [endMixinMethod].
   void beginMethod(
       DeclarationKind declarationKind,
+      Token? augmentToken,
       Token? externalToken,
       Token? staticToken,
       Token? covariantToken,

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

@@ -679,17 +679,22 @@ class Parser {
     assert(optional('import', importKeyword));
     listener.beginUncategorizedTopLevelDeclaration(importKeyword);
     listener.beginImport(importKeyword);
-    Token token = ensureLiteralString(importKeyword);
+    Token start = importKeyword;
+    Token? augmentToken;
+    if (start.next!.isIdentifier && start.next!.lexeme == 'augment') {
+      start = augmentToken = start.next!;
+    }
+    Token token = ensureLiteralString(start);
     Token uri = token;
     token = parseConditionalUriStar(token);
     token = parseImportPrefixOpt(token);
     token = parseCombinatorStar(token).next!;
     if (optional(';', token)) {
-      listener.endImport(importKeyword, token);
+      listener.endImport(importKeyword, augmentToken, token);
       return token;
     } else {
       // Recovery
-      listener.endImport(importKeyword, /* semicolon = */ null);
+      listener.endImport(importKeyword, augmentToken, /* semicolon = */ null);
       return parseImportRecovery(uri);
     }
   }
@@ -3984,6 +3989,7 @@ class Parser {
           token = parseMethod(
               beforeStart,
               abstractToken,
+              augmentToken,
               externalToken,
               staticToken,
               covariantToken,
@@ -4007,6 +4013,7 @@ class Parser {
           return parseInvalidOperatorDeclaration(
               beforeStart,
               abstractToken,
+              augmentToken,
               externalToken,
               staticToken,
               covariantToken,
@@ -4020,6 +4027,7 @@ class Parser {
           token = parseMethod(
               beforeStart,
               abstractToken,
+              augmentToken,
               externalToken,
               staticToken,
               covariantToken,
@@ -4072,6 +4080,7 @@ class Parser {
           return parseInvalidOperatorDeclaration(
               beforeStart,
               abstractToken,
+              augmentToken,
               externalToken,
               staticToken,
               covariantToken,
@@ -4107,6 +4116,7 @@ class Parser {
       token = parseMethod(
           beforeStart,
           abstractToken,
+          augmentToken,
           externalToken,
           staticToken,
           covariantToken,
@@ -4147,6 +4157,7 @@ class Parser {
   Token parseMethod(
       Token beforeStart,
       Token? abstractToken,
+      Token? augmentToken,
       Token? externalToken,
       Token? staticToken,
       Token? covariantToken,
@@ -4220,8 +4231,8 @@ class Parser {
 
     // TODO(danrubel): Consider parsing the name before calling beginMethod
     // rather than passing the name token into beginMethod.
-    listener.beginMethod(kind, externalToken, staticToken, covariantToken,
-        varFinalOrConst, getOrSet, name);
+    listener.beginMethod(kind, augmentToken, externalToken, staticToken,
+        covariantToken, varFinalOrConst, getOrSet, name);
 
     Token token = typeInfo.parseType(beforeType, this);
     assert(token.next == (getOrSet ?? name) ||
@@ -8036,6 +8047,7 @@ class Parser {
   Token parseInvalidOperatorDeclaration(
       Token beforeStart,
       Token? abstractToken,
+      Token? augmentToken,
       Token? externalToken,
       Token? staticToken,
       Token? covariantToken,
@@ -8084,6 +8096,7 @@ class Parser {
     Token token = parseMethod(
         beforeStart,
         abstractToken,
+        augmentToken,
         externalToken,
         staticToken,
         covariantToken,
@@ -8131,6 +8144,7 @@ class Parser {
       return parseInvalidOperatorDeclaration(
           beforeStart,
           abstractToken,
+          augmentToken,
           externalToken,
           staticToken,
           covariantToken,
@@ -8148,6 +8162,7 @@ class Parser {
       token = parseMethod(
           beforeStart,
           abstractToken,
+          augmentToken,
           externalToken,
           staticToken,
           covariantToken,

pkg/analyzer/lib/dart/ast/ast_factory.dart

@@ -626,8 +626,8 @@ abstract class AstFactory {
     required List<DartType> typeArgumentTypes,
   });
 
-  /// Returns a newly created import directive. Either or both of the
-  /// [comment] and [metadata] can be `null` if the function does not have the
+  /// Returns a newly created import directive. Either or both of the [comment]
+  /// and [metadata] can be `null` if the function does not have the
   /// corresponding attribute. The [deferredKeyword] can be `null` if the import
   /// is not deferred. The [asKeyword] and [prefix] can be `null` if the import
   /// does not specify a prefix. The list of [combinators] can be `null` if

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -6269,6 +6269,10 @@ class ImplicitCallReferenceImpl extends ExpressionImpl
 //         [Combinator]* ';'
 class ImportDirectiveImpl extends NamespaceDirectiveImpl
     implements ImportDirective {
+  /// The token representing the 'augment' keyword, or `null` if the import is
+  /// not a library augmentation import.
+  Token? augmentKeyword;
+
   /// The token representing the 'deferred' keyword, or `null` if the imported
   /// is not deferred.
   @override
@@ -6293,6 +6297,7 @@ class ImportDirectiveImpl extends NamespaceDirectiveImpl
       CommentImpl? comment,
       List<Annotation>? metadata,
       Token keyword,
+      this.augmentKeyword,
       StringLiteralImpl libraryUri,
       List<Configuration>? configurations,
       this.deferredKeyword,
@@ -6323,6 +6328,7 @@ class ImportDirectiveImpl extends NamespaceDirectiveImpl
   @override
   ChildEntities get _childEntities => super._childEntities
     ..addToken('keyword', keyword)
+    ..addToken('augmentKeyword', augmentKeyword)
     ..addNode('uri', uri)
     ..addToken('deferredKeyword', deferredKeyword)
     ..addToken('asKeyword', asKeyword)

pkg/analyzer/lib/src/dart/ast/ast_factory.dart

@@ -870,11 +870,13 @@ class AstFactoryImpl extends AstFactory {
           Token? asKeyword,
           SimpleIdentifier? prefix,
           List<Combinator>? combinators,
-          Token semicolon) =>
+          Token semicolon,
+          {Token? augmentKeyword}) =>
       ImportDirectiveImpl(
           comment as CommentImpl?,
           metadata,
           keyword,
+          augmentKeyword,
           libraryUri as StringLiteralImpl,
           configurations,
           deferredKeyword,

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

@@ -364,6 +364,7 @@ class AstBuilder extends StackListener {
   @override
   void beginMethod(
       DeclarationKind declarationKind,
+      Token? augmentToken,
       Token? externalToken,
       Token? staticToken,
       Token? covariantToken,
@@ -371,6 +372,10 @@ class AstBuilder extends StackListener {
       Token? getOrSet,
       Token name) {
     _Modifiers modifiers = _Modifiers();
+    if (augmentToken != null) {
+      assert(augmentToken.isModifier);
+      modifiers.augmentKeyword = augmentToken;
+    }
     if (externalToken != null) {
       assert(externalToken.isModifier);
       modifiers.externalKeyword = externalToken;
@@ -1801,7 +1806,7 @@ class AstBuilder extends StackListener {
   }
 
   @override
-  void endImport(Token importKeyword, Token? semicolon) {
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
     assert(optional('import', importKeyword));
     assert(optionalOrNull(';', semicolon));
     debugEvent("Import");
@@ -1815,6 +1820,21 @@ class AstBuilder extends StackListener {
     var metadata = pop() as List<Annotation>?;
     var comment = _findComment(metadata, importKeyword);
 
+    if (!enableMacros) {
+      if (augmentToken != null) {
+        var feature = ExperimentalFeatures.macros;
+        handleRecoverableError(
+            templateExperimentNotEnabled.withArguments(
+              feature.enableString,
+              _versionAsString(ExperimentStatus.currentVersion),
+            ),
+            augmentToken,
+            augmentToken);
+        // Pretend that 'augment' didn't occur while this feature is incomplete.
+        augmentToken = null;
+      }
+    }
+
     directives.add(ast.importDirective(
         comment,
         metadata,
@@ -1825,7 +1845,8 @@ class AstBuilder extends StackListener {
         asKeyword,
         prefix,
         combinators,
-        semicolon ?? Tokens.semicolon()));
+        semicolon ?? Tokens.semicolon(),
+        augmentKeyword: augmentToken));
   }
 
   @override

pkg/analyzer/test/generated/parser_fasta_listener.dart

@@ -368,13 +368,14 @@ class ForwardingTestListener extends ForwardingListener {
   @override
   void beginMethod(
       DeclarationKind declarationKind,
+      Token? augmentToken,
       Token? externalToken,
       Token? staticToken,
       Token? covariantToken,
       Token? varFinalOrConst,
       Token? getOrSet,
       Token name) {
-    super.beginMethod(declarationKind, externalToken, staticToken,
+    super.beginMethod(declarationKind, augmentToken, externalToken, staticToken,
         covariantToken, varFinalOrConst, getOrSet, name);
     begin('Method');
   }
@@ -975,9 +976,9 @@ class ForwardingTestListener extends ForwardingListener {
   }
 
   @override
-  void endImport(Token importKeyword, Token? semicolon) {
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
     end('Import');
-    super.endImport(importKeyword, semicolon);
+    super.endImport(importKeyword, augmentToken, semicolon);
   }
 
   @override

pkg/analyzer/tool/summary/mini_ast.dart

@@ -325,7 +325,7 @@ class MiniAstBuilder extends StackListener {
   }
 
   @override
-  void endImport(Token importKeyword, Token? semicolon) {
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
     debugEvent("Import");
     pop(NullValue.Prefix); // Prefix identifier
     pop(); // URI

pkg/front_end/lib/src/fasta/import.dart

@@ -27,6 +27,8 @@ class Import {
 
   final PrefixBuilder? prefixBuilder;
 
+  final bool isAugmentationImport;
+
   final bool deferred;
 
   final String? prefix;
@@ -46,6 +48,7 @@ class Import {
   Import(
       this.importer,
       this.imported,
+      this.isAugmentationImport,
       this.deferred,
       this.prefix,
       this.combinators,

pkg/front_end/lib/src/fasta/incremental_compiler.dart

@@ -1780,16 +1780,17 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
           }
 
           debugLibrary.addImport(
-              null,
-              dependency.importedLibraryReference.canonicalName!.name,
-              null,
-              dependency.name,
-              combinators,
-              dependency.isDeferred,
-              -1,
-              -1,
-              -1,
-              -1);
+              metadata: null,
+              isAugmentationImport: false,
+              uri: dependency.importedLibraryReference.canonicalName!.name,
+              configurations: null,
+              prefix: dependency.name,
+              combinators: combinators,
+              deferred: dependency.isDeferred,
+              charOffset: -1,
+              prefixCharOffset: -1,
+              uriOffset: -1,
+              importIndex: -1);
         }
 
         debugLibrary.addImportsToScope();

pkg/front_end/lib/src/fasta/kernel/macro_annotation_parser.dart

@@ -580,6 +580,7 @@ class _MacroListener implements Listener {
   @override
   void beginMethod(
       DeclarationKind declarationKind,
+      Token? augmentToken,
       Token? externalToken,
       Token? staticToken,
       Token? covariantToken,
@@ -1078,7 +1079,7 @@ class _MacroListener implements Listener {
   }
 
   @override
-  void endImport(Token importKeyword, Token? semicolon) {
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
     _unexpected();
   }
 

pkg/front_end/lib/src/fasta/source/diet_listener.dart

@@ -521,7 +521,7 @@ class DietListener extends StackListenerImpl {
   }
 
   @override
-  void endImport(Token importKeyword, Token? semicolon) {
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
     debugEvent("Import");
     Object? name = pop(NullValue.Prefix);
 
@@ -531,7 +531,7 @@ class DietListener extends StackListenerImpl {
 
     // Native imports must be skipped because they aren't assigned corresponding
     // LibraryDependency nodes.
-    Token importUriToken = importKeyword.next!;
+    Token importUriToken = augmentToken?.next ?? importKeyword.next!;
     String importUri =
         unescapeString(importUriToken.lexeme, importUriToken, this);
     if (importUri.startsWith("dart-ext:")) return;

pkg/front_end/lib/src/fasta/source/directive_listener.dart

@@ -82,7 +82,7 @@ class DirectiveListener extends Listener {
   }
 
   @override
-  void endImport(Token? import, Token? semicolon) {
+  void endImport(Token? import, Token? augmentToken, Token? semicolon) {
     imports.add(new NamespaceDirective.import(_uri, _combinators));
     _uri = null;
     _combinators = null;

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

@@ -43,6 +43,7 @@ import '../kernel/type_algorithms.dart';
 import '../kernel/utils.dart';
 import '../modifier.dart'
     show
+        Augment,
         Const,
         Covariant,
         External,
@@ -528,7 +529,7 @@ class OutlineBuilder extends StackListenerImpl {
   }
 
   @override
-  void endImport(Token importKeyword, Token? semicolon) {
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
     debugEvent("EndImport");
     List<CombinatorBuilder>? combinators = pop() as List<CombinatorBuilder>?;
     bool isDeferred = pop() as bool;
@@ -541,17 +542,33 @@ class OutlineBuilder extends StackListenerImpl {
     List<MetadataBuilder>? metadata = pop() as List<MetadataBuilder>?;
     checkEmpty(importKeyword.charOffset);
     if (prefix is ParserRecovery) return;
+
+    if (!libraryBuilder.enableMacrosInLibrary) {
+      if (augmentToken != null) {
+        // TODO(johnniwinther): We should emit a different message when the
+        // experiment is not released yet. The current message indicates that
+        // changing the sdk version can solve the problem.
+        addProblem(
+            templateExperimentNotEnabled.withArguments(
+                'macros', libraryBuilder.enableMacrosVersionInLibrary.toText()),
+            augmentToken.next!.charOffset,
+            augmentToken.next!.length);
+        augmentToken = null;
+      }
+    }
+    bool isAugmentationImport = augmentToken != null;
     libraryBuilder.addImport(
-        metadata,
-        uri,
-        configurations,
-        prefix as String?,
-        combinators,
-        isDeferred,
-        importKeyword.charOffset,
-        prefixOffset,
-        uriOffset,
-        importIndex++);
+        metadata: metadata,
+        isAugmentationImport: isAugmentationImport,
+        uri: uri,
+        configurations: configurations,
+        prefix: prefix as String?,
+        combinators: combinators,
+        deferred: isDeferred,
+        charOffset: importKeyword.charOffset,
+        prefixCharOffset: prefixOffset,
+        uriOffset: uriOffset,
+        importIndex: importIndex++);
   }
 
   @override
@@ -1513,6 +1530,7 @@ class OutlineBuilder extends StackListenerImpl {
   @override
   void beginMethod(
       DeclarationKind declarationKind,
+      Token? augmentToken,
       Token? externalToken,
       Token? staticToken,
       Token? covariantToken,
@@ -1570,6 +1588,10 @@ class OutlineBuilder extends StackListenerImpl {
     pushDeclarationContext(declarationContext);
 
     List<Modifier>? modifiers;
+    if (augmentToken != null) {
+      modifiers ??= <Modifier>[];
+      modifiers.add(Augment);
+    }
     if (externalToken != null) {
       modifiers ??= <Modifier>[];
       modifiers.add(External);

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

@@ -759,16 +759,17 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
   }
 
   void addImport(
-      List<MetadataBuilder>? metadata,
-      String uri,
-      List<Configuration>? configurations,
-      String? prefix,
-      List<CombinatorBuilder>? combinators,
-      bool deferred,
-      int charOffset,
-      int prefixCharOffset,
-      int uriOffset,
-      int importIndex) {
+      {required List<MetadataBuilder>? metadata,
+      required bool isAugmentationImport,
+      required String uri,
+      required List<Configuration>? configurations,
+      required String? prefix,
+      required List<CombinatorBuilder>? combinators,
+      required bool deferred,
+      required int charOffset,
+      required int prefixCharOffset,
+      required int uriOffset,
+      required int importIndex}) {
     if (configurations != null) {
       for (Configuration config in configurations) {
         if (loader.getLibrarySupportValue(config.dottedName) ==
@@ -800,8 +801,17 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
       builder = loader.read(resolvedUri, uriOffset, accessor: this);
     }
 
-    imports.add(new Import(this, builder, deferred, prefix, combinators,
-        configurations, charOffset, prefixCharOffset, importIndex,
+    imports.add(new Import(
+        this,
+        builder,
+        isAugmentationImport,
+        deferred,
+        prefix,
+        combinators,
+        configurations,
+        charOffset,
+        prefixCharOffset,
+        importIndex,
         nativeImportPath: nativePath));
   }
 

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

@@ -1052,9 +1052,11 @@ abstract class AbstractParserAstListener implements Listener {
   }
 
   @override
-  void endImport(Token importKeyword, Token? semicolon) {
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
     ImportEnd data = new ImportEnd(ParserAstType.END,
-        importKeyword: importKeyword, semicolon: semicolon);
+        importKeyword: importKeyword,
+        augmentToken: augmentToken,
+        semicolon: semicolon);
     seen(data);
   }
 
@@ -1321,6 +1323,7 @@ abstract class AbstractParserAstListener implements Listener {
   @override
   void beginMethod(
       DeclarationKind declarationKind,
+      Token? augmentToken,
       Token? externalToken,
       Token? staticToken,
       Token? covariantToken,
@@ -1329,6 +1332,7 @@ abstract class AbstractParserAstListener implements Listener {
       Token name) {
     MethodBegin data = new MethodBegin(ParserAstType.BEGIN,
         declarationKind: declarationKind,
+        augmentToken: augmentToken,
         externalToken: externalToken,
         staticToken: staticToken,
         covariantToken: covariantToken,
@@ -4453,14 +4457,17 @@ class ImportPrefixHandle extends ParserAstNode {
 
 class ImportEnd extends ParserAstNode {
   final Token importKeyword;
+  final Token? augmentToken;
   final Token? semicolon;
 
-  ImportEnd(ParserAstType type, {required this.importKeyword, this.semicolon})
+  ImportEnd(ParserAstType type,
+      {required this.importKeyword, this.augmentToken, this.semicolon})
       : super("Import", type);
 
   @override
   Map<String, Object?> get deprecatedArguments => {
         "importKeyword": importKeyword,
+        "augmentToken": augmentToken,
         "semicolon": semicolon,
       };
 }
@@ -4932,6 +4939,7 @@ class MemberEnd extends ParserAstNode {
 
 class MethodBegin extends ParserAstNode {
   final DeclarationKind declarationKind;
+  final Token? augmentToken;
   final Token? externalToken;
   final Token? staticToken;
   final Token? covariantToken;
@@ -4941,6 +4949,7 @@ class MethodBegin extends ParserAstNode {
 
   MethodBegin(ParserAstType type,
       {required this.declarationKind,
+      this.augmentToken,
       this.externalToken,
       this.staticToken,
       this.covariantToken,
@@ -4952,6 +4961,7 @@ class MethodBegin extends ParserAstNode {
   @override
   Map<String, Object?> get deprecatedArguments => {
         "declarationKind": declarationKind,
+        "augmentToken": augmentToken,
         "externalToken": externalToken,
         "staticToken": staticToken,
         "covariantToken": covariantToken,

pkg/front_end/lib/src/fasta/util/textual_outline.dart

@@ -863,7 +863,7 @@ class TextualOutlineListener extends Listener {
   }
 
   @override
-  void endImport(Token importKeyword, Token? semicolon) {
+  void endImport(Token importKeyword, Token? augmentToken, Token? semicolon) {
     // ignore: unnecessary_null_comparison
     if (importKeyword != null && semicolon != null) {
       importExportsStartToChunk[importKeyword] = new _ImportChunk(

pkg/front_end/parser_testcases/augmentation/member_declarations.dart.expect

@@ -14,7 +14,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
             handleNoType(augment)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -29,7 +29,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -44,7 +44,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
             handleNoType(augment)
             handleIdentifier(getter, methodDeclaration)
             handleNoTypeVariables(=>)
@@ -58,7 +58,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -74,7 +74,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
             handleNoType(augment)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -96,7 +96,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
             handleVoidKeyword(void)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -189,7 +189,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
             handleNoType(static)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -204,7 +204,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -219,7 +219,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
             handleNoType(static)
             handleIdentifier(getter, methodDeclaration)
             handleNoTypeVariables(=>)
@@ -233,7 +233,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -249,7 +249,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
             handleNoType(static)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -271,7 +271,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
             handleVoidKeyword(void)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -377,7 +377,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, null, null, null, null, method)
+          beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method)
             handleNoType(augment)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -392,7 +392,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, null, null, null, null, method)
+          beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -407,7 +407,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter)
             handleNoType(augment)
             handleIdentifier(getter, methodDeclaration)
             handleNoTypeVariables(=>)
@@ -421,7 +421,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -437,7 +437,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter)
             handleNoType(augment)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -459,7 +459,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter)
             handleVoidKeyword(void)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -552,7 +552,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, static, null, null, null, method)
+          beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method)
             handleNoType(static)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -567,7 +567,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, static, null, null, null, method)
+          beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -582,7 +582,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, static, null, null, get, getter)
+          beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter)
             handleNoType(static)
             handleIdentifier(getter, methodDeclaration)
             handleNoTypeVariables(=>)
@@ -596,7 +596,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, static, null, null, get, getter)
+          beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -612,7 +612,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, static, null, null, set, setter)
+          beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter)
             handleNoType(static)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -634,7 +634,7 @@ beginCompilationUnit(class)
         beginMetadataStar(augment)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Mixin, null, static, null, null, set, setter)
+          beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter)
             handleVoidKeyword(void)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/augmentation/member_declarations.dart.intertwined.expect

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, method)
+              parseMethod({, null, augment, null, null, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -63,8 +63,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, method)
+              parseMethod(}, null, augment, null, null, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -94,8 +94,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, getter)
+              parseMethod(}, null, augment, null, null, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(getter, methodDeclaration)
@@ -129,8 +129,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, getter)
+              parseMethod(;, null, augment, null, null, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -166,8 +166,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, setter)
+              parseMethod(;, null, augment, null, null, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -207,8 +207,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, setter)
+              parseMethod(}, null, augment, null, null, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -372,8 +372,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(;, null, null, static, null, null, null, static, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+              parseMethod(;, null, augment, null, static, null, null, null, static, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
                 listener: handleNoType(static)
                 ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -402,8 +402,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, static, null, null, null, static, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+              parseMethod(}, null, augment, null, static, null, null, null, static, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -432,8 +432,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, static, null, null, null, static, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+              parseMethod(}, null, augment, null, static, null, null, null, static, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
                 listener: handleNoType(static)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(getter, methodDeclaration)
@@ -466,8 +466,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, static, null, null, null, static, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+              parseMethod(;, null, augment, null, static, null, null, null, static, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -502,8 +502,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, static, null, null, null, static, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+              parseMethod(;, null, augment, null, static, null, null, null, static, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
                 listener: handleNoType(static)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -542,8 +542,8 @@ parseUnit(class)
                 listener: beginMetadataStar(augment)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, static, null, null, null, static, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+              parseMethod(}, null, augment, null, static, null, null, null, static, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -729,8 +729,8 @@ parseUnit(class)
               listener: endMetadataStar(0)
             listener: beginMember()
             isReservedKeyword(()
-            parseMethod({, null, null, null, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, null, null, null, null, method)
+            parseMethod({, null, augment, null, null, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method)
               listener: handleNoType(augment)
               ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
                 listener: handleIdentifier(method, methodDeclaration)
@@ -760,8 +760,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(}, null, null, null, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, null, null, null, null, method)
+            parseMethod(}, null, augment, null, null, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, null, method)
               listener: handleVoidKeyword(void)
               ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                 listener: handleIdentifier(method, methodDeclaration)
@@ -791,8 +791,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(}, null, null, null, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, null, null, null, get, getter)
+            parseMethod(}, null, augment, null, null, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter)
               listener: handleNoType(augment)
               ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                 listener: handleIdentifier(getter, methodDeclaration)
@@ -826,8 +826,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(;, null, null, null, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, null, null, null, get, getter)
+            parseMethod(;, null, augment, null, null, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, get, getter)
               listener: handleIdentifier(int, typeReference)
               listener: handleNoTypeArguments(get)
               listener: handleType(int, null)
@@ -863,8 +863,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(;, null, null, null, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, null, null, null, set, setter)
+            parseMethod(;, null, augment, null, null, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter)
               listener: handleNoType(augment)
               ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                 listener: handleIdentifier(setter, methodDeclaration)
@@ -904,8 +904,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(}, null, null, null, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, null, null, null, set, setter)
+            parseMethod(}, null, augment, null, null, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, null, null, null, set, setter)
               listener: handleVoidKeyword(void)
               ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                 listener: handleIdentifier(setter, methodDeclaration)
@@ -1069,8 +1069,8 @@ parseUnit(class)
               listener: endMetadataStar(0)
             listener: beginMember()
             isReservedKeyword(()
-            parseMethod(;, null, null, static, null, null, null, static, Instance of 'NoType', null, method, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, static, null, null, null, method)
+            parseMethod(;, null, augment, null, static, null, null, null, static, Instance of 'NoType', null, method, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method)
               listener: handleNoType(static)
               ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
                 listener: handleIdentifier(method, methodDeclaration)
@@ -1099,8 +1099,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(}, null, null, static, null, null, null, static, Instance of 'VoidType', null, method, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, static, null, null, null, method)
+            parseMethod(}, null, augment, null, static, null, null, null, static, Instance of 'VoidType', null, method, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, null, method)
               listener: handleVoidKeyword(void)
               ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                 listener: handleIdentifier(method, methodDeclaration)
@@ -1129,8 +1129,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(}, null, null, static, null, null, null, static, Instance of 'NoType', get, getter, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, static, null, null, get, getter)
+            parseMethod(}, null, augment, null, static, null, null, null, static, Instance of 'NoType', get, getter, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter)
               listener: handleNoType(static)
               ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                 listener: handleIdentifier(getter, methodDeclaration)
@@ -1163,8 +1163,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(;, null, null, static, null, null, null, static, Instance of 'SimpleType', get, getter, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, static, null, null, get, getter)
+            parseMethod(;, null, augment, null, static, null, null, null, static, Instance of 'SimpleType', get, getter, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, get, getter)
               listener: handleIdentifier(int, typeReference)
               listener: handleNoTypeArguments(get)
               listener: handleType(int, null)
@@ -1199,8 +1199,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(;, null, null, static, null, null, null, static, Instance of 'NoType', set, setter, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, static, null, null, set, setter)
+            parseMethod(;, null, augment, null, static, null, null, null, static, Instance of 'NoType', set, setter, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter)
               listener: handleNoType(static)
               ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                 listener: handleIdentifier(setter, methodDeclaration)
@@ -1239,8 +1239,8 @@ parseUnit(class)
               listener: beginMetadataStar(augment)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(}, null, null, static, null, null, null, static, Instance of 'VoidType', set, setter, DeclarationKind.Mixin, Mixin, false)
-              listener: beginMethod(DeclarationKind.Mixin, null, static, null, null, set, setter)
+            parseMethod(}, null, augment, null, static, null, null, null, static, Instance of 'VoidType', set, setter, DeclarationKind.Mixin, Mixin, false)
+              listener: beginMethod(DeclarationKind.Mixin, augment, null, static, null, null, set, setter)
               listener: handleVoidKeyword(void)
               ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                 listener: handleIdentifier(setter, methodDeclaration)

pkg/front_end/parser_testcases/augmentation/member_errors.dart.expect

@@ -261,7 +261,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
             handleNoType(augment)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -277,7 +277,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method)
             handleNoType(external)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -292,7 +292,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, null, method)
+          beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method)
             handleNoType(augment)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -307,7 +307,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -323,7 +323,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -338,7 +338,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, null, method)
+          beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -353,7 +353,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
             handleNoType(augment)
             handleIdentifier(getter, methodDeclaration)
             handleNoTypeVariables(=>)
@@ -368,7 +368,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter)
             handleNoType(external)
             handleIdentifier(getter, methodDeclaration)
             handleNoTypeVariables(;)
@@ -382,7 +382,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter)
             handleNoType(augment)
             handleIdentifier(getter, methodDeclaration)
             handleNoTypeVariables(;)
@@ -396,7 +396,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -413,7 +413,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -429,7 +429,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -445,7 +445,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
             handleNoType(augment)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -468,7 +468,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter)
             handleNoType(external)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -490,7 +490,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter)
             handleNoType(augment)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -512,7 +512,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
             handleVoidKeyword(void)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -535,7 +535,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter)
             handleVoidKeyword(void)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -557,7 +557,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter)
             handleVoidKeyword(void)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -801,7 +801,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
             handleNoType(static)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -817,7 +817,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+          beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method)
             handleNoType(augment)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -833,7 +833,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -849,7 +849,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+          beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method)
             handleVoidKeyword(void)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()
@@ -865,7 +865,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
             handleNoType(static)
             handleIdentifier(getter, methodDeclaration)
             handleNoTypeVariables(=>)
@@ -880,7 +880,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter)
             handleNoType(augment)
             handleIdentifier(getter, methodDeclaration)
             handleNoTypeVariables(=>)
@@ -895,7 +895,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -912,7 +912,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+          beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -929,7 +929,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
             handleNoType(static)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -952,7 +952,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter)
             handleNoType(augment)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -975,7 +975,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
             handleVoidKeyword(void)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()
@@ -998,7 +998,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+          beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter)
             handleVoidKeyword(void)
             handleIdentifier(setter, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/augmentation/member_errors.dart.intertwined.expect

@@ -34,8 +34,8 @@ parseUnit(class)
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, method)
+              parseMethod({, null, augment, null, null, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -68,8 +68,8 @@ parseUnit(class)
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, external, null, null, null, null, external, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, null, method)
+              parseMethod(}, null, augment, external, null, null, null, null, external, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method)
                 listener: handleNoType(external)
                 ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -100,8 +100,8 @@ parseUnit(class)
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(;, null, external, null, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, null, method)
+              parseMethod(;, null, null, external, null, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -131,8 +131,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, method)
+              parseMethod(;, null, augment, null, null, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, null, method)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -164,8 +164,8 @@ parseUnit(class)
               reportRecoverableError(external, Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
               listener: beginMember()
-              parseMethod(}, null, external, null, null, null, null, external, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, null, method)
+              parseMethod(}, null, augment, external, null, null, null, null, external, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, null, method)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -195,8 +195,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, external, null, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, null, method)
+              parseMethod(;, null, null, external, null, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, method)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -226,8 +226,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, getter)
+              parseMethod(;, null, augment, null, null, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(getter, methodDeclaration)
@@ -263,8 +263,8 @@ parseUnit(class)
               reportRecoverableError(external, Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
               listener: beginMember()
-              parseMethod(;, null, external, null, null, null, null, external, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, get, getter)
+              parseMethod(;, null, augment, external, null, null, null, null, external, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter)
                 listener: handleNoType(external)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(getter, methodDeclaration)
@@ -291,8 +291,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, external, null, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, get, getter)
+              parseMethod(;, null, null, external, null, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(getter, methodDeclaration)
@@ -319,8 +319,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, getter)
+              parseMethod(;, null, augment, null, null, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, get, getter)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -358,8 +358,8 @@ parseUnit(class)
               reportRecoverableError(external, Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
               listener: beginMember()
-              parseMethod(;, null, external, null, null, null, null, external, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, get, getter)
+              parseMethod(;, null, augment, external, null, null, null, null, external, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, get, getter)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -388,8 +388,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, external, null, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, get, getter)
+              parseMethod(;, null, null, external, null, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, get, getter)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -418,8 +418,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, setter)
+              parseMethod(;, null, augment, null, null, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -461,8 +461,8 @@ parseUnit(class)
               reportRecoverableError(external, Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
               listener: beginMember()
-              parseMethod(}, null, external, null, null, null, null, external, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, set, setter)
+              parseMethod(}, null, augment, external, null, null, null, null, external, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter)
                 listener: handleNoType(external)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -502,8 +502,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, external, null, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, set, setter)
+              parseMethod(;, null, null, external, null, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -543,8 +543,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, setter)
+              parseMethod(;, null, augment, null, null, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, null, null, null, set, setter)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -586,8 +586,8 @@ parseUnit(class)
               reportRecoverableError(external, Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'external' and 'augment'., Try removing one of the keywords., {string: external, string2: augment}], external, external)
               listener: beginMember()
-              parseMethod(}, null, external, null, null, null, null, external, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, set, setter)
+              parseMethod(}, null, augment, external, null, null, null, null, external, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, external, null, null, null, set, setter)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -627,8 +627,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}])
                 listener: handleRecoverableError(Message[ConflictingModifiers, Members can't be declared to be both 'augment' and 'external'., Try removing one of the keywords., {string: augment, string2: external}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, external, null, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, set, setter)
+              parseMethod(;, null, null, external, null, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, set, setter)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -1044,8 +1044,8 @@ parseUnit(class)
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(;, null, null, static, null, null, null, static, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+              parseMethod(;, null, augment, null, static, null, null, null, static, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
                 listener: handleNoType(static)
                 ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -1077,8 +1077,8 @@ parseUnit(class)
                 listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, static, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+              parseMethod(}, null, null, null, static, null, null, null, augment, Instance of 'NoType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(augment, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -1109,8 +1109,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(}, null, null, static, null, null, null, static, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+              parseMethod(}, null, augment, null, static, null, null, null, static, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, null, method)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -1141,8 +1141,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}])
                 listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
               listener: beginMember()
-              parseMethod(}, null, null, static, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, null, method)
+              parseMethod(}, null, null, null, static, null, null, null, augment, Instance of 'VoidType', null, method, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, null, method)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(method, methodDeclaration)
@@ -1173,8 +1173,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(}, null, null, static, null, null, null, static, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+              parseMethod(}, null, augment, null, static, null, null, null, static, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
                 listener: handleNoType(static)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(getter, methodDeclaration)
@@ -1209,8 +1209,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}])
                 listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, null, static, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+              parseMethod(;, null, null, null, static, null, null, null, augment, Instance of 'NoType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(getter, methodDeclaration)
@@ -1245,8 +1245,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, null, static, null, null, null, static, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+              parseMethod(;, null, augment, null, static, null, null, null, static, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, get, getter)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -1283,8 +1283,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}])
                 listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, null, static, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, get, getter)
+              parseMethod(;, null, null, null, static, null, null, null, augment, Instance of 'SimpleType', get, getter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, get, getter)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -1321,8 +1321,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(;, null, null, static, null, null, null, static, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+              parseMethod(;, null, augment, null, static, null, null, null, static, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
                 listener: handleNoType(static)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -1363,8 +1363,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}])
                 listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
               listener: beginMember()
-              parseMethod(}, null, null, static, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+              parseMethod(}, null, null, null, static, null, null, null, augment, Instance of 'NoType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter)
                 listener: handleNoType(augment)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -1405,8 +1405,8 @@ parseUnit(class)
               reportRecoverableErrorWithToken(augment, Instance of 'Template<(Token) => Message>')
                 listener: handleRecoverableError(Message[DuplicatedModifier, The modifier 'augment' was already specified., Try removing all but one occurrence of the modifier., {lexeme: augment}], augment, augment)
               listener: beginMember()
-              parseMethod(}, null, null, static, null, null, null, static, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+              parseMethod(}, null, augment, null, static, null, null, null, static, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, augment, null, static, null, null, set, setter)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)
@@ -1447,8 +1447,8 @@ parseUnit(class)
               reportRecoverableError(augment, Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}])
                 listener: handleRecoverableError(Message[ModifierOutOfOrder, The modifier 'augment' should be before the modifier 'static'., Try re-ordering the modifiers., {string: augment, string2: static}], augment, augment)
               listener: beginMember()
-              parseMethod(}, null, null, static, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
-                listener: beginMethod(DeclarationKind.Class, null, static, null, null, set, setter)
+              parseMethod(}, null, null, null, static, null, null, null, augment, Instance of 'VoidType', set, setter, DeclarationKind.Class, Class, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, static, null, null, set, setter)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(setter, methodDeclaration)

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

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

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

@@ -123,8 +123,8 @@ parseUnit(enum)
             listener: beginMetadataStar(const)
             listener: endMetadataStar(0)
           listener: beginMember()
-          parseMethod(;, null, null, null, null, null, const, const, Instance of 'NoType', null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, const, null, E)
+          parseMethod(;, null, null, null, null, null, null, const, const, Instance of 'NoType', null, E, DeclarationKind.Enum, E, false)
+            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)
@@ -152,8 +152,8 @@ parseUnit(enum)
             listener: beginMetadataStar(const)
             listener: endMetadataStar(0)
           listener: beginMember()
-          parseMethod(;, null, null, null, null, null, const, const, Instance of 'NoType', null, E, DeclarationKind.Enum, E, false)
-            listener: beginMethod(DeclarationKind.Enum, null, null, null, const, null, E)
+          parseMethod(;, null, null, null, null, null, null, const, const, Instance of 'NoType', null, E, DeclarationKind.Enum, E, false)
+            listener: beginMethod(DeclarationKind.Enum, null, null, null, null, const, null, E)
             listener: handleNoType(const)
             ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
               listener: handleIdentifier(E, methodDeclaration)

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

@@ -24,7 +24,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -47,7 +47,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
             handleIdentifier(C, typeReference)
             handleNoTypeArguments(m)
             handleType(C, null)
@@ -124,7 +124,7 @@ beginCompilationUnit(class)
         beginMetadataStar(D)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, D)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
             handleNoType({)
             handleIdentifier(D, methodDeclaration)
             handleNoTypeVariables(()
@@ -147,7 +147,7 @@ beginCompilationUnit(class)
         beginMetadataStar(D)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
             handleIdentifier(D, typeReference)
             handleNoTypeArguments(m)
             handleType(D, null)

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

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -75,8 +75,8 @@ parseUnit(class)
                 listener: beginMetadataStar(C)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, m, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, m, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
                 listener: handleIdentifier(C, typeReference)
                 listener: handleNoTypeArguments(m)
                 listener: handleType(C, null)
@@ -283,8 +283,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, D, DeclarationKind.Class, D, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, D)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, D, DeclarationKind.Class, D, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(D, methodDeclaration)
@@ -326,8 +326,8 @@ parseUnit(class)
                 listener: beginMetadataStar(D)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, m, DeclarationKind.Class, D, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, m, DeclarationKind.Class, D, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
                 listener: handleIdentifier(D, typeReference)
                 listener: handleNoTypeArguments(m)
                 listener: handleType(D, null)

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

@@ -136,7 +136,7 @@ beginCompilationUnit(class)
         beginMetadataStar(foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleNoType({)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -154,7 +154,7 @@ beginCompilationUnit(class)
         beginMetadataStar(foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -181,7 +181,7 @@ beginCompilationUnit(class)
         beginMetadataStar(foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -206,7 +206,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(=>)
@@ -221,7 +221,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables({)
@@ -239,7 +239,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -258,7 +258,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -280,7 +280,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(:)
@@ -306,7 +306,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -337,7 +337,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(=>)
@@ -354,7 +354,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables({)
@@ -374,7 +374,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -393,7 +393,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -415,7 +415,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(:)
@@ -441,7 +441,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType(;)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(X, methodDeclarationContinuation)
@@ -472,7 +472,7 @@ beginCompilationUnit(class)
         beginMetadataStar(external)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo)
             handleNoType(external)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -496,7 +496,7 @@ beginCompilationUnit(class)
         beginMetadataStar(external)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, external, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, external, null, null, null, null, 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

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(.)
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -70,8 +70,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(.)
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -133,8 +133,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -191,8 +191,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -228,8 +228,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -272,8 +272,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -319,8 +319,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -373,8 +373,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -441,8 +441,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -520,8 +520,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -563,8 +563,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -613,8 +613,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -660,8 +660,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -714,8 +714,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -782,8 +782,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -862,8 +862,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, null, Foo)
+              parseMethod(}, null, null, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, Foo)
                 listener: handleNoType(external)
                 ensureIdentifierPotentiallyRecovered(external, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -919,8 +919,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(.)
-              parseMethod(;, null, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, external, null, null, null, null, Foo)
+              parseMethod(;, null, null, external, null, null, null, null, external, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, external, null, null, null, null, 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

@@ -44,7 +44,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
             handleNoType({)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -63,7 +63,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -91,7 +91,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -70,8 +70,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -134,8 +134,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', get, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, 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

@@ -40,7 +40,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleVoidKeyword(void)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -59,7 +59,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleVoidKeyword(void)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -87,7 +87,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleVoidKeyword(void)
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(void)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -70,8 +70,8 @@ parseUnit(class)
                 listener: beginMetadataStar(void)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -134,8 +134,8 @@ parseUnit(class)
                 listener: beginMetadataStar(void)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'VoidType', null, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, 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

@@ -40,7 +40,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
             handleNoType({)
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -59,7 +59,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -87,7 +87,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -70,8 +70,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -134,8 +134,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', set, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)

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

@@ -40,7 +40,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType({)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -57,7 +57,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -83,7 +83,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -101,7 +101,7 @@ beginCompilationUnit(class)
         beginMetadataStar(get)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -66,8 +66,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -126,8 +126,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -163,8 +163,8 @@ parseUnit(class)
                 listener: beginMetadataStar(get)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', get, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(get, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

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

@@ -14,7 +14,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleNoType({)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -29,7 +29,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -53,7 +53,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -70,7 +70,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)

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

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -64,8 +64,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -121,8 +121,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(.)
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -157,8 +157,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(.)
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

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

@@ -88,7 +88,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleNoType({)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -104,7 +104,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, /, /)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
             handleNoType(})
             handleOperatorName(operator, /)
             handleNoTypeVariables(:)
@@ -129,7 +129,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -151,7 +151,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, /, /)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
             handleNoType(.)
             handleOperatorName(operator, /)
             handleNoTypeVariables(:)
@@ -176,7 +176,7 @@ beginCompilationUnit(class)
         beginMetadataStar(foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -192,7 +192,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, /, /)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
             handleNoType(})
             handleOperatorName(operator, /)
             handleNoTypeVariables(:)
@@ -217,7 +217,7 @@ beginCompilationUnit(class)
         beginMetadataStar(foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleNoType(})
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -239,7 +239,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, /, /)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
             handleNoType(.)
             handleOperatorName(operator, /)
             handleNoTypeVariables(:)

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

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -68,12 +68,12 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               recoverFromInvalidMember(}, }, null, null, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo)
-                parseInvalidOperatorDeclaration(}, null, null, null, null, null, null, }, DeclarationKind.Class, Foo)
+                parseInvalidOperatorDeclaration(}, null, null, null, null, null, null, null, }, DeclarationKind.Class, Foo)
                   reportRecoverableError(/, MissingOperatorKeyword)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
-                  parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+                  parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false)
+                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
                     listener: handleNoType(})
                     parseOperatorName(})
                       listener: handleOperatorName(operator, /)
@@ -127,8 +127,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -174,12 +174,12 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               recoverFromInvalidMember(., ., null, null, null, null, null, null, null, ., Instance of 'NoType', null, DeclarationKind.Class, Foo)
-                parseInvalidOperatorDeclaration(., null, null, null, null, null, null, ., DeclarationKind.Class, Foo)
+                parseInvalidOperatorDeclaration(., null, null, null, null, null, null, null, ., DeclarationKind.Class, Foo)
                   reportRecoverableError(/, MissingOperatorKeyword)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
-                  parseMethod(., null, null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+                  parseMethod(., null, null, null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false)
+                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
                     listener: handleNoType(.)
                     parseOperatorName(.)
                       listener: handleOperatorName(operator, /)
@@ -233,8 +233,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -269,12 +269,12 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               recoverFromInvalidMember(}, }, null, null, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, Foo)
-                parseInvalidOperatorDeclaration(}, null, null, null, null, null, null, }, DeclarationKind.Class, Foo)
+                parseInvalidOperatorDeclaration(}, null, null, null, null, null, null, null, }, DeclarationKind.Class, Foo)
                   reportRecoverableError(/, MissingOperatorKeyword)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
-                  parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+                  parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false)
+                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
                     listener: handleNoType(})
                     parseOperatorName(})
                       listener: handleOperatorName(operator, /)
@@ -328,8 +328,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)
@@ -375,12 +375,12 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               recoverFromInvalidMember(., ., null, null, null, null, null, null, null, ., Instance of 'NoType', null, DeclarationKind.Class, Foo)
-                parseInvalidOperatorDeclaration(., null, null, null, null, null, null, ., DeclarationKind.Class, Foo)
+                parseInvalidOperatorDeclaration(., null, null, null, null, null, null, null, ., DeclarationKind.Class, Foo)
                   reportRecoverableError(/, MissingOperatorKeyword)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
-                  parseMethod(., null, null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+                  parseMethod(., null, null, null, null, null, null, null, ., Instance of 'NoType', null, operator, DeclarationKind.Class, Foo, false)
+                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
                     listener: handleNoType(.)
                     parseOperatorName(.)
                       listener: handleOperatorName(operator, /)

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

@@ -32,7 +32,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleVoidKeyword(void)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -48,7 +48,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleVoidKeyword(void)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -73,7 +73,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleVoidKeyword(void)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -91,7 +91,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleVoidKeyword(void)
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(void)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -64,8 +64,8 @@ parseUnit(class)
                 listener: beginMetadataStar(void)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -122,8 +122,8 @@ parseUnit(class)
                 listener: beginMetadataStar(void)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -159,8 +159,8 @@ parseUnit(class)
                 listener: beginMetadataStar(void)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'VoidType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

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

@@ -32,7 +32,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType({)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -48,7 +48,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -73,7 +73,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)
@@ -91,7 +91,7 @@ beginCompilationUnit(class)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
             handleNoType(})
             handleIdentifier(Foo, methodDeclaration)
             handleIdentifier(x, methodDeclarationContinuation)

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -64,8 +64,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -122,8 +122,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -159,8 +159,8 @@ parseUnit(class)
                 listener: beginMetadataStar(set)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, Foo)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', set, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, Foo)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)

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

@@ -36,7 +36,7 @@ beginCompilationUnit(extension)
         beginMetadataStar(bool)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Extension, null, null, null, null, null, a)
+          beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, a)
             handleIdentifier(bool, typeReference)
             handleNoTypeArguments(a)
             handleType(bool, null)
@@ -71,7 +71,7 @@ beginCompilationUnit(extension)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Extension, null, null, null, null, get, b)
+          beginMethod(DeclarationKind.Extension, null, null, null, null, null, get, b)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -87,7 +87,7 @@ beginCompilationUnit(extension)
         beginMetadataStar(set)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Extension, null, null, null, null, set, c)
+          beginMethod(DeclarationKind.Extension, null, null, null, null, null, set, c)
             handleNoType(;)
             handleIdentifier(c, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -39,8 +39,8 @@ parseUnit(extension)
               listener: beginMetadataStar(bool)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, a, DeclarationKind.Extension, E, false)
-              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, a)
+            parseMethod({, null, null, null, null, null, null, null, {, Instance of 'SimpleType', null, a, DeclarationKind.Extension, E, false)
+              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, a)
               listener: handleIdentifier(bool, typeReference)
               listener: handleNoTypeArguments(a)
               listener: handleType(bool, null)
@@ -96,8 +96,8 @@ parseUnit(extension)
               listener: beginMetadataStar(int)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, b, DeclarationKind.Extension, E, false)
-              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, get, b)
+            parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, b, DeclarationKind.Extension, E, false)
+              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, get, b)
               listener: handleIdentifier(int, typeReference)
               listener: handleNoTypeArguments(get)
               listener: handleType(int, null)
@@ -133,8 +133,8 @@ parseUnit(extension)
               listener: beginMetadataStar(set)
               listener: endMetadataStar(0)
             listener: beginMember()
-            parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', set, c, DeclarationKind.Extension, E, false)
-              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, set, c)
+            parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', set, c, DeclarationKind.Extension, E, false)
+              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, set, c)
               listener: handleNoType(;)
               ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                 listener: handleIdentifier(c, methodDeclaration)

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

@@ -72,7 +72,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
             handleNoType({)
             handleIdentifier(Foo, methodDeclaration)
             handleNoTypeVariables(()
@@ -114,7 +114,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Bar)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Bar)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Bar)
             handleNoType({)
             handleIdentifier(Bar, methodDeclaration)
             handleNoTypeVariables(()
@@ -156,7 +156,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Baz)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Baz)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Baz)
             handleNoType({)
             handleIdentifier(Baz, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -94,8 +94,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, Foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Foo, methodDeclaration)
@@ -177,8 +177,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, Bar, DeclarationKind.Class, Bar, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Bar)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, Bar, DeclarationKind.Class, Bar, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Bar)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Bar, methodDeclaration)
@@ -260,8 +260,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, Baz, DeclarationKind.Class, Baz, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Baz)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, Baz, DeclarationKind.Class, Baz, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Baz)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(Baz, methodDeclaration)

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

@@ -46,7 +46,7 @@ beginCompilationUnit(const)
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, const, null, Annotation)
+          beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Annotation)
             handleNoType(const)
             handleIdentifier(Annotation, methodDeclaration)
             handleNoTypeVariables(()
@@ -105,7 +105,7 @@ beginCompilationUnit(const)
         beginMetadataStar(m)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
             handleNoType({)
             handleIdentifier(m, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -70,8 +70,8 @@ parseUnit(const)
                 listener: beginMetadataStar(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, const, const, Instance of 'NoType', null, Annotation, DeclarationKind.Class, Annotation, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, const, null, Annotation)
+              parseMethod(;, null, null, null, null, null, null, const, const, Instance of 'NoType', null, Annotation, DeclarationKind.Class, Annotation, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, const, null, Annotation)
                 listener: handleNoType(const)
                 ensureIdentifierPotentiallyRecovered(const, methodDeclaration, false)
                   listener: handleIdentifier(Annotation, methodDeclaration)
@@ -172,8 +172,8 @@ parseUnit(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, m, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, m, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(m, methodDeclaration)

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

@@ -76,7 +76,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, a)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -109,7 +109,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, b)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -141,7 +141,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, c)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -177,7 +177,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, d)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -212,7 +212,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, e)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -251,7 +251,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, f)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -289,7 +289,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, g)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -331,7 +331,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, h)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -372,7 +372,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, i)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(i)
             handleType(int, null)
@@ -417,7 +417,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, j)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(j)
             handleType(int, null)
@@ -461,7 +461,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, k)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(k)
             handleType(int, null)
@@ -509,7 +509,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, l)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(l)
             handleType(int, null)
@@ -556,7 +556,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(m)
             handleType(int, null)
@@ -620,7 +620,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, n)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(n)
             handleType(int, null)
@@ -683,7 +683,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, o)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(o)
             handleType(int, null)
@@ -734,7 +734,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, p)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(p)
             handleType(int, null)
@@ -784,7 +784,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, q)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(q)
             handleType(int, null)
@@ -838,7 +838,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, r)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(r)
             handleType(int, null)
@@ -891,7 +891,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(s)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, s)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
             handleNoType(})
             handleIdentifier(s, methodDeclaration)
             handleNoTypeVariables(()
@@ -978,7 +978,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()
@@ -1069,7 +1069,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()
@@ -1157,7 +1157,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(not_currently_working)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, not_currently_working)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
             handleNoType(})
             handleIdentifier(not_currently_working, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -31,8 +31,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', get, a, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, a)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'SimpleType', get, a, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -118,8 +118,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, b, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, b)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, b, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -191,8 +191,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, c, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, c)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, c, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -285,8 +285,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, d, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, d)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, d, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -365,8 +365,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, e, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, e)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, e, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -471,8 +471,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, f, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, f)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, f, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -558,8 +558,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, g, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, g)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, g, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -671,8 +671,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, h, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, h)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, h, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -765,8 +765,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, i, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, i)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, i, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(i)
                 listener: handleType(int, null)
@@ -862,8 +862,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, j, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, j)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, j, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(j)
                 listener: handleType(int, null)
@@ -947,8 +947,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, k, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, k)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, k, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(k)
                 listener: handleType(int, null)
@@ -1051,8 +1051,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, l, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, l)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, l, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(l)
                 listener: handleType(int, null)
@@ -1143,8 +1143,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, m, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, m, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(m)
                 listener: handleType(int, null)
@@ -1282,8 +1282,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, n, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, n)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, n, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(n)
                 listener: handleType(int, null)
@@ -1409,8 +1409,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, o, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, o)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, o, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(o)
                 listener: handleType(int, null)
@@ -1525,8 +1525,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, p, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, p)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, p, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(p)
                 listener: handleType(int, null)
@@ -1624,8 +1624,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, q, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, q)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, q, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(q)
                 listener: handleType(int, null)
@@ -1747,8 +1747,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, r, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, r)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, r, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(r)
                 listener: handleType(int, null)
@@ -1854,8 +1854,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, s, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, s)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, s, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(s, methodDeclaration)
@@ -2092,8 +2092,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)
@@ -2337,8 +2337,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)
@@ -2546,8 +2546,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, not_currently_working, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, not_currently_working)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, not_currently_working, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(not_currently_working, methodDeclaration)

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

@@ -76,7 +76,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, a)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -109,7 +109,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, b)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -141,7 +141,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, c)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -177,7 +177,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, d)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -212,7 +212,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, e)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -251,7 +251,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, f)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -289,7 +289,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, g)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -331,7 +331,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, h)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -372,7 +372,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, i)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(i)
             handleType(int, null)
@@ -417,7 +417,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, j)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(j)
             handleType(int, null)
@@ -461,7 +461,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, k)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(k)
             handleType(int, null)
@@ -509,7 +509,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, l)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(l)
             handleType(int, null)
@@ -556,7 +556,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(m)
             handleType(int, null)
@@ -620,7 +620,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, n)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(n)
             handleType(int, null)
@@ -683,7 +683,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, o)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(o)
             handleType(int, null)
@@ -734,7 +734,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, p)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(p)
             handleType(int, null)
@@ -784,7 +784,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, q)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(q)
             handleType(int, null)
@@ -838,7 +838,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, r)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(r)
             handleType(int, null)
@@ -891,7 +891,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(s)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, s)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
             handleNoType(})
             handleIdentifier(s, methodDeclaration)
             handleNoTypeVariables(()
@@ -978,7 +978,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()
@@ -1069,7 +1069,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()
@@ -1157,7 +1157,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(not_currently_working)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, not_currently_working)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
             handleNoType(})
             handleIdentifier(not_currently_working, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -31,8 +31,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', get, a, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, a)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'SimpleType', get, a, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -118,8 +118,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, b, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, b)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, b, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -191,8 +191,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, c, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, c)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, c, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -285,8 +285,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, d, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, d)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, d, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -365,8 +365,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, e, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, e)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, e, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -472,8 +472,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, f, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, f)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, f, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -559,8 +559,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, g, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, g)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, g, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -673,8 +673,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, h, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, h)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, h, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -767,8 +767,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, i, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, i)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, i, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(i)
                 listener: handleType(int, null)
@@ -864,8 +864,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, j, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, j)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, j, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(j)
                 listener: handleType(int, null)
@@ -949,8 +949,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, k, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, k)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, k, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(k)
                 listener: handleType(int, null)
@@ -1053,8 +1053,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, l, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, l)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, l, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(l)
                 listener: handleType(int, null)
@@ -1145,8 +1145,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, m, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, m, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(m)
                 listener: handleType(int, null)
@@ -1284,8 +1284,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, n, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, n)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, n, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(n)
                 listener: handleType(int, null)
@@ -1411,8 +1411,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, o, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, o)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, o, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(o)
                 listener: handleType(int, null)
@@ -1528,8 +1528,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, p, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, p)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, p, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(p)
                 listener: handleType(int, null)
@@ -1627,8 +1627,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, q, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, q)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, q, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(q)
                 listener: handleType(int, null)
@@ -1751,8 +1751,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, r, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, r)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, r, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(r)
                 listener: handleType(int, null)
@@ -1858,8 +1858,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, s, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, s)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, s, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(s, methodDeclaration)
@@ -2096,8 +2096,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)
@@ -2341,8 +2341,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)
@@ -2550,8 +2550,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, not_currently_working, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, not_currently_working)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, not_currently_working, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(not_currently_working, methodDeclaration)

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

@@ -76,7 +76,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, a)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -109,7 +109,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, b)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -141,7 +141,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, c)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -177,7 +177,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, d)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -212,7 +212,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, e)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -251,7 +251,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, f)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -289,7 +289,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, g)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -331,7 +331,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, h)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -372,7 +372,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, i)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(i)
             handleType(int, null)
@@ -417,7 +417,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, j)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(j)
             handleType(int, null)
@@ -461,7 +461,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, k)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(k)
             handleType(int, null)
@@ -509,7 +509,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, l)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(l)
             handleType(int, null)
@@ -556,7 +556,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(m)
             handleType(int, null)
@@ -620,7 +620,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, n)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(n)
             handleType(int, null)
@@ -683,7 +683,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, o)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(o)
             handleType(int, null)
@@ -734,7 +734,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, p)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(p)
             handleType(int, null)
@@ -784,7 +784,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, q)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(q)
             handleType(int, null)
@@ -838,7 +838,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, r)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(r)
             handleType(int, null)
@@ -891,7 +891,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(s)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, s)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
             handleNoType(})
             handleIdentifier(s, methodDeclaration)
             handleNoTypeVariables(()
@@ -978,7 +978,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()
@@ -1069,7 +1069,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(Key)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
             handleNoType(})
             handleIdentifier(Key, methodDeclaration)
             handleNoTypeVariables(()
@@ -1157,7 +1157,7 @@ beginCompilationUnit(abstract)
         beginMetadataStar(not_currently_working)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, not_currently_working)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
             handleNoType(})
             handleIdentifier(not_currently_working, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -31,8 +31,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', get, a, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, a)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'SimpleType', get, a, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, a)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -118,8 +118,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, b, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, b)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, b, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, b)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -191,8 +191,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, c, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, c)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, c, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, c)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -285,8 +285,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, d, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, d)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, d, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, d)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -365,8 +365,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, e, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, e)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, e, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, e)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -472,8 +472,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, f, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, f)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, f, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, f)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -559,8 +559,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, g, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, g)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, g, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, g)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -673,8 +673,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', get, h, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, h)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', get, h, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, h)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -767,8 +767,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, i, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, i)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, i, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, i)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(i)
                 listener: handleType(int, null)
@@ -864,8 +864,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, j, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, j)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, j, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, j)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(j)
                 listener: handleType(int, null)
@@ -949,8 +949,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, k, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, k)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, k, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, k)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(k)
                 listener: handleType(int, null)
@@ -1053,8 +1053,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, l, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, l)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, l, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, l)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(l)
                 listener: handleType(int, null)
@@ -1145,8 +1145,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, m, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, m)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, m, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, m)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(m)
                 listener: handleType(int, null)
@@ -1284,8 +1284,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, n, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, n)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, n, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, n)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(n)
                 listener: handleType(int, null)
@@ -1411,8 +1411,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, o, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, o)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, o, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, o)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(o)
                 listener: handleType(int, null)
@@ -1528,8 +1528,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, p, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, p)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, p, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, p)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(p)
                 listener: handleType(int, null)
@@ -1627,8 +1627,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, q, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, q)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', null, q, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, q)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(q)
                 listener: handleType(int, null)
@@ -1751,8 +1751,8 @@ parseUnit(abstract)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, r, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, r)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, r, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, r)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(r)
                 listener: handleType(int, null)
@@ -1858,8 +1858,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, s, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, s)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, s, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, s)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(s, methodDeclaration)
@@ -2096,8 +2096,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)
@@ -2341,8 +2341,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Key)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, Key, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Key)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(Key, methodDeclaration)
@@ -2550,8 +2550,8 @@ parseUnit(abstract)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, not_currently_working, DeclarationKind.Class, Key, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, not_currently_working)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, not_currently_working, DeclarationKind.Class, Key, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, not_currently_working)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(not_currently_working, methodDeclaration)

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

@@ -25,7 +25,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, <, <)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
             handleIdentifier(co, typeReference)
             handleNoTypeArguments(operator)
             handleType(co, null)

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

@@ -31,12 +31,12 @@ parseUnit(class)
                 listener: beginMetadataStar(co)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseInvalidOperatorDeclaration({, null, null, null, null, null, null, {, DeclarationKind.Class, A)
+              parseInvalidOperatorDeclaration({, null, null, null, null, null, null, null, {, DeclarationKind.Class, A)
                 reportRecoverableError(<, MissingOperatorKeyword)
                   listener: handleRecoverableError(MissingOperatorKeyword, <, <)
                 rewriter()
-                parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, A, false)
-                  listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+                parseMethod({, null, null, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, A, false)
+                  listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
                   listener: handleIdentifier(co, typeReference)
                   listener: handleNoTypeArguments(operator)
                   listener: handleType(co, null)

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

@@ -20,7 +20,7 @@ beginCompilationUnit(class)
         beginMetadataStar(co)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
             handleIdentifier(co, typeReference)
             handleNoTypeArguments(operator)
             handleType(co, null)

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(co)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'SimpleType', null, operator, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
                 listener: handleIdentifier(co, typeReference)
                 listener: handleNoTypeArguments(operator)
                 listener: handleType(co, null)

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

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

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

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -68,12 +68,12 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               recoverFromInvalidMember(}, }, null, null, null, null, null, null, null, }, Instance of 'NoType', null, DeclarationKind.Class, C)
-                parseInvalidOperatorDeclaration(}, null, null, null, null, null, null, }, DeclarationKind.Class, C)
+                parseInvalidOperatorDeclaration(}, null, null, null, null, null, null, null, }, DeclarationKind.Class, C)
                   reportRecoverableError(/, MissingOperatorKeyword)
                     listener: handleRecoverableError(MissingOperatorKeyword, /, /)
                   rewriter()
-                  parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, C, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+                  parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, operator, DeclarationKind.Class, C, false)
+                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
                     listener: handleNoType(})
                     parseOperatorName(})
                       listener: handleOperatorName(operator, /)

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

@@ -32,7 +32,7 @@ beginCompilationUnit(class)
         beginMetadataStar(foo)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleNoType({)
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -40,8 +40,8 @@ parseUnit(UnmatchedToken(())
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, foo, DeclarationKind.Class, Foo, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)

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

@@ -20,7 +20,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Stream)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, x)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x)
             handleIdentifier(Stream, typeReference)
             beginTypeArguments(<)
               handleIdentifier(List, typeReference)

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(Stream)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'ComplexTypeInfo', null, x, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, x)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'ComplexTypeInfo', null, x, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x)
                 ensureIdentifier({, typeReference)
                   listener: handleIdentifier(Stream, typeReference)
                 listener: beginTypeArguments(<)

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

@@ -14,7 +14,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Stream)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, x)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x)
             handleIdentifier(Stream, typeReference)
             beginTypeArguments(<)
               handleIdentifier(List, typeReference)

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(Stream)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'ComplexTypeInfo', null, x, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, x)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'ComplexTypeInfo', null, x, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, x)
                 ensureIdentifier({, typeReference)
                   listener: handleIdentifier(Stream, typeReference)
                 listener: beginTypeArguments(<)

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

@@ -236,7 +236,7 @@ beginCompilationUnit(class)
         beginMetadataStar(Stream)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Stream)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Stream)
             handleIdentifier(Stream, typeReference)
             beginTypeArguments(<)
               handleIdentifier(List, typeReference)

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

@@ -257,8 +257,8 @@ parseUnit(class)
                 listener: beginMetadataStar(Stream)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'ComplexTypeInfo', null, Stream, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Stream)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'ComplexTypeInfo', null, Stream, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Stream)
                 ensureIdentifier(;, typeReference)
                   listener: handleIdentifier(Stream, typeReference)
                 listener: beginTypeArguments(<)

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

@@ -20,7 +20,7 @@ beginCompilationUnit(class)
         beginMetadataStar(stream)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, stream)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream)
             handleNoType({)
             handleIdentifier(stream, methodDeclaration)
             beginTypeVariables(<)
@@ -58,7 +58,7 @@ beginCompilationUnit(class)
         beginMetadataStar(stream2)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, stream2)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream2)
             handleNoType(})
             handleIdentifier(stream2, methodDeclaration)
             beginTypeVariables(<)
@@ -97,7 +97,7 @@ beginCompilationUnit(class)
         beginMetadataStar(stream3)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, stream3)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream3)
             handleNoType(})
             handleIdentifier(stream3, methodDeclaration)
             beginTypeVariables(<)

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

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(<)
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, stream, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, stream)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, stream, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(stream, methodDeclaration)
@@ -92,8 +92,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(<)
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, stream2, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, stream2)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, stream2, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream2)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(stream2, methodDeclaration)
@@ -156,8 +156,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(<)
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'NoType', null, stream3, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, stream3)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'NoType', null, stream3, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, stream3)
                 listener: handleNoType(})
                 ensureIdentifierPotentiallyRecovered(}, methodDeclaration, false)
                   listener: handleIdentifier(stream3, methodDeclaration)

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

@@ -18,7 +18,7 @@ beginCompilationUnit(import)
       handleImportPrefix(null, as)
       beginCombinators(;)
       endCombinators(0)
-    endImport(import, ;)
+    endImport(import, null, ;)
   endTopLevelDeclaration(main)
   beginMetadataStar(main)
   endMetadataStar(0)

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

@@ -27,7 +27,7 @@ parseUnit(import)
         parseCombinatorStar(enum)
           listener: beginCombinators(;)
           listener: endCombinators(0)
-        listener: endImport(import, ;)
+        listener: endImport(import, null, ;)
   listener: endTopLevelDeclaration(main)
   parseTopLevelDeclarationImpl(;, Instance of 'DirectiveContext')
     parseMetadataStar(;)

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

@@ -42,7 +42,7 @@ beginCompilationUnit(enum)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
             handleVoidKeyword(void)
             handleIdentifier(foo, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -67,8 +67,8 @@ parseUnit(enum)
                 listener: beginMetadataStar(void)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'VoidType', null, foo, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, foo)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'VoidType', null, foo, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, foo)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(void, methodDeclaration, false)
                   listener: handleIdentifier(foo, methodDeclaration)

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

@@ -113,7 +113,7 @@ beginCompilationUnit(import)
           handleIdentifierList(1)
         endShow(show)
       endCombinators(1)
-    endImport(import, ;)
+    endImport(import, null, ;)
   endTopLevelDeclaration(import)
   beginMetadataStar(import)
   endMetadataStar(0)
@@ -131,7 +131,7 @@ beginCompilationUnit(import)
           handleIdentifierList(1)
         endHide(hide)
       endCombinators(1)
-    endImport(import, ;)
+    endImport(import, null, ;)
   endTopLevelDeclaration(import)
   beginMetadataStar(import)
   endMetadataStar(0)
@@ -156,7 +156,7 @@ beginCompilationUnit(import)
           handleIdentifierList(1)
         endHide(hide)
       endCombinators(2)
-    endImport(import, ;)
+    endImport(import, null, ;)
   endTopLevelDeclaration(import)
   beginMetadataStar(import)
   endMetadataStar(0)
@@ -179,7 +179,7 @@ beginCompilationUnit(import)
           handleIdentifierList(1)
         endHide(hide)
       endCombinators(2)
-    endImport(import, null)
+    endImport(import, null, null)
     beginConditionalUris(as)
     endConditionalUris(0)
     handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' 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: enum}], enum, enum)
@@ -209,7 +209,7 @@ beginCompilationUnit(import)
           handleIdentifierList(3)
         endShow(show)
       endCombinators(1)
-    endImport(import, ;)
+    endImport(import, null, ;)
   endTopLevelDeclaration(import)
   beginMetadataStar(import)
   endMetadataStar(0)
@@ -230,7 +230,7 @@ beginCompilationUnit(import)
           handleIdentifierList(3)
         endHide(hide)
       endCombinators(1)
-    endImport(import, ;)
+    endImport(import, null, ;)
   endTopLevelDeclaration(import)
   beginMetadataStar(import)
   endMetadataStar(0)
@@ -261,7 +261,7 @@ beginCompilationUnit(import)
           handleIdentifierList(3)
         endHide(hide)
       endCombinators(2)
-    endImport(import, ;)
+    endImport(import, null, ;)
   endTopLevelDeclaration(import)
   beginMetadataStar(import)
   endMetadataStar(0)
@@ -290,7 +290,7 @@ beginCompilationUnit(import)
           handleIdentifierList(3)
         endHide(hide)
       endCombinators(2)
-    endImport(import, null)
+    endImport(import, null, null)
     beginConditionalUris(as)
     endConditionalUris(0)
     handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'enum' 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: enum}], enum, enum)

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

@@ -32,7 +32,7 @@ parseUnit(import)
               listener: handleIdentifierList(1)
             listener: endShow(show)
           listener: endCombinators(1)
-        listener: endImport(import, ;)
+        listener: endImport(import, null, ;)
   listener: endTopLevelDeclaration(import)
   parseTopLevelDeclarationImpl(;, Instance of 'DirectiveContext')
     parseMetadataStar(;)
@@ -64,7 +64,7 @@ parseUnit(import)
               listener: handleIdentifierList(1)
             listener: endHide(hide)
           listener: endCombinators(1)
-        listener: endImport(import, ;)
+        listener: endImport(import, null, ;)
   listener: endTopLevelDeclaration(import)
   parseTopLevelDeclarationImpl(;, Instance of 'DirectiveContext')
     parseMetadataStar(;)
@@ -109,7 +109,7 @@ parseUnit(import)
               listener: handleIdentifierList(1)
             listener: endHide(hide)
           listener: endCombinators(2)
-        listener: endImport(import, ;)
+        listener: endImport(import, null, ;)
   listener: endTopLevelDeclaration(import)
   parseTopLevelDeclarationImpl(;, Instance of 'DirectiveContext')
     parseMetadataStar(;)
@@ -150,7 +150,7 @@ parseUnit(import)
               listener: handleIdentifierList(1)
             listener: endHide(hide)
           listener: endCombinators(2)
-        listener: endImport(import, null)
+        listener: endImport(import, null, null)
         parseImportRecovery("lib.dart")
           parseConditionalUriStar("lib.dart")
           parseImportPrefixOpt("lib.dart")
@@ -216,7 +216,7 @@ parseUnit(import)
               listener: handleIdentifierList(3)
             listener: endShow(show)
           listener: endCombinators(1)
-        listener: endImport(import, ;)
+        listener: endImport(import, null, ;)
   listener: endTopLevelDeclaration(import)
   parseTopLevelDeclarationImpl(;, Instance of 'DirectiveContext')
     parseMetadataStar(;)
@@ -254,7 +254,7 @@ parseUnit(import)
               listener: handleIdentifierList(3)
             listener: endHide(hide)
           listener: endCombinators(1)
-        listener: endImport(import, ;)
+        listener: endImport(import, null, ;)
   listener: endTopLevelDeclaration(import)
   parseTopLevelDeclarationImpl(;, Instance of 'DirectiveContext')
     parseMetadataStar(;)
@@ -311,7 +311,7 @@ parseUnit(import)
               listener: handleIdentifierList(3)
             listener: endHide(hide)
           listener: endCombinators(2)
-        listener: endImport(import, ;)
+        listener: endImport(import, null, ;)
   listener: endTopLevelDeclaration(import)
   parseTopLevelDeclarationImpl(;, Instance of 'DirectiveContext')
     parseMetadataStar(;)
@@ -364,7 +364,7 @@ parseUnit(import)
               listener: handleIdentifierList(3)
             listener: endHide(hide)
           listener: endCombinators(2)
-        listener: endImport(import, null)
+        listener: endImport(import, null, null)
         parseImportRecovery("lib.dart")
           parseConditionalUriStar("lib.dart")
           parseImportPrefixOpt("lib.dart")

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

@@ -40,7 +40,7 @@ beginCompilationUnit(class)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, A)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
             handleNoType({)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()
@@ -63,7 +63,7 @@ beginCompilationUnit(class)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, A)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleIdentifier(y, methodDeclarationContinuation)
@@ -105,7 +105,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, B)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B)
             handleNoType({)
             handleIdentifier(B, methodDeclaration)
             handleNoTypeVariables(()
@@ -169,7 +169,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B2)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, B2)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2)
             handleNoType({)
             handleIdentifier(B2, methodDeclaration)
             handleNoTypeVariables(()
@@ -235,7 +235,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B3)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, B3)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
             handleNoType({)
             handleIdentifier(B3, methodDeclaration)
             handleNoTypeVariables(()
@@ -284,7 +284,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B3)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, B3)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
             handleNoType(;)
             handleIdentifier(B3, methodDeclaration)
             handleIdentifier(y, methodDeclarationContinuation)
@@ -337,7 +337,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
             handleNoType(;)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -401,7 +401,7 @@ beginCompilationUnit(class)
         beginMetadataStar(D)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, D)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
             handleNoType({)
             handleIdentifier(D, methodDeclaration)
             handleNoTypeVariables(()
@@ -479,7 +479,7 @@ beginCompilationUnit(class)
         beginMetadataStar(E)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, E)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E)
             handleNoType(;)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, A)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, A, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -74,8 +74,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(.)
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, A)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, A, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -150,8 +150,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, B, DeclarationKind.Class, B, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, B)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, B, DeclarationKind.Class, B, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B, methodDeclaration)
@@ -283,8 +283,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, B2, DeclarationKind.Class, B2, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, B2)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, B2, DeclarationKind.Class, B2, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B2, methodDeclaration)
@@ -424,8 +424,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, B3, DeclarationKind.Class, B3, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, B3)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, B3, DeclarationKind.Class, B3, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B3, methodDeclaration)
@@ -534,8 +534,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(.)
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, B3, DeclarationKind.Class, B3, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, B3)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, B3, DeclarationKind.Class, B3, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(B3, methodDeclaration)
@@ -627,8 +627,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -760,8 +760,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, D, DeclarationKind.Class, D, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, D)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, D, DeclarationKind.Class, D, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(D, methodDeclaration)
@@ -913,8 +913,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, E, DeclarationKind.Class, E, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, E)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, E, DeclarationKind.Class, E, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(E, methodDeclaration)

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

@@ -14,7 +14,7 @@ beginCompilationUnit(class)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, A)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
             handleNoType({)
             handleIdentifier(A, methodDeclaration)
             handleNoTypeVariables(()
@@ -37,7 +37,7 @@ beginCompilationUnit(class)
         beginMetadataStar(A)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, A)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
             handleNoType(;)
             handleIdentifier(A, methodDeclaration)
             handleIdentifier(y, methodDeclarationContinuation)
@@ -79,7 +79,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, B)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B)
             handleNoType({)
             handleIdentifier(B, methodDeclaration)
             handleNoTypeVariables(()
@@ -142,7 +142,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B2)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, B2)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2)
             handleNoType({)
             handleIdentifier(B2, methodDeclaration)
             handleNoTypeVariables(()
@@ -207,7 +207,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B3)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, B3)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
             handleNoType({)
             handleIdentifier(B3, methodDeclaration)
             handleNoTypeVariables(()
@@ -255,7 +255,7 @@ beginCompilationUnit(class)
         beginMetadataStar(B3)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, B3)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
             handleNoType(;)
             handleIdentifier(B3, methodDeclaration)
             handleIdentifier(y, methodDeclarationContinuation)
@@ -308,7 +308,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
             handleNoType(;)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -371,7 +371,7 @@ beginCompilationUnit(class)
         beginMetadataStar(D)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, D)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
             handleNoType({)
             handleIdentifier(D, methodDeclaration)
             handleNoTypeVariables(()
@@ -448,7 +448,7 @@ beginCompilationUnit(class)
         beginMetadataStar(E)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, E)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E)
             handleNoType(;)
             handleIdentifier(E, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, A)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, A, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -74,8 +74,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(.)
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, A, DeclarationKind.Class, A, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, A)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, A, DeclarationKind.Class, A, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, A)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(A, methodDeclaration)
@@ -150,8 +150,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, B, DeclarationKind.Class, B, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, B)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, B, DeclarationKind.Class, B, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B, methodDeclaration)
@@ -280,8 +280,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, B2, DeclarationKind.Class, B2, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, B2)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, B2, DeclarationKind.Class, B2, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B2)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B2, methodDeclaration)
@@ -418,8 +418,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, B3, DeclarationKind.Class, B3, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, B3)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, B3, DeclarationKind.Class, B3, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(B3, methodDeclaration)
@@ -525,8 +525,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(.)
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, B3, DeclarationKind.Class, B3, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, B3)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, B3, DeclarationKind.Class, B3, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, B3)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(B3, methodDeclaration)
@@ -618,8 +618,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -748,8 +748,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, D, DeclarationKind.Class, D, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, D)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, D, DeclarationKind.Class, D, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, D)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(D, methodDeclaration)
@@ -898,8 +898,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, E, DeclarationKind.Class, E, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, E)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, E, DeclarationKind.Class, E, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, E)
                 listener: handleNoType(;)
                 ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                   listener: handleIdentifier(E, methodDeclaration)

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

@@ -84,7 +84,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -144,7 +144,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -179,7 +179,7 @@ beginCompilationUnit(class)
         endMetadataStar(0)
         beginMember()
           handleRecoverableError(MissingOperatorKeyword, =, =)
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
             handleNoType(null)
             handleRecoverableError(Message[InvalidOperator, The string '=' isn't a user-definable operator., null, {lexeme: =}], =, =)
             handleInvalidOperatorName(operator, =)
@@ -223,7 +223,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()
@@ -258,7 +258,7 @@ beginCompilationUnit(class)
         beginMetadataStar(C)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
             handleNoType({)
             handleIdentifier(C, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -32,8 +32,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -153,8 +153,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -238,12 +238,12 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               recoverFromInvalidMember(null, null, null, null, null, null, null, null, null, null, Instance of 'NoType', null, DeclarationKind.Class, C)
-                parseInvalidOperatorDeclaration(null, null, null, null, null, null, null, null, DeclarationKind.Class, C)
+                parseInvalidOperatorDeclaration(null, null, null, null, null, null, null, null, null, DeclarationKind.Class, C)
                   reportRecoverableError(=, MissingOperatorKeyword)
                     listener: handleRecoverableError(MissingOperatorKeyword, =, =)
                   rewriter()
-                  parseMethod(null, null, null, null, null, null, null, null, Instance of 'NoType', null, operator, DeclarationKind.Class, C, false)
-                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+                  parseMethod(null, null, null, null, null, null, null, null, null, Instance of 'NoType', null, operator, DeclarationKind.Class, C, false)
+                    listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
                     listener: handleNoType(null)
                     parseOperatorName(null)
                       isUnaryMinus(=)
@@ -332,8 +332,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)
@@ -408,8 +408,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, C)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, C, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, C)
                 listener: handleNoType({)
                 ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                   listener: handleIdentifier(C, methodDeclaration)

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

@@ -496,7 +496,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, abstract)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(abstract)
             handleType(int, null)
@@ -554,7 +554,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, as)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(as)
             handleType(int, null)
@@ -612,7 +612,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, assert)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, assert)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(assert)
             handleType(int, null)
@@ -669,7 +669,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, async)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, async)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(async)
             handleType(int, null)
@@ -727,7 +727,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, await)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, await)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(await)
             handleType(int, null)
@@ -785,7 +785,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, break)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, break)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(break)
             handleType(int, null)
@@ -850,7 +850,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, case)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, case)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(case)
             handleType(int, null)
@@ -910,7 +910,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, catch)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, catch)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(catch)
             handleType(int, null)
@@ -970,7 +970,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, class)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, class)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(class)
             handleType(int, null)
@@ -1030,7 +1030,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, const)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, const)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(const)
             handleType(int, null)
@@ -1094,7 +1094,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, continue)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, continue)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(continue)
             handleType(int, null)
@@ -1159,7 +1159,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, covariant)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(covariant)
             handleType(int, null)
@@ -1217,7 +1217,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, default)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, default)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(default)
             handleType(int, null)
@@ -1277,7 +1277,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, deferred)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(deferred)
             handleType(int, null)
@@ -1335,7 +1335,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, do)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, do)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(do)
             handleType(int, null)
@@ -1410,7 +1410,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, dynamic)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(dynamic)
             handleType(int, null)
@@ -1468,7 +1468,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, else)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, else)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(else)
             handleType(int, null)
@@ -1538,7 +1538,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, enum)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, enum)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(enum)
             handleType(int, null)
@@ -1598,7 +1598,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, export)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(export)
             handleType(int, null)
@@ -1656,7 +1656,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, extends)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extends)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(extends)
             handleType(int, null)
@@ -1716,7 +1716,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, extension)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extension)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(extension)
             handleType(int, null)
@@ -1774,7 +1774,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, external)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(external)
             handleType(int, null)
@@ -1832,7 +1832,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, factory)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(factory)
             handleType(int, null)
@@ -1890,7 +1890,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, false)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, false)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(false)
             handleType(int, null)
@@ -1949,7 +1949,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, final)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, final)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(final)
             handleType(int, null)
@@ -2036,7 +2036,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, finally)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, finally)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(finally)
             handleType(int, null)
@@ -2096,7 +2096,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, for)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, for)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(for)
             handleType(int, null)
@@ -2176,7 +2176,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, Function)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(Function)
             handleType(int, null)
@@ -2234,7 +2234,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, get)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -2292,7 +2292,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, hide)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, hide)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(hide)
             handleType(int, null)
@@ -2350,7 +2350,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, if)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, if)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(if)
             handleType(int, null)
@@ -2421,7 +2421,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, implements)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(implements)
             handleType(int, null)
@@ -2479,7 +2479,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, import)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(import)
             handleType(int, null)
@@ -2537,7 +2537,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, in)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, in)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(in)
             handleType(int, null)
@@ -2597,7 +2597,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, inout)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, inout)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(inout)
             handleType(int, null)
@@ -2655,7 +2655,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, interface)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(interface)
             handleType(int, null)
@@ -2713,7 +2713,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, is)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, is)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(is)
             handleType(int, null)
@@ -2782,7 +2782,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, late)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(late)
             handleType(int, null)
@@ -2840,7 +2840,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, library)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(library)
             handleType(int, null)
@@ -2898,7 +2898,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, mixin)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(mixin)
             handleType(int, null)
@@ -2956,7 +2956,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, native)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, native)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(native)
             handleType(int, null)
@@ -3014,7 +3014,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, new)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, new)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(new)
             handleType(int, null)
@@ -3078,7 +3078,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, null)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, null)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(null)
             handleType(int, null)
@@ -3137,7 +3137,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, of)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, of)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(of)
             handleType(int, null)
@@ -3195,7 +3195,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, on)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, on)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(on)
             handleType(int, null)
@@ -3253,7 +3253,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(operator)
             handleType(int, null)
@@ -3311,7 +3311,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, out)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, out)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(out)
             handleType(int, null)
@@ -3369,7 +3369,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, part)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(part)
             handleType(int, null)
@@ -3427,7 +3427,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, patch)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, patch)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(patch)
             handleType(int, null)
@@ -3485,7 +3485,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, required)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(required)
             handleType(int, null)
@@ -3543,7 +3543,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, rethrow)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, rethrow)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(rethrow)
             handleType(int, null)
@@ -3603,7 +3603,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, return)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, return)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(return)
             handleType(int, null)
@@ -3659,7 +3659,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, set)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(set)
             handleType(int, null)
@@ -3717,7 +3717,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, show)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, show)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(show)
             handleType(int, null)
@@ -3775,7 +3775,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, source)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, source)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(source)
             handleType(int, null)
@@ -3833,7 +3833,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, static)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(static)
             handleType(int, null)
@@ -3904,7 +3904,7 @@ beginCompilationUnit(class)
         beginMetadataStar(()
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, ()
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ()
             handleNoType(;)
             handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got '('., Try inserting an identifier before '('., {lexeme: (}], (, ()
             handleIdentifier(, methodDeclaration)
@@ -3961,7 +3961,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, switch)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, switch)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(switch)
             handleType(int, null)
@@ -4033,7 +4033,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, sync)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, sync)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(sync)
             handleType(int, null)
@@ -4104,7 +4104,7 @@ beginCompilationUnit(class)
         beginMetadataStar(()
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, ()
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ()
             handleNoType(;)
             handleRecoverableError(Message[ExpectedIdentifier, Expected an identifier, but got '('., Try inserting an identifier before '('., {lexeme: (}], (, ()
             handleIdentifier(, methodDeclaration)
@@ -4161,7 +4161,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, throw)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, throw)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(throw)
             handleType(int, null)
@@ -4217,7 +4217,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, true)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, true)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(true)
             handleType(int, null)
@@ -4276,7 +4276,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, try)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, try)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(try)
             handleType(int, null)
@@ -4344,7 +4344,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, typedef)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(typedef)
             handleType(int, null)
@@ -4402,7 +4402,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, var)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, var)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(var)
             handleType(int, null)
@@ -4489,7 +4489,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, void)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, void)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(void)
             handleType(int, null)
@@ -4576,7 +4576,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, while)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, while)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(while)
             handleType(int, null)
@@ -4647,7 +4647,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, with)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(with)
             handleType(int, null)
@@ -4707,7 +4707,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, yield)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, yield)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(yield)
             handleType(int, null)

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, abstract, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, abstract)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'SimpleType', null, abstract, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, abstract)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(abstract)
                 listener: handleType(int, null)
@@ -175,8 +175,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, as, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, as)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, as, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, as)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(as)
                 listener: handleType(int, null)
@@ -321,8 +321,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(assert)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, assert, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, assert)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, assert, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, assert)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(assert)
                 listener: handleType(int, null)
@@ -458,8 +458,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, async, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, async)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, async, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, async)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(async)
                 listener: handleType(int, null)
@@ -602,8 +602,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, await, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, await)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, await, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, await)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(await)
                 listener: handleType(int, null)
@@ -751,8 +751,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(break)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, break, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, break)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, break, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, break)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(break)
                 listener: handleType(int, null)
@@ -930,8 +930,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(case)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, case, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, case)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, case, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, case)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(case)
                 listener: handleType(int, null)
@@ -1077,8 +1077,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(catch)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, catch, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, catch)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, catch, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, catch)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(catch)
                 listener: handleType(int, null)
@@ -1224,8 +1224,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(class)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, class, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, class)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, class, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, class)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(class)
                 listener: handleType(int, null)
@@ -1371,8 +1371,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(const)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, const, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, const)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, const, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, const)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(const)
                 listener: handleType(int, null)
@@ -1523,8 +1523,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(continue)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, continue, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, continue)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, continue, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, continue)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(continue)
                 listener: handleType(int, null)
@@ -1700,8 +1700,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, covariant, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, covariant)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, covariant, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, covariant)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(covariant)
                 listener: handleType(int, null)
@@ -1846,8 +1846,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(default)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, default, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, default)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, default, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, default)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(default)
                 listener: handleType(int, null)
@@ -1991,8 +1991,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, deferred, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, deferred)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, deferred, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, deferred)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(deferred)
                 listener: handleType(int, null)
@@ -2137,8 +2137,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(do)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, do, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, do)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, do, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, do)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(do)
                 listener: handleType(int, null)
@@ -2338,8 +2338,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, dynamic, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, dynamic)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, dynamic, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, dynamic)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(dynamic)
                 listener: handleType(int, null)
@@ -2484,8 +2484,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(else)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, else, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, else)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, else, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, else)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(else)
                 listener: handleType(int, null)
@@ -2681,8 +2681,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(enum)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, enum, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, enum)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, enum, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, enum)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(enum)
                 listener: handleType(int, null)
@@ -2826,8 +2826,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, export, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, export)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, export, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, export)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(export)
                 listener: handleType(int, null)
@@ -2972,8 +2972,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(extends)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, extends, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, extends)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, extends, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extends)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(extends)
                 listener: handleType(int, null)
@@ -3117,8 +3117,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, extension, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, extension)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, extension, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, extension)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(extension)
                 listener: handleType(int, null)
@@ -3261,8 +3261,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, external, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, external)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, external, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, external)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(external)
                 listener: handleType(int, null)
@@ -3405,8 +3405,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, factory, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, factory)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, factory, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, factory)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(factory)
                 listener: handleType(int, null)
@@ -3551,8 +3551,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(false)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, false, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, false)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, false, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, false)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(false)
                 listener: handleType(int, null)
@@ -3693,8 +3693,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(final)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, final, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, final)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, final, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, final)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(final)
                 listener: handleType(int, null)
@@ -3932,8 +3932,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(finally)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, finally, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, finally)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, finally, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, finally)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(finally)
                 listener: handleType(int, null)
@@ -4079,8 +4079,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(for)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, for, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, for)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, for, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, for)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(for)
                 listener: handleType(int, null)
@@ -4291,8 +4291,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, Function, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, Function)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, Function, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, Function)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(Function)
                 listener: handleType(int, null)
@@ -4436,8 +4436,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, get, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, get, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, get)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -4580,8 +4580,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, hide, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, hide)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, hide, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, hide)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(hide)
                 listener: handleType(int, null)
@@ -4726,8 +4726,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(if)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, if, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, if)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, if, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, if)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(if)
                 listener: handleType(int, null)
@@ -4909,8 +4909,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, implements, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, implements)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, implements, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, implements)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(implements)
                 listener: handleType(int, null)
@@ -5053,8 +5053,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, import, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, import)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, import, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, import)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(import)
                 listener: handleType(int, null)
@@ -5199,8 +5199,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(in)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, in, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, in)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, in, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, in)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(in)
                 listener: handleType(int, null)
@@ -5344,8 +5344,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, inout, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, inout)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, inout, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, inout)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(inout)
                 listener: handleType(int, null)
@@ -5488,8 +5488,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, interface, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, interface)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, interface, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, interface)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(interface)
                 listener: handleType(int, null)
@@ -5634,8 +5634,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(is)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, is, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, is)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, is, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, is)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(is)
                 listener: handleType(int, null)
@@ -5811,8 +5811,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, late, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, late)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, late, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, late)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(late)
                 listener: handleType(int, null)
@@ -5955,8 +5955,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, library, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, library)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, library, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, library)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(library)
                 listener: handleType(int, null)
@@ -6099,8 +6099,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, mixin, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, mixin)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, mixin, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, mixin)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(mixin)
                 listener: handleType(int, null)
@@ -6243,8 +6243,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, native, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, native)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, native, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, native)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(native)
                 listener: handleType(int, null)
@@ -6389,8 +6389,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(new)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, new, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, new)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, new, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, new)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(new)
                 listener: handleType(int, null)
@@ -6542,8 +6542,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(null)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, null, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, null, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, null)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(null)
                 listener: handleType(int, null)
@@ -6682,8 +6682,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, of, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, of)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, of, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, of)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(of)
                 listener: handleType(int, null)
@@ -6826,8 +6826,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, on, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, on)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, on, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, on)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(on)
                 listener: handleType(int, null)
@@ -6971,9 +6971,9 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isUnaryMinus(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, operator, DeclarationKind.Class, WrapperClass, false)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, operator, DeclarationKind.Class, WrapperClass, false)
                 isUnaryMinus(()
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, operator)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, operator)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(operator)
                 listener: handleType(int, null)
@@ -7116,8 +7116,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, out, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, out)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, out, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, out)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(out)
                 listener: handleType(int, null)
@@ -7260,8 +7260,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, part, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, part)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, part, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, part)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(part)
                 listener: handleType(int, null)
@@ -7404,8 +7404,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, patch, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, patch)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, patch, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, patch)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(patch)
                 listener: handleType(int, null)
@@ -7548,8 +7548,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, required, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, required)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, required, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, required)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(required)
                 listener: handleType(int, null)
@@ -7694,8 +7694,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(rethrow)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, rethrow, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, rethrow)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, rethrow, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, rethrow)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(rethrow)
                 listener: handleType(int, null)
@@ -7841,8 +7841,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(return)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, return, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, return)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, return, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, return)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(return)
                 listener: handleType(int, null)
@@ -7983,8 +7983,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               isReservedKeyword(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, set, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, set, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, set)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(set)
                 listener: handleType(int, null)
@@ -8127,8 +8127,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, show, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, show)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, show, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, show)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(show)
                 listener: handleType(int, null)
@@ -8271,8 +8271,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, source, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, source)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, source, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, source)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(source)
                 listener: handleType(int, null)
@@ -8415,8 +8415,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, static, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, static)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, static, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, static)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(static)
                 listener: handleType(int, null)
@@ -8584,8 +8584,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               recoverFromInvalidMember(;, ;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, DeclarationKind.Class, WrapperClass)
-                parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, (, DeclarationKind.Class, WrapperClass, false)
-                  listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, ()
+                parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, (, DeclarationKind.Class, WrapperClass, false)
+                  listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ()
                   listener: handleNoType(;)
                   ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                     insertSyntheticIdentifier(;, methodDeclaration, message: null, messageOnToken: null)
@@ -8725,8 +8725,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(switch)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, switch, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, switch)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, switch, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, switch)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(switch)
                 listener: handleType(int, null)
@@ -8917,8 +8917,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, sync, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, sync)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, sync, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, sync)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(sync)
                 listener: handleType(int, null)
@@ -9086,8 +9086,8 @@ parseUnit(class)
                 listener: endMetadataStar(0)
               listener: beginMember()
               recoverFromInvalidMember(;, ;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, DeclarationKind.Class, WrapperClass)
-                parseMethod(;, null, null, null, null, null, null, ;, Instance of 'NoType', null, (, DeclarationKind.Class, WrapperClass, false)
-                  listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, ()
+                parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'NoType', null, (, DeclarationKind.Class, WrapperClass, false)
+                  listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, ()
                   listener: handleNoType(;)
                   ensureIdentifierPotentiallyRecovered(;, methodDeclaration, false)
                     insertSyntheticIdentifier(;, methodDeclaration, message: null, messageOnToken: null)
@@ -9227,8 +9227,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(throw)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, throw, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, throw)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, throw, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, throw)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(throw)
                 listener: handleType(int, null)
@@ -9369,8 +9369,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(true)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, true, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, true)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, true, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, true)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(true)
                 listener: handleType(int, null)
@@ -9511,8 +9511,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(try)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, try, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, try)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, try, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, try)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(try)
                 listener: handleType(int, null)
@@ -9694,8 +9694,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, typedef, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, typedef)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, typedef, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, typedef)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(typedef)
                 listener: handleType(int, null)
@@ -9840,8 +9840,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(var)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, var, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, var)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, var, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, var)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(var)
                 listener: handleType(int, null)
@@ -10079,8 +10079,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(void)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, void, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, void)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, void, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, void)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(void)
                 listener: handleType(int, null)
@@ -10319,8 +10319,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(while)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, while, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, while)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, while, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, while)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(while)
                 listener: handleType(int, null)
@@ -10504,8 +10504,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(with)
               indicatesMethodOrField(()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, with, DeclarationKind.Class, WrapperClass, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, with)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, with, DeclarationKind.Class, WrapperClass, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(with)
                 listener: handleType(int, null)
@@ -10649,8 +10649,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(}, null, null, null, null, null, null, }, Instance of 'SimpleType', null, yield, DeclarationKind.Class, WrapperClass, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, yield)
+              parseMethod(}, null, null, null, null, null, null, null, }, Instance of 'SimpleType', null, yield, DeclarationKind.Class, WrapperClass, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, yield)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(yield)
                 listener: handleType(int, null)

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

@@ -40,7 +40,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, with)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(with)
             handleType(int, null)
@@ -72,7 +72,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, with)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, with)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -89,7 +89,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, with)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, with)
             handleVoidKeyword(void)
             handleRecoverableError(Message[ExpectedIdentifierButGotKeyword, 'with' 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: with}], with, with)
             handleIdentifier(with, methodDeclaration)

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

@@ -33,8 +33,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(with)
               indicatesMethodOrField(()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, with, DeclarationKind.Class, C, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, with)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'SimpleType', null, with, DeclarationKind.Class, C, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, with)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(with)
                 listener: handleType(int, null)
@@ -105,8 +105,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(with)
               indicatesMethodOrField(=>)
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, with, DeclarationKind.Class, C, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, with)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, with, DeclarationKind.Class, C, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, with)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -146,8 +146,8 @@ parseUnit(class)
               listener: beginMember()
               isReservedKeyword(with)
               indicatesMethodOrField(()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'VoidType', set, with, DeclarationKind.Class, C, true)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, with)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'VoidType', set, with, DeclarationKind.Class, C, true)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, with)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, true)
                   reportRecoverableErrorWithToken(with, Instance of 'Template<(Token) => Message>')

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

@@ -14,7 +14,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, null, With)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, null, With)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(With)
             handleType(int, null)
@@ -44,7 +44,7 @@ beginCompilationUnit(class)
         beginMetadataStar(int)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, get, With)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, get, With)
             handleIdentifier(int, typeReference)
             handleNoTypeArguments(get)
             handleType(int, null)
@@ -60,7 +60,7 @@ beginCompilationUnit(class)
         beginMetadataStar(void)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Class, null, null, null, null, set, With)
+          beginMethod(DeclarationKind.Class, null, null, null, null, null, set, With)
             handleVoidKeyword(void)
             handleIdentifier(With, methodDeclaration)
             handleNoTypeVariables(()

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

@@ -31,8 +31,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod({, null, null, null, null, null, null, {, Instance of 'SimpleType', null, With, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, With)
+              parseMethod({, null, null, null, null, null, null, null, {, Instance of 'SimpleType', null, With, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, null, With)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(With)
                 listener: handleType(int, null)
@@ -95,8 +95,8 @@ parseUnit(class)
                 listener: beginMetadataStar(int)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, With, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, get, With)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'SimpleType', get, With, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, get, With)
                 listener: handleIdentifier(int, typeReference)
                 listener: handleNoTypeArguments(get)
                 listener: handleType(int, null)
@@ -132,8 +132,8 @@ parseUnit(class)
                 listener: beginMetadataStar(void)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              parseMethod(;, null, null, null, null, null, null, ;, Instance of 'VoidType', set, With, DeclarationKind.Class, C, false)
-                listener: beginMethod(DeclarationKind.Class, null, null, null, null, set, With)
+              parseMethod(;, null, null, null, null, null, null, null, ;, Instance of 'VoidType', set, With, DeclarationKind.Class, C, false)
+                listener: beginMethod(DeclarationKind.Class, null, null, null, null, null, set, With)
                 listener: handleVoidKeyword(void)
                 ensureIdentifierPotentiallyRecovered(set, methodDeclaration, false)
                   listener: handleIdentifier(With, methodDeclaration)

pkg/front_end/parser_testcases/extension_named_type.dart.expect

@@ -27,7 +27,7 @@ beginCompilationUnit(class)
         beginMetadataStar(method)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Extension, null, null, null, null, null, method)
+          beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, method)
             handleNoType({)
             handleIdentifier(method, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/extension_named_type.dart.intertwined.expect

@@ -51,8 +51,8 @@ parseUnit(class)
               listener: endMetadataStar(0)
             listener: beginMember()
             isReservedKeyword(()
-            parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, method, DeclarationKind.Extension, type, false)
-              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, method)
+            parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, method, DeclarationKind.Extension, type, false)
+              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, method)
               listener: handleNoType({)
               ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                 listener: handleIdentifier(method, methodDeclaration)

pkg/front_end/parser_testcases/extensions/covariant.dart.expect

@@ -50,7 +50,7 @@ beginCompilationUnit(class)
         beginMetadataStar(addChild)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Extension, null, null, null, null, null, addChild)
+          beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild)
             handleNoType({)
             handleIdentifier(addChild, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/extensions/covariant.dart.intertwined.expect

@@ -81,8 +81,8 @@ parseUnit(class)
               listener: endMetadataStar(0)
             listener: beginMember()
             isReservedKeyword(()
-            parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false)
-              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, addChild)
+            parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false)
+              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild)
               listener: handleNoType({)
               ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                 listener: handleIdentifier(addChild, methodDeclaration)

pkg/front_end/parser_testcases/extensions/not_covariant.dart.expect

@@ -44,7 +44,7 @@ beginCompilationUnit(class)
         beginMetadataStar(addChild)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Extension, null, null, null, null, null, addChild)
+          beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild)
             handleNoType({)
             handleIdentifier(addChild, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/extensions/not_covariant.dart.intertwined.expect

@@ -81,8 +81,8 @@ parseUnit(class)
               listener: endMetadataStar(0)
             listener: beginMember()
             isReservedKeyword(()
-            parseMethod({, null, null, null, null, null, null, {, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false)
-              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, addChild)
+            parseMethod({, null, null, null, null, null, null, null, {, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false)
+              listener: beginMethod(DeclarationKind.Extension, null, null, null, null, null, null, addChild)
               listener: handleNoType({)
               ensureIdentifierPotentiallyRecovered({, methodDeclaration, false)
                 listener: handleIdentifier(addChild, methodDeclaration)

pkg/front_end/parser_testcases/extensions/static.dart.expect

@@ -44,7 +44,7 @@ beginCompilationUnit(class)
         beginMetadataStar(static)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Extension, null, static, null, null, null, addChild)
+          beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild)
             handleNoType(static)
             handleIdentifier(addChild, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/extensions/static.dart.intertwined.expect

@@ -81,8 +81,8 @@ parseUnit(class)
               listener: endMetadataStar(0)
             listener: beginMember()
             isReservedKeyword(()
-            parseMethod({, null, null, static, null, null, null, static, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false)
-              listener: beginMethod(DeclarationKind.Extension, null, static, null, null, null, addChild)
+            parseMethod({, null, null, null, static, null, null, null, static, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false)
+              listener: beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild)
               listener: handleNoType(static)
               ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
                 listener: handleIdentifier(addChild, methodDeclaration)

pkg/front_end/parser_testcases/extensions/static_covariant.dart.expect

@@ -50,7 +50,7 @@ beginCompilationUnit(class)
         beginMetadataStar(static)
         endMetadataStar(0)
         beginMember()
-          beginMethod(DeclarationKind.Extension, null, static, null, null, null, addChild)
+          beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild)
             handleNoType(static)
             handleIdentifier(addChild, methodDeclaration)
             handleNoTypeVariables(()

pkg/front_end/parser_testcases/extensions/static_covariant.dart.intertwined.expect

@@ -81,8 +81,8 @@ parseUnit(class)
               listener: endMetadataStar(0)
             listener: beginMember()
             isReservedKeyword(()
-            parseMethod({, null, null, static, null, null, null, static, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false)
-              listener: beginMethod(DeclarationKind.Extension, null, static, null, null, null, addChild)
+            parseMethod({, null, null, null, static, null, null, null, static, Instance of 'NoType', null, addChild, DeclarationKind.Extension, null, false)
+              listener: beginMethod(DeclarationKind.Extension, null, null, static, null, null, null, addChild)
               listener: handleNoType(static)
               ensureIdentifierPotentiallyRecovered(static, methodDeclaration, false)
                 listener: handleIdentifier(addChild, methodDeclaration)