Revert change to docgen.

pkg/docgen/lib/docgen.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.
 
 /// **docgen** is a tool for creating machine readable representations of Dart
 /// code metadata, including: classes, members, comments and annotations.
 ///
 /// docgen is run on a `.dart` file or a directory containing `.dart` files.
 ///
 ///      $ dart docgen.dart [OPTIONS] [FILE/DIR]
@@ skipping 347 matching lines @@
       filteredEntities.map((e) => e.qualifiedName),
       filteredEntities.map((e) => e.typeName));
   if (append) {
     var previousIndex =
         JSON.decode(new File('docs/index.json').readAsStringSync());
     index.addAll(previousIndex);
   }
   _writeToFile(JSON.encode(index), 'index.json');
 }
 
-_filterMap(map, predicate) {
-  var result = new Map();
-  map.forEach((key, value) {
-    if (predicate(value)) result[key] = value;
-  });
-  return result;
-}
-
 Library generateLibrary(dart2js.Dart2JsLibraryMirror library) {
   _currentLibrary = library;
-  var result = new Library(
-      docName(library),
-      _commentToHtml(library),
-      _variables(_filterMap(library.declarations, (d) => d is VariableMirror)),
-      _methods(_filterMap(library.declarations, (d) => d is MethodMirror)),
-      _classes(_filterMap(library.declarations, (d) => d is ClassMirror)),
-      _isHidden(library));
+  var result = new Library(docName(library), _commentToHtml(library),
+    _variables(library.variables),
+    _methods(library.functions),
+    _classes(library.classes), _isHidden(library));
   _findPackage(result, library);
   logger.fine('Generated library for ${result.name}');
   return result;
 }
 
 void _writeIndexableToFile(Indexable result, bool outputToYaml) {
   var outputFile = result.fileName;
   var output;
   if (outputToYaml) {
     output = getYamlString(result.toMap());
@@ skipping 179 matching lines @@
 /// Returns the [Class] for the given [mirror] has already been created, and if
 /// it does not exist, creates it.
 Class _class(ClassMirror mirror) {
   var clazz = entityMap[docName(mirror)];
   if (clazz == null) {
     var superclass = mirror.superclass != null ?
         _class(mirror.superclass) : null;
     var interfaces =
         mirror.superinterfaces.map((interface) => _class(interface));
     clazz = new Class(mirror.simpleName, superclass, _commentToHtml(mirror),
-        interfaces.toList(),
-        _variables(_filterMap(mirror.declarations, (d) => d is VariableMirror)),
-        _methods(_filterMap(mirror.declarations,
-                            (d) => d is MethodMirror && !d.isConstructor)),
-        _annotations(mirror), _generics(mirror),
+        interfaces.toList(), _variables(mirror.variables),
+        _methods(mirror.methods), _annotations(mirror), _generics(mirror),
         docName(mirror), _isHidden(mirror), docName(mirror.owner),
         mirror.isAbstract);
     if (superclass != null) clazz.addInherited(superclass);
     interfaces.forEach((interface) => clazz.addInherited(interface));
     entityMap[docName(mirror)] = clazz;
   }
   return clazz;
 }
 
 /// Returns a map of [Class] objects constructed from [mirrorMap].
@@ skipping 653 matching lines @@
 String docName(DeclarationMirror m) {
   if (m is LibraryMirror) {
     return (m as LibraryMirror).qualifiedName.replaceAll('.','-');
   }
   var owner = m.owner;
   if (owner == null) return m.qualifiedName;
   // For the unnamed constructor we just return the class name.
   if (m.simpleName == '') return docName(owner);
   return docName(owner) + '.' + m.simpleName;
 }