Handle reexports of extensions in dartdoc

lib/src/html/html_generator_instance.dart

@@ -171,7 +171,7 @@ class HtmlGeneratorInstance {
           }
         }
 
-        for (var extension in filterNonPublic(lib.extensions)) {
+        for (var extension in filterNonDocumented(lib.extensions)) {
           generateExtension(_packageGraph, lib, extension);
 
           for (var constant in filterNonDocumented(extension.constants)) {

lib/src/model.dart

@@ -2415,8 +2415,6 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
     return _allOriginalModelElementNames;
   }
 
-  List<Class> get allClasses => _allClasses;
-
   @override
   CharacterLocation get characterLocation {
     if (element.nameOffset == -1) {
@@ -2430,19 +2428,30 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
   CompilationUnitElement get compilationUnitElement => (element as LibraryElement).definingCompilationUnit;
 
   @override
-  Iterable<Class> get classes {
-    return _allClasses
-        .where((c) => !c.isErrorOrException)
-        .toList(growable: false);
-  }
+  Iterable<Class> get classes => allClasses.where((c) => !c.isErrorOrException);
 
   @override
   Iterable<Extension> get extensions {
-    if (_extensions != null) return _extensions;
-    _extensions = _libraryElement.definingCompilationUnit.extensions
-        .map((e) => ModelElement.from(e, this, packageGraph) as Extension)
-        .toList(growable: false)
-          ..sort(byName);
+    if (_extensions == null) {
+      // De-dupe extensions coming from multiple exported libraries at once.
+      Set<ExtensionElement> extensionElements = Set();
+      extensionElements.addAll(_libraryElement.definingCompilationUnit.extensions);
+      for (CompilationUnitElement cu in _libraryElement.parts) {
+        extensionElements.addAll(cu.extensions);
+      }
+      for (LibraryElement le in _libraryElement.exportedLibraries) {
+        extensionElements.addAll(le.definingCompilationUnit.extensions
+            .where((t) => _exportedNamespace.definedNames.values.contains(t.name)));
+      }
+
+      extensionElements.addAll(_exportedNamespace.definedNames.values
+          .whereType<ExtensionElement>());
+
+      _extensions = extensionElements
+          .map((e) => ModelElement.from(e, this, packageGraph) as Extension)
+          .toList(growable: false)
+        ..sort(byName);
+    }
     return _extensions;
   }
 
@@ -2628,10 +2637,10 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
 
   @override
   List<Class> get exceptions {
-    return _allClasses
-        .where((c) => c.isErrorOrException)
-        .toList(growable: false)
-          ..sort(byName);
+    if (_exceptions == null) {
+      _exceptions = allClasses.where((c) => c.isErrorOrException).toList(growable: false);
+    }
+    return _exceptions;
   }
 
   @override
@@ -2752,24 +2761,23 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
     return _typedefs;
   }
 
-  List<Class> get _allClasses {
+  List<Class> get allClasses {
     if (_classes != null) return _classes;
 
+    // De-dupe classes coming from multiple exported libraries at once.
     Set<ClassElement> types = Set();
     types.addAll(_libraryElement.definingCompilationUnit.types);
     for (CompilationUnitElement cu in _libraryElement.parts) {
       types.addAll(cu.types);
     }
     for (LibraryElement le in _libraryElement.exportedLibraries) {
       types.addAll(le.definingCompilationUnit.types
-          .where((t) => _exportedNamespace.definedNames.values.contains(t.name))
-          .toList());
+          .where((t) => _exportedNamespace.definedNames.values.contains(t.name)));
     }
 
     types.addAll(_exportedNamespace.definedNames.values
-        .where((e) => e is ClassElement && !e.isMixin)
-        .cast<ClassElement>()
-        .where((element) => !element.isEnum));
+        .whereType<ClassElement>()
+        .where((e) => !e.isMixin && !e.isEnum));
 
     _classes = types
         .map((e) => ModelElement.from(e, this, packageGraph) as Class)
@@ -2783,7 +2791,7 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
   LibraryElement get _libraryElement => (element as LibraryElement);
 
   Class getClassByName(String name) {
-    return _allClasses.firstWhere((it) => it.name == name, orElse: () => null);
+    return allClasses.firstWhere((it) => it.name == name, orElse: () => null);
   }
 
   List<TopLevelVariable> _getVariables() {
@@ -5026,7 +5034,7 @@ class PackageGraph {
     documentedPackages.toList().forEach((package) {
       package._libraries.sort((a, b) => compareNatural(a.name, b.name));
       package._libraries.forEach((library) {
-        library._allClasses.forEach(_addToImplementors);
+        library.allClasses.forEach(_addToImplementors);
       });
     });
     _implementors.values.forEach((l) => l.sort());

test/model_test.dart

@@ -2114,11 +2114,20 @@ void main() {
 
   group('Extension', () {
     Extension ext, fancyList;
+    Extension documentOnceReexportOne, documentOnceReexportTwo;
+    Library reexportOneLib, reexportTwoLib;
     Class extensionReferencer;
     Method doSomeStuff, doStuff, s;
     List<Extension> extensions;
 
     setUpAll(() {
+      reexportOneLib = packageGraph.libraries
+          .firstWhere((lib) => lib.name == 'reexport_one');
+      reexportTwoLib = packageGraph.libraries
+          .firstWhere((lib) => lib.name == 'reexport_two');
+      documentOnceReexportOne = reexportOneLib.extensions.firstWhere((e) => e.name == 'DocumentThisExtensionOnce');
+      documentOnceReexportTwo = reexportTwoLib.extensions.firstWhere((e) => e.name == 'DocumentThisExtensionOnce');
+
       ext = exLibrary.extensions.firstWhere((e) => e.name == 'AppleExtension');
       extensionReferencer = exLibrary.classes.firstWhere((c) => c.name == 'ExtensionReferencer');
       fancyList = exLibrary.extensions.firstWhere((e) => e.name == 'FancyList');
@@ -2129,6 +2138,12 @@ void main() {
       extensions = exLibrary.publicExtensions.toList();
     });
 
+    test('basic canonicalization for extensions', () {
+      expect(documentOnceReexportOne.isCanonical, isFalse);
+      expect(documentOnceReexportOne.href, equals(documentOnceReexportTwo.href));
+      expect(documentOnceReexportTwo.isCanonical, isTrue);
+    });
+
     // TODO(jcollins-g): implement feature and update tests
     test('documentation links do not crash in base cases', () {
       packageGraph.packageWarningCounter.hasWarning(doStuff, PackageWarning.notImplemented,
@@ -2143,6 +2158,7 @@ void main() {
       expect(extensionReferencer.documentationAsHtml, contains('<code>_Shhh</code>'));
       expect(extensionReferencer.documentationAsHtml, contains('<a href="ex/FancyList.html">FancyList</a>'));
       expect(extensionReferencer.documentationAsHtml, contains('<a href="ex/AnExtension/call.html">AnExtension.call</a>'));
+      expect(extensionReferencer.documentationAsHtml, contains('<a href="reexport_two/DocumentThisExtensionOnce.html">DocumentThisExtensionOnce</a>'));
     });
 
     test('has a fully qualified name', () {

testing/test_package/lib/example.dart

@@ -677,4 +677,5 @@ extension on Object {
 
 /// This class has nothing to do with [_Shhh], [FancyList], or [AnExtension.call],
 /// but should not crash because we referenced them.
+/// We should be able to find [DocumentThisExtensionOnce], too.
 class ExtensionReferencer {}

testing/test_package/lib/reexport_two.dart

@@ -1,6 +1,7 @@
 /// {@canonicalFor reexport.somelib.SomeClass}
 /// {@canonicalFor reexport.somelib.AUnicornClass}
 /// {@canonicalFor something.ThatDoesntExist}
+/// {@canonicalFor reexport.somelib.DocumentThisExtensionOnce}
 /// {@category Unreal}
 library reexport_two;
 

testing/test_package/lib/src/somelib.dart

@@ -7,3 +7,19 @@ class SomeOtherClass {}
 class YetAnotherClass {}
 
 class AUnicornClass {}
+
+
+/// A private extension.
+extension _Unseen on Object {
+  void doYouSeeMe() { }
+}
+
+/// An extension without a name
+extension on List {
+  void somethingNew() { }
+}
+
+/// [_Unseen] is not seen, but [DocumentMe] is.
+extension DocumentThisExtensionOnce on String {
+  String get reportOnString => '$this is wonderful';
+}