Fixing some more resolving issues with super classes in 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 362 matching lines @@
     var previousIndex =
         JSON.decode(new File('docs/index.json').readAsStringSync());
     index.addAll(previousIndex);
   }
   _writeToFile(JSON.encode(index), 'index.json');
 }
 
 Library generateLibrary(dart2js.Dart2JsLibraryMirror library) {
   _currentLibrary = library;
   var result = new Library(docName(library), _commentToHtml(library),
+      _classes(library.classes),
+      _methods(library.functions),
       _variables(library.variables),
-      _methods(library.functions),
-      _classes(library.classes), _isHidden(library));
+      _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 50 matching lines @@
       .where((e) => e != null)
       .toList();
     if (!skippedAnnotations.contains(docName(annotation.type))) {
       annotations.add(new Annotation(docName(annotation.type),
           parameterList));
     }
   });
   return annotations;
 }
 
+/// Update the global pointers to the current mirror to the particular mirror
+/// we're documenting.
+void _updateCurrentMirror(DeclarationMirror mirror) {
+  if (mirror is LibraryMirror) {
+    _currentLibrary = mirror;
+  } else if (mirror is ClassMirror) {
+    _currentClass = mirror;
+  } else if (mirror is MethodMirror) {
+    _currentMember = mirror;
+  }
+}
+
 /// Returns any documentation comments associated with a mirror with
 /// simple markdown converted to html.
 String _commentToHtml(DeclarationMirror mirror) {
   String commentText;
+  _updateCurrentMirror(mirror);
   mirror.metadata.forEach((metadata) {
     if (metadata is CommentInstanceMirror) {
       CommentInstanceMirror comment = metadata;
       if (comment.isDocComment) {
         if (commentText == null) {
           commentText = comment.trimmedText;
         } else {
           commentText = '$commentText\n${comment.trimmedText}';
         }
       }
@@ skipping 57 matching lines @@
     ClassMirror currentClass, MemberMirror currentMember) {
   determineLookupFunc(name) => name.contains('.') ?
       dart2js_util.lookupQualifiedInScope :
       (mirror, name) => mirror.lookupInScope(name);
   var lookupFunc = determineLookupFunc(name);
 
   var memberScope = currentMember == null ?
       null : lookupFunc(currentMember, name);
   if (memberScope != null) return docName(memberScope);
 
-  var classScope = currentClass == null ?
-      null : lookupFunc(currentClass, name);
-  if (classScope != null) return docName(classScope);
+  var classScope = currentClass;
+  while (classScope != null) {
+    var classFunc = lookupFunc(currentClass, name);
+    if (classFunc != null) return docName(classFunc);
+    classScope = classScope.superclass;
+  }
 
   var libraryScope = currentLibrary == null ?
       null : lookupFunc(currentLibrary, name);
   if (libraryScope != null) return docName(libraryScope);
 
   // Look in the dart core library scope.
   var coreScope = _coreLibrary == null? null : lookupFunc(_coreLibrary, name);
   if (coreScope != null) return docName(_coreLibrary);
 
   // If it's a reference that starts with a another library name, then it
@@ skipping 301 matching lines @@
 
   Map get previewMap {
     var basic = super.previewMap;
     basic['packageName'] = packageName;
     if (packageIntro != null) {
       basic['packageIntro'] = packageIntro;
     }
     return basic;
   }
 
-  Library(String name, String comment, this.variables,
-      this.functions, this.classes, bool isPrivate) : super(name, comment,
+  Library(String name, String comment, this.classes, this.functions,
+      this.variables, bool isPrivate) : super(name, comment,
           isPrivate, "");
 
   /// Generates a map describing the [Library] object.
   Map toMap() => {
     'name': name,
     'qualifiedName': qualifiedName,
     'comment': comment,
     'variables': recurseMap(variables),
     'functions': functions.toMap(),
     'classes': classes.toMap(),
@@ skipping 494 matching lines @@
 /// Remove statics from the map of inherited items before adding them.
 Map _filterStatics(Map items) {
   var result = {};
   items.forEach((name, item) {
     if (!item.isStatic) {
       result[name] = item;
     }
   });
   return result;
 }