pkg/docgen: a bunch of cleanup

pkg/docgen/lib/src/library_helpers.dart

 // Copyright (c) 2014, 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 docgen.library_helpers;
 
 import 'package:logging/logging.dart';
 import 'package:markdown/markdown.dart' as markdown;
 
 import 'exports/source_mirrors.dart';
@@ skipping 38 matching lines @@
 
 /// The dart:core library, which contains all types that are always available
 /// without import.
 Library _coreLibrary;
 
 /// Set of libraries declared in the SDK, so libraries that can be accessed
 /// when running dart by default.
 Iterable<LibraryMirror> get sdkLibraries => _sdkLibraries;
 Iterable<LibraryMirror> _sdkLibraries;
 
-/// Index of all the dart2js mirrors examined to corresponding MirrorBased
-/// docgen objects.
-///
-/// Used for lookup because of the dart2js mirrors exports
-/// issue. The second level map is indexed by owner docName for faster lookup.
-/// Why two levels of lookup? Speed, man. Speed.
-final Map<String, Map<String, Set<Indexable>>> mirrorToDocgen = new Map<String,
-    Map<String, Set<Indexable>>>();
-
 ////// Top level resolution functions
 /// Converts all [foo] references in comments to <a>libraryName.foo</a>.
 markdown.Node globalFixReference(String name) {
   // Attempt the look up the whole name up in the scope.
   String elementName = findElementInScopeWithPrefix(name, '');
   if (elementName != null) {
     return new markdown.Element.text('a', elementName);
   }
   return fixComplexReference(name);
 }
@@ skipping 66 matching lines @@
 }
 
 /// Given a Dart2jsMirror, find the corresponding Docgen [MirrorBased] object.
 ///
 /// We have this global lookup function to avoid re-implementing looking up
 /// the scoping rules for comment resolution here (it is currently done in
 /// mirrors). If no corresponding MirrorBased object is found, we return a
 /// [DummyMirror] that simply returns the original mirror's qualifiedName
 /// while behaving like a MirrorBased object.
 Indexable getDocgenObject(DeclarationMirror mirror, [Indexable owner]) {
-  Map<String, Set<Indexable>> docgenObj =
-      mirrorToDocgen[dart2js_util.qualifiedNameOf(mirror)];
+  Map<String, Indexable> docgenObj = lookupIndexableMap(mirror);
+
   if (docgenObj == null) {
     return new DummyMirror(mirror, owner);
   }
 
   var setToExamine = new Set();
   if (owner != null) {
     var firstSet = docgenObj[owner.docName];
-    if (firstSet != null) setToExamine.addAll(firstSet);
+    if (firstSet != null) setToExamine.add(firstSet);
     if (_coreLibrary != null && docgenObj[_coreLibrary.docName] != null) {
-      setToExamine.addAll(docgenObj[_coreLibrary.docName]);
+      setToExamine.add(docgenObj[_coreLibrary.docName]);
     }
   } else {
-    for (var value in docgenObj.values) {
-      setToExamine.addAll(value);
-    }
+    setToExamine.addAll(docgenObj.values);
   }
 
   Set<Indexable> results = new Set<Indexable>();
   for (Indexable indexable in setToExamine) {
     if (indexable.mirror.qualifiedName == mirror.qualifiedName &&
         indexable.isValidMirror(mirror)) {
       results.add(indexable);
     }
   }
 
@@ skipping 44 matching lines @@
         append = true;
       }
       index++;
     }
   }
   return tokens;
 }
 
 // HTML escaped version of '<' character.
 const _LESS_THAN = '&lt;';