Big merge from experimental to bleeding edge.

tools/html_json_doc/lib/json_to_html.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 for taking a JSON file and putting the comments located within into
  * the HTML files the comments are associated with.
  *
  * The format of the JSON file is:
- * 
+ *
  *     {
  *       "$filename":
  *         {
  *           "$lineInHtml":
  *             [
  *               "lines of comment",
  *               "here"
  *             ]
  *          },
  *       ...
  *     }
  */
 library json_to_html;
 
-import 'dart:json';
+import 'dart:json' as JSON;
 import 'dart:io';
-
+import 'dart:async';
 
 /// True if any errors were triggered through the conversion.
 bool _anyErrors = false;
 
 
 /**
  * Take comments from [jsonPath] and apply them to all the files found in
  * [htmlPath]. This will overwrite the files in htmlPath.
  */
 Future<bool> convert(Path htmlPath, Path jsonPath) {
@@ skipping 94 matching lines @@
     } else {
       unusedComments.putIfAbsent(key, () => comments);
     }
   });
 
   unusedComments.forEach((String key, _) {
     print('WARNING: the following key was found in the JSON but not in '
         '${new Path(file.fullPathSync()).filename}:\n"$key"');
     _anyErrors = true;
   });
-  
+
   // TODO(amouravski): file.writeAsStringSync('${Strings.join(fileLines, '\n')}\n');
   var outputStream = file.openOutputStream();
   outputStream.writeString(Strings.join(fileLines, '\n'));
   outputStream.writeString('\n');
 
   outputStream.onNoPendingWrites = () {
     outputStream.close();
   };
 }