Fix the problems part3 made worse.

Author: jcollins-g

lib/src/element_type.dart

@@ -29,6 +29,14 @@ class ElementType {
 
   bool get isParameterType => (_type is TypeParameterType);
 
+  /// This type is a public type if the underlying, canonical element is public.
+  /// This avoids discarding the resolved type information as canonicalization
+  /// would ordinarily do.
+  bool get isPublic {
+    Class canonicalClass = element.package.findCanonicalModelElementFor(element.element) ?? element;
+    return canonicalClass.isPublic;
+  }
+
   String get linkedName {
     if (_linkedName == null) {
       StringBuffer buf = new StringBuffer();
@@ -61,8 +69,7 @@ class ElementType {
   }
 
   String get name {
-    if (_type.name == null)
-      return _type.element.name;
+    if (_type.name == null) return _type.element.name;
     return _type.name;
   }
 

lib/src/html/html_generator_instance.dart

@@ -102,7 +102,8 @@ class HtmlGeneratorInstance implements HtmlOptions {
       for (var clazz in lib.allClasses.where((c) => c.isDocumented)) {
         generateClass(package, lib, clazz);
 
-        for (var constructor in clazz.constructors.where((c) => c.isDocumented)) {
+        for (var constructor
+            in clazz.constructors.where((c) => c.isDocumented)) {
           if (!constructor.isCanonical) continue;
           generateConstructor(package, lib, clazz, constructor);
         }
@@ -112,12 +113,14 @@ class HtmlGeneratorInstance implements HtmlOptions {
           generateConstant(package, lib, clazz, constant);
         }
 
-        for (var property in clazz.staticProperties.where((s) => s.isDocumented)) {
+        for (var property
+            in clazz.staticProperties.where((s) => s.isDocumented)) {
           if (!property.isCanonical) continue;
           generateProperty(package, lib, clazz, property);
         }
 
-        for (var property in clazz.propertiesForPages.where((p) => p.isDocumented)) {
+        for (var property
+            in clazz.propertiesForPages.where((p) => p.isDocumented)) {
           if (!property.isCanonical) continue;
           generateProperty(package, lib, clazz, property);
         }
@@ -127,7 +130,8 @@ class HtmlGeneratorInstance implements HtmlOptions {
           generateMethod(package, lib, clazz, method);
         }
 
-        for (var operator in clazz.operatorsForPages.where((o) => o.isDocumented)) {
+        for (var operator
+            in clazz.operatorsForPages.where((o) => o.isDocumented)) {
           if (!operator.isCanonical) continue;
           generateMethod(package, lib, clazz, operator);
         }
@@ -140,10 +144,12 @@ class HtmlGeneratorInstance implements HtmlOptions {
 
       for (var eNum in lib.enums.where((e) => e.isDocumented)) {
         generateEnum(package, lib, eNum);
-        for (var property in eNum.propertiesForPages.where((p) => p.isDocumented)) {
+        for (var property
+            in eNum.propertiesForPages.where((p) => p.isDocumented)) {
           generateProperty(package, lib, eNum, property);
         }
-        for (var operator in eNum.operatorsForPages.where((o) => o.isDocumented)) {
+        for (var operator
+            in eNum.operatorsForPages.where((o) => o.isDocumented)) {
           generateMethod(package, lib, eNum, operator);
         }
         for (var method in eNum.methodsForPages.where((m) => m.isDocumented)) {
@@ -156,10 +162,6 @@ class HtmlGeneratorInstance implements HtmlOptions {
       }
 
       for (var property in lib.properties.where((p) => p.isDocumented)) {
-        if (property.name == 'topLevelVariable')
-          1+1;
-        if (property.linkedReturnType == '')
-          1+1;
         generateTopLevelProperty(package, lib, property);
       }
 

lib/src/html/template_data.dart

@@ -143,7 +143,8 @@ class LibraryTemplateData extends TemplateData<Library> {
       yield new Subnav('Properties', '${library.href}#properties');
     if (library.hasPublicFunctions)
       yield new Subnav('Functions', '${library.href}#functions');
-    if (library.hasPublicEnums) yield new Subnav('Enums', '${library.href}#enums');
+    if (library.hasPublicEnums)
+      yield new Subnav('Enums', '${library.href}#enums');
     if (library.hasPublicTypedefs)
       yield new Subnav('Typedefs', '${library.href}#typedefs');
     if (library.hasPublicExceptions)

lib/src/markdown_processor.dart

@@ -390,7 +390,6 @@ Element _findRefElementInLibrary(String codeRef, ModelElement element,
   assert(element != null);
   assert(element.package.allLibrariesAdded);
 
-
   String codeRefChomped = codeRef.replaceFirst(isConstructor, '');
 
   final Library library = element.library;
@@ -453,7 +452,7 @@ Element _findRefElementInLibrary(String codeRef, ModelElement element,
 
     if (results.isEmpty && realClass != null) {
       for (Class superClass
-          in realClass.superChain.map((et) => et.element as Class)) {
+          in realClass.publicSuperChain.map((et) => et.element as Class)) {
         if (!tryClasses.contains(superClass)) {
           _getResultsForClass(
               superClass, codeRefChomped, results, codeRef, package);
@@ -630,7 +629,7 @@ void _getResultsForClass(Class tryClass, String codeRefChomped,
       // TODO(jcollins-g): This makes our caller ~O(n^2) vs length of superChain.
       //                   Fortunately superChains are short, but optimize this if it matters.
       superChain
-          .addAll(tryClass.superChainRaw.map((t) => t.returnElement as Class));
+          .addAll(tryClass.superChain.map((t) => t.returnElement as Class));
       List<String> codeRefParts = codeRefChomped.split('.');
       for (final c in superChain) {
         // TODO(jcollins-g): add a hash-map-enabled lookup function to Class?