More shared messages.

pkg/dart_messages/bin/publish.dart

 // Copyright (c) 2015, 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.
 
 import 'dart:convert';
 import 'dart:io' as io;
 
 import '../lib/shared_messages.dart';
 
 const String jsonPath = '../lib/generated/shared_messages.json';
@@ skipping 137 matching lines @@
 
 String convertToAnalyzerTemplate(String template, holeOrder) {
   var holeMap;
   if (holeOrder != null) {
     holeMap = {};
     for (int i = 0; i < holeOrder.length; i++) {
       holeMap[holeOrder[i]] = i;
     }
   }
   int seenHoles = 0;
-  return template.replaceAllMapped(new RegExp(r"#\w+"), (Match match) {
+  return template.replaceAllMapped(new RegExp(r"#\w+|#{\w+}"), (Match match) {
     if (holeMap != null) {
-      String holeName = match[0].substring(1);
+      String matchedString = match[0];
+      String holeName = matchedString.startsWith("#{")
+          ? matchedString.substring(2, matchedString.length - 1)
+          : matchedString.substring(1);
       int index = holeMap[holeName];
       if (index == null) {
         throw "Couldn't find hole-position for $holeName $holeMap";
       }
       return "{$index}";
     } else {
       return "{${seenHoles++}}";
     }
   });
 }
@@ skipping 50 matching lines @@
 /// Translates the shared messages in `../lib/shared_messages.dart` to JSON,
 /// dart2js, and analyzer formats.
 ///
 /// Emits the json-output to [jsonPath], the dart2js-output to [dart2jsPath],
 /// and the analyzer-output to [analyzerPath].
 void main() {
   emitJson();
   emitDart2js();
   emitAnalyzer();
 }