Implement more message argument kinds.

pkg/front_end/tool/_fasta/generate_messages.dart

Index: pkg/front_end/tool/_fasta/generate_messages.dart
diff --git a/pkg/front_end/tool/_fasta/generate_messages.dart b/pkg/front_end/tool/_fasta/generate_messages.dart
index 6915d4fae03cabce6880b18e415676b68fb17db4..7497befe8738088ff6c396a73ad7f72818e91058 100644
--- a/pkg/front_end/tool/_fasta/generate_messages.dart
+++ b/pkg/front_end/tool/_fasta/generate_messages.dart
@@ -73,6 +73,11 @@ String compileTemplate(String name, String template, String tip,
         arguments.add("'name': name");
         break;
 
+      case "#name2":
+        parameters.add("String name2");
+        arguments.add("'name2': name2");
+        break;
+
       case "#lexeme":
         parameters.add("Token token");
         conversions.add("String lexeme = token.lexeme;");
@@ -84,6 +89,23 @@ String compileTemplate(String name, String template, String tip,
         arguments.add("'string': string");
         break;
 
+      case "#string2":

[Siggi Cherem (dart-lang), 2017/07/11 21:25:27]

How about `#kind:n` to make it a bit more flexible? Basically `#kind` ==
`#kind:0`,

[ahe, 2017/07/12 12:42:13]

This has been annoying me as well, but I'll deal with it later as I have a bunch
of CLs on top of this :-)

+        parameters.add("String string2");
+        arguments.add("'string2': string2");
+        break;
+
+      case "#uri":
+        parameters.add("Uri uri_");
+        conversions.add("String uri = relativizeUri(uri_);");
+        arguments.add("'uri': uri_");
+        break;
+
+      case "#uri2":
+        parameters.add("Uri uri2_");
+        conversions.add("String uri2 = relativizeUri(uri2_);");
+        arguments.add("'uri': uri2_");
+        break;
+
       default:
         throw "Unhandled placeholder in template: ${match[0]}";
     }