Split MessageKind into a MessageKind key and a MessageTemplate.

tests/compiler/dart2js/message_kind_helper.dart

 // Copyright (c) 2013, 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 dart2js.test.message_kind_helper;
 
 import 'package:expect/expect.dart';
 import 'dart:async';
 
 import 'package:compiler/src/dart2jslib.dart' show
     Compiler,
-    MessageKind;
+    MessageKind,
+    MessageTemplate;
 import 'package:compiler/src/dart_backend/dart_backend.dart' show
     DartBackend;
 import 'package:compiler/src/old_to_new_api.dart' show
     LegacyCompilerDiagnostics;
 
 import 'memory_compiler.dart';
 
 const String ESCAPE_REGEXP = r'[[\]{}()*+?.\\^$|]';
 
 /// Most examples generate a single diagnostic.
@@ skipping 22 matching lines @@
 ]);
 
 /// Most messages can be tested without causing a fatal error. Add an exception
 /// here if a fatal error is unavoidable and leads to pending classes.
 /// Try to avoid adding exceptions here; a fatal error causes the compiler to
 /// stop before analyzing all input, and it isn't safe to reuse it.
 final Set<MessageKind> kindsWithPendingClasses = new Set<MessageKind>.from([
     // If you add something here, please file a *new* bug report.
 ]);
 
-Future<Compiler> check(MessageKind kind, Compiler cachedCompiler) {
-  Expect.isNotNull(kind.howToFix);
-  Expect.isFalse(kind.examples.isEmpty);
+Future<Compiler> check(MessageTemplate template, Compiler cachedCompiler) {
+  Expect.isNotNull(template.howToFix);
+  Expect.isFalse(template.examples.isEmpty);
 
-  return Future.forEach(kind.examples, (example) {
+  return Future.forEach(template.examples, (example) {
     if (example is String) {
       example = {'main.dart': example};
     } else {
       Expect.isTrue(example is Map,
                     "Example must be either a String or a Map.");
       Expect.isTrue(example.containsKey('main.dart'),
                     "Example map must contain a 'main.dart' entry.");
     }
     List<String> messages = <String>[];
     void collect(Uri uri, int begin, int end, String message, kind) {
       if (kind.name == 'verbose info' || kind.name == 'info') {
         return;
       }
       messages.add(message);
     }
 
     bool oldBackendIsDart;
     if (cachedCompiler != null) {
       oldBackendIsDart = cachedCompiler.backend is DartBackend;
     }
-    bool newBackendIsDart = kind.options.contains('--output-type=dart');
+    bool newBackendIsDart = template.options.contains('--output-type=dart');
 
     Compiler compiler = compilerFor(
         example,
         diagnosticHandler: new LegacyCompilerDiagnostics(collect),
         options: ['--analyze-only',
-                  '--enable-experimental-mirrors']..addAll(kind.options),
+                  '--enable-experimental-mirrors']..addAll(template.options),
         cachedCompiler:
              // TODO(johnniwinther): Remove this restriction when constant
              // values can be computed directly from the expressions.
              oldBackendIsDart == newBackendIsDart ? cachedCompiler : null);
 
     return compiler.run(Uri.parse('memory:main.dart')).then((_) {
 
       Expect.isFalse(messages.isEmpty, 'No messages in """$example"""');
 
-      String expectedText = !kind.hasHowToFix
-          ? kind.template : '${kind.template}\n${kind.howToFix}';
+      String expectedText = !template.hasHowToFix
+          ? template.template : '${template.template}\n${template.howToFix}';
       String pattern = expectedText.replaceAllMapped(
           new RegExp(ESCAPE_REGEXP), (m) => '\\${m[0]}');
       pattern = pattern.replaceAll(new RegExp(r'#\\\{[^}]*\\\}'), '.*');
 
       // TODO(johnniwinther): Extend MessageKind to contain information on
       // where info messages are expected.
       bool messageFound = false;
       List unexpectedMessages = [];
       for (String message in messages) {
         if (!messageFound && new RegExp('^$pattern\$').hasMatch(message)) {
           messageFound = true;
         } else {
           unexpectedMessages.add(message);
         }
       }
       Expect.isTrue(messageFound, '"$pattern" does not match any in $messages');
       Expect.isFalse(compiler.hasCrashed);
       if (!unexpectedMessages.isEmpty) {
         for (String message in unexpectedMessages) {
           print("Unexpected message: $message");
         }
-        if (!kindsWithExtraMessages.contains(kind)) {
+        if (!kindsWithExtraMessages.contains(template.kind)) {
           // Try changing the error reporting logic before adding an exception
           // to [kindsWithExtraMessages].
           throw 'Unexpected messages found.';
         }
       }
 
       bool pendingStuff = false;
       for (var e in compiler.resolver.pendingClassesToBePostProcessed) {
         pendingStuff = true;
         compiler.reportInfo(
             e, MessageKind.GENERIC,
             {'text': 'Pending class to be post-processed.'});
       }
       for (var e in compiler.resolver.pendingClassesToBeResolved) {
         pendingStuff = true;
         compiler.reportInfo(
             e, MessageKind.GENERIC,
             {'text': 'Pending class to be resolved.'});
       }
-      Expect.isTrue(!pendingStuff || kindsWithPendingClasses.contains(kind));
+      Expect.isTrue(!pendingStuff ||
+                    kindsWithPendingClasses.contains(template));
 
       if (!pendingStuff) {
         // If there is pending stuff, or the compiler was cancelled, we
         // shouldn't reuse the compiler.
         cachedCompiler = compiler;
       }
     });
   }).then((_) => cachedCompiler);
 }