Include class names in parser events.

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

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.parser.parser;
 
 import '../scanner.dart' show
     ErrorToken;
 
 import '../scanner/recover.dart' show
@@ skipping 694 matching lines @@
     return token;
   }
 
   Token parseClassOrNamedMixinApplication(Token token) {
     Token begin = token;
     Token abstractKeyword;
     if (optional('abstract', token)) {
       abstractKeyword = token;
       token = token.next;
     }
-    Token classKeyword = token;
-    var isMixinApplication = optional('=', peekAfterType(token.next));
-    if (isMixinApplication) {
-      listener.beginNamedMixinApplication(begin);
-    } else {
-      listener.beginClassDeclaration(begin);
-    }
-
     int modifierCount = 0;
     if (abstractKeyword != null) {
       parseModifier(abstractKeyword);
       modifierCount++;
     }
     listener.handleModifiers(modifierCount);
+    bool isMixinApplication = optional('=', peekAfterType(token));
+    Token name = token.next;
+    token = parseIdentifier(name);
 
     if (isMixinApplication) {
-      token = parseIdentifier(token.next);
-      token = parseTypeVariablesOpt(token);
+      listener.beginNamedMixinApplication(begin, name);
+    } else {
+      listener.beginClassDeclaration(begin, name);
+    }
+
+    token = parseTypeVariablesOpt(token);
+
+    if (optional('=', token)) {
       token = expect('=', token);
-      return parseNamedMixinApplication(token, classKeyword);
+      return parseNamedMixinApplication(token, begin, name);
     } else {
-      return parseClass(begin, classKeyword);
+      return parseClass(token, begin, name);
     }
   }
 
-  Token parseNamedMixinApplication(Token token, Token classKeyword) {
+  Token parseNamedMixinApplication(Token token, Token begin, Token name) {
     token = parseMixinApplication(token);
     Token implementsKeyword = null;
     if (optional('implements', token)) {
       implementsKeyword = token;
       token = parseTypeList(token.next);
     }
-    listener.endNamedMixinApplication(classKeyword, implementsKeyword, token);
+    listener.endNamedMixinApplication(begin, implementsKeyword, token);
     return expect(';', token);
   }
 
-  Token parseClass(Token begin, Token classKeyword) {
-    Token token = parseIdentifier(classKeyword.next);
-    token = parseTypeVariablesOpt(token);
+  Token parseClass(Token token, Token begin, Token name) {
     Token extendsKeyword;
     if (optional('extends', token)) {
       extendsKeyword = token;
       if (optional('with', peekAfterType(token.next))) {
         token = parseMixinApplication(token.next);
       } else {
         token = parseType(token.next);
       }
     } else {
       extendsKeyword = null;
@@ skipping 2550 matching lines @@
         break;
     }
     if (isRecoverable) {
       listener.handleRecoverableError(token, kind, arguments);
       return null;
     } else {
       return listener.handleUnrecoverableError(token, kind, arguments);
     }
   }
 }