Align source mirrors with runtime mirrors.

tools/dom/docs/lib/docs.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.
 
 /**
  * A library for extracting the documentation from the various HTML libraries
  * ([dart:html], [dart:svg], [dart:web_audio], [dart:indexed_db]) and saving
  * those documentation comments to a JSON file.
  */
 
 library docs;
 
 import '../../../../sdk/lib/_internal/dartdoc/lib/src/dart2js_mirrors.dart';
-import '../../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors.dart';
+import '../../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart';
 import '../../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
 import '../../../../sdk/lib/_internal/dartdoc/lib/dartdoc.dart';
 import '../../../../sdk/lib/_internal/dartdoc/lib/src/json_serializer.dart';
 import '../../../../utils/apidoc/lib/metadata.dart';
 import 'dart:async';
 import 'dart:io';
 
 /// The various HTML libraries.
 const List<String> HTML_LIBRARY_NAMES = const ['dart:html',
                                                'dart:indexed_db',
@@ skipping 61 matching lines @@
           (e) => HTML_LIBRARY_NAMES.indexOf(e.uri.toString()) >= 0))
       ..sort((x, y) =>
         x.uri.toString().toUpperCase().compareTo(
         y.uri.toString().toUpperCase()));
 
   for (LibraryMirror libMirror in sortedLibraries) {
     print('Extracting documentation from ${libMirror.simpleName}.');
 
     var libraryJson = {};
     var sortedClasses = _sortAndFilterMirrors(
-        libMirror.classes.values.toList(), ignoreDocsEditable: true);
+        classesOf(libMirror.declarations).toList(), ignoreDocsEditable: true);
 
     for (ClassMirror classMirror in sortedClasses) {
+      print(' class: $classMirror');
       var classJson = {};
       var sortedMembers = _sortAndFilterMirrors(
-          classMirror.members.values.toList());
+          membersOf(classMirror.declarations).toList());
 
       var membersJson = {};
       for (var memberMirror in sortedMembers) {
+        print('  member: $memberMirror');
         var memberDomName = domNames(memberMirror)[0];
         var memberComment = _splitCommentsByNewline(
             computeUntrimmedCommentAsList(memberMirror));
 
         // Remove interface name from Dom Name.
         if (memberDomName.indexOf('.') >= 0) {
           memberDomName =
               memberDomName.substring(memberDomName.indexOf('.') + 1);
         }
 
@@ skipping 14 matching lines @@
             membersJson);
       }
 
       if (!classJson.isEmpty) {
         libraryJson.putIfAbsent(domNames(classMirror)[0], () =>
             classJson);
       }
     }
 
     if (!libraryJson.isEmpty) {
-      convertedJson.putIfAbsent(libMirror.simpleName, () =>
+      convertedJson.putIfAbsent(nameOf(libMirror), () =>
           libraryJson);
     }
   }
 
   return convertedJson;
 }
 
 /// Filter out mirrors that are private, or which are not part of this docs
 /// process. That is, ones without the DocsEditable annotation.
 /// If [ignoreDocsEditable] is true, relax the restriction on @DocsEditable().
@@ skipping 25 matching lines @@
 
   return out;
 }
 
 /// Given the class mirror, returns the names found or an empty list.
 List<String> domNames(DeclarationMirror mirror) {
   var domNameMetadata = findMetadata(mirror.metadata, 'DomName');
 
   if (domNameMetadata != null) {
     var domNames = <String>[];
-    var tags = domNameMetadata.getField('name');
+    var tags = domNameMetadata.getField(#name);
     for (var s in tags.reflectee.split(',')) {
       domNames.add(s.trim());
     }
 
     if (domNames.length == 1 && domNames[0] == 'none') return <String>[];
     return domNames;
   } else {
     return <String>[];
   }
 }