cleanup parser forwarding and test listeners

Change-Id: I593f8bf862179684a031c9538def62c8415c0d77
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/103483
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Dan Rubel <[email protected]>

Author: Dan Rubel

pkg/analyzer/test/generated/parser_fasta_listener.dart

@@ -107,19 +107,19 @@ class ForwardingTestListener extends ForwardingListener {
     begin('CatchClause');
   }
 
-  @override
-  void beginClassOrMixinBody(Token token) {
-    super.beginClassOrMixinBody(token);
-    begin('ClassOrMixinBody');
-  }
-
   @override
   void beginClassDeclaration(
       Token beginToken, Token abstractToken, Token name) {
     super.beginClassDeclaration(beginToken, abstractToken, name);
     begin('ClassDeclaration');
   }
 
+  @override
+  void beginClassOrMixinBody(Token token) {
+    super.beginClassOrMixinBody(token);
+    begin('ClassOrMixinBody');
+  }
+
   @override
   void beginClassOrNamedMixinApplication(Token token) {
     super.beginClassOrNamedMixinApplication(token);
@@ -231,18 +231,6 @@ class ForwardingTestListener extends ForwardingListener {
     begin('ForInExpression');
   }
 
-  @override
-  void beginForStatement(Token token) {
-    super.beginForStatement(token);
-    begin('ForStatement');
-  }
-
-  @override
-  void beginForStatementBody(Token token) {
-    super.beginForStatementBody(token);
-    begin('ForStatementBody');
-  }
-
   @override
   void beginFormalParameter(Token token, MemberKind kind, Token requiredToken,
       Token covariantToken, Token varFinalOrConst) {
@@ -258,15 +246,15 @@ class ForwardingTestListener extends ForwardingListener {
   }
 
   @override
-  void beginIfControlFlow(Token ifToken) {
-    super.beginIfControlFlow(ifToken);
-    begin('IfControlFlow');
+  void beginForStatement(Token token) {
+    super.beginForStatement(token);
+    begin('ForStatement');
   }
 
   @override
-  void beginLocalFunctionDeclaration(Token token) {
-    super.beginLocalFunctionDeclaration(token);
-    begin('LocalFunctionDeclaration');
+  void beginForStatementBody(Token token) {
+    super.beginForStatementBody(token);
+    begin('ForStatementBody');
   }
 
   @override
@@ -305,6 +293,12 @@ class ForwardingTestListener extends ForwardingListener {
     begin('Hide');
   }
 
+  @override
+  void beginIfControlFlow(Token ifToken) {
+    super.beginIfControlFlow(ifToken);
+    begin('IfControlFlow');
+  }
+
   @override
   void beginIfStatement(Token token) {
     super.beginIfStatement(token);
@@ -359,6 +353,12 @@ class ForwardingTestListener extends ForwardingListener {
     begin('LiteralSymbol');
   }
 
+  @override
+  void beginLocalFunctionDeclaration(Token token) {
+    super.beginLocalFunctionDeclaration(token);
+    begin('LocalFunctionDeclaration');
+  }
+
   @override
   void beginMember() {
     expectIn('ClassOrMixinBody');
@@ -601,19 +601,19 @@ class ForwardingTestListener extends ForwardingListener {
     super.endCatchClause(token);
   }
 
-  @override
-  void endClassOrMixinBody(int memberCount, Token beginToken, Token endToken) {
-    end('ClassOrMixinBody');
-    super.endClassOrMixinBody(memberCount, beginToken, endToken);
-  }
-
   @override
   void endClassDeclaration(Token beginToken, Token endToken) {
     end('ClassDeclaration');
     end('ClassOrNamedMixinApplication');
     super.endClassDeclaration(beginToken, endToken);
   }
 
+  @override
+  void endClassOrMixinBody(int memberCount, Token beginToken, Token endToken) {
+    end('ClassOrMixinBody');
+    super.endClassOrMixinBody(memberCount, beginToken, endToken);
+  }
+
   @override
   void endCombinators(int count) {
     end('Combinators');
@@ -717,12 +717,6 @@ class ForwardingTestListener extends ForwardingListener {
     super.endForControlFlow(token);
   }
 
-  @override
-  void endForInControlFlow(Token token) {
-    end('ForControlFlow');
-    super.endForInControlFlow(token);
-  }
-
   @override
   void endForIn(Token endToken) {
     end('ForStatement');
@@ -736,21 +730,15 @@ class ForwardingTestListener extends ForwardingListener {
   }
 
   @override
-  void endForInExpression(Token token) {
-    end('ForInExpression');
-    super.endForInExpression(token);
-  }
-
-  @override
-  void endForStatement(Token endToken) {
-    end('ForStatement');
-    super.endForStatement(endToken);
+  void endForInControlFlow(Token token) {
+    end('ForControlFlow');
+    super.endForInControlFlow(token);
   }
 
   @override
-  void endForStatementBody(Token token) {
-    end('ForStatementBody');
-    super.endForStatementBody(token);
+  void endForInExpression(Token token) {
+    end('ForInExpression');
+    super.endForInExpression(token);
   }
 
   @override
@@ -769,9 +757,15 @@ class ForwardingTestListener extends ForwardingListener {
   }
 
   @override
-  void endLocalFunctionDeclaration(Token endToken) {
-    end('LocalFunctionDeclaration');
-    super.endLocalFunctionDeclaration(endToken);
+  void endForStatement(Token endToken) {
+    end('ForStatement');
+    super.endForStatement(endToken);
+  }
+
+  @override
+  void endForStatementBody(Token token) {
+    end('ForStatementBody');
+    super.endForStatementBody(token);
   }
 
   @override
@@ -877,6 +871,12 @@ class ForwardingTestListener extends ForwardingListener {
     super.endLiteralSymbol(hashToken, identifierCount);
   }
 
+  @override
+  void endLocalFunctionDeclaration(Token endToken) {
+    end('LocalFunctionDeclaration');
+    super.endLocalFunctionDeclaration(endToken);
+  }
+
   @override
   void endMember() {
     end('Member');
@@ -1115,34 +1115,24 @@ class ForwardingTestListener extends ForwardingListener {
     listener.handleClassOrMixinImplements(implementsKeyword, interfacesCount);
   }
 
-  @override
-  void handleIdentifierList(int count) {
-    expectInOneOf(['Hide', 'Show']);
-    super.handleIdentifierList(count);
-  }
-
   @override
   void handleDottedName(int count, Token firstIdentifier) {
     expectIn('ConditionalUri');
     super.handleDottedName(count, firstIdentifier);
   }
 
   @override
-  void handleRecoverClassHeader() {
-    expectIn('ClassDeclaration');
-    listener.handleRecoverClassHeader();
-  }
-
-  @override
-  void handleRecoverImport(Token semicolon) {
-    expectIn('CompilationUnit');
-    listener.handleRecoverImport(semicolon);
+  void handleIdentifierList(int count) {
+    expectInOneOf(['Hide', 'Show']);
+    super.handleIdentifierList(count);
   }
 
   @override
-  void handleRecoverMixinHeader() {
-    expectIn('MixinDeclaration');
-    listener.handleRecoverMixinHeader();
+  void handleImportPrefix(Token deferredKeyword, Token asKeyword) {
+    // This event normally happens within "Import",
+    // but happens within "CompilationUnit" during recovery.
+    expectInOneOf(const ['Import', 'CompilationUnit']);
+    listener.handleImportPrefix(deferredKeyword, asKeyword);
   }
 
   @override
@@ -1182,11 +1172,21 @@ class ForwardingTestListener extends ForwardingListener {
   }
 
   @override
-  void handleImportPrefix(Token deferredKeyword, Token asKeyword) {
-    // This event normally happens within "Import",
-    // but happens within "CompilationUnit" during recovery.
-    expectInOneOf(const ['Import', 'CompilationUnit']);
-    listener.handleImportPrefix(deferredKeyword, asKeyword);
+  void handleRecoverClassHeader() {
+    expectIn('ClassDeclaration');
+    listener.handleRecoverClassHeader();
+  }
+
+  @override
+  void handleRecoverImport(Token semicolon) {
+    expectIn('CompilationUnit');
+    listener.handleRecoverImport(semicolon);
+  }
+
+  @override
+  void handleRecoverMixinHeader() {
+    expectIn('MixinDeclaration');
+    listener.handleRecoverMixinHeader();
   }
 
   @override