From 3e8456b6b6053dfbacea6030857e572239e46b13 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Mon, 26 Mar 2018 11:15:46 -0700
Subject: [PATCH 1/7] Have failure example now

---
 lib/src/model.dart                 | 34 ++++++++++++++++++++----------
 testing/test_package/lib/fake.dart | 13 ++++++++++++
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/lib/src/model.dart b/lib/src/model.dart
index 1be1c5e8c3..84f222fd8e 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -2534,6 +2534,9 @@ abstract class ModelElement extends Canonicalization
       Accessor getter,
       Accessor setter,
       PackageGraph packageGraph}) {
+    if (packageGraph == null)
+      packageGraph = library?.packageGraph;
+    assert(packageGraph != null || library != null);
     // With AnalysisDriver, we sometimes get ElementHandles when building
     // docs for the SDK, seen via [Library.importedExportedLibraries].  Why?
     if (e is ElementHandle) {
@@ -2552,8 +2555,8 @@ abstract class ModelElement extends Canonicalization
         new Tuple3(e, library, enclosingClass);
     ModelElement newModelElement;
     if (e.kind != ElementKind.DYNAMIC &&
-        library.packageGraph._allConstructedModelElements.containsKey(key)) {
-      newModelElement = library.packageGraph._allConstructedModelElements[key];
+        packageGraph._allConstructedModelElements.containsKey(key)) {
+      newModelElement = packageGraph._allConstructedModelElements[key];
       assert(newModelElement.element is! MultiplyInheritedExecutableElement);
     } else {
       if (e.kind == ElementKind.DYNAMIC) {
@@ -2603,7 +2606,8 @@ abstract class ModelElement extends Canonicalization
               // Allowing null here is allowed as a workaround for
               // dart-lang/sdk#32005.
               assert(e.name == '' || e.name == null);
-              newModelElement = new ModelFunctionAnonymous(e, library);
+              assert(library == null);
+              newModelElement = new ModelFunctionAnonymous(e, packageGraph);
             }
           }
         }
@@ -2673,8 +2677,9 @@ abstract class ModelElement extends Canonicalization
           newModelElement = new TypeParameter(e, library);
         }
         if (e is ParameterElement) {
+          assert(library == null);
           newModelElement =
-              new Parameter(e, library, originalMember: originalMember);
+              new Parameter(e, packageGraph, originalMember: originalMember);
         }
       }
     }
@@ -3253,7 +3258,7 @@ abstract class ModelElement extends Canonicalization
       }
 
       _parameters = new UnmodifiableListView<Parameter>(params
-          .map((p) => new ModelElement.from(p, library))
+          .map((p) => new ModelElement.from(p, library, packageGraph: packageGraph))
           .toList() as Iterable<Parameter>);
     }
     return _parameters;
@@ -3611,8 +3616,12 @@ class ModelFunction extends ModelFunctionTyped {
 /// have a name, but we document it as "Function" to match how these are
 /// written in declarations.
 class ModelFunctionAnonymous extends ModelFunctionTyped {
-  ModelFunctionAnonymous(FunctionTypedElement element, Library library)
-      : super(element, library) {}
+  ModelFunctionAnonymous(FunctionTypedElement element, this._packageGraph)
+      : super(element, null) {}
+
+  final PackageGraph _packageGraph;
+  @override
+  PackageGraph get packageGraph => _packageGraph;
 
   @override
   String get name => 'Function';
@@ -3656,7 +3665,7 @@ class ModelFunctionTyped extends ModelElement
 
   void _calcTypeParameters() {
     typeParameters = _func.typeParameters.map((f) {
-      return new ModelElement.from(f, library);
+      return new ModelElement.from(f, library, packageGraph: packageGraph);
     }).toList();
   }
 
@@ -4687,9 +4696,8 @@ class Package extends LibraryContainer implements Comparable<Package>, Privacy {
 }
 
 class Parameter extends ModelElement implements EnclosedElement {
-  Parameter(ParameterElement element, Library library, {Member originalMember})
-      : super(element, library, originalMember);
-
+  Parameter(ParameterElement element, this._packageGraph, {Member originalMember})
+      : super(element, null, originalMember);
   String get defaultValue {
     if (!hasDefaultValue) return null;
     return _parameter.defaultValueCode;
@@ -4737,6 +4745,10 @@ class Parameter extends ModelElement implements EnclosedElement {
 
   ParameterElement get _parameter => element as ParameterElement;
 
+  final PackageGraph _packageGraph;
+  @override
+  PackageGraph get packageGraph => _packageGraph;
+
   @override
   String toString() => element.name;
 }
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index c8785fe785..027d4931d6 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -177,6 +177,14 @@ class AClassWithFancyProperties {
 
 const _APrivateConstClass CUSTOM_CLASS_PRIVATE = const _APrivateConstClass();
 
+/// Type inference mixing with anonymous functions.
+final importantComputations = {
+  1: (List<num> a) => a[0] + a[1],
+  2: (List<num> a) => a[0] - a[1],
+  3: (List<num> a) => a[0] * a[1],
+  4: (List<num> a) => -a[0]
+};
+
 // No dart docs on purpose. Also, a non-primitive const class.
 const ConstantClass CUSTOM_CLASS = const ConstantClass('custom');
 
@@ -213,6 +221,11 @@ typedef T GenericTypedef<T>(T input);
 /// A typedef with the new style generic function syntax.
 typedef NewGenericTypedef<T> = List<S> Function<S>(T, int, bool);
 
+
+
+ATypeTakingClass<String Function(int)> get complicatedReturn => null;
+
+
 /// Lots and lots of parameters.
 typedef int LotsAndLotsOfParameters(so, many, parameters, it, should, wrap,
     when, converted, to, html, documentation);

From f72ad2a92ad5992c3bea3c48cad8d979be97e378 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Mon, 26 Mar 2018 16:23:13 -0700
Subject: [PATCH 2/7] Fix a number of anonymous function bugs.

---
 lib/src/element_type.dart                     |   8 +-
 lib/src/model.dart                            | 261 ++++++++----------
 pubspec.lock                                  |   2 +-
 test/model_test.dart                          |  16 +-
 testing/test_package/lib/fake.dart            |   4 +-
 .../TypedFunctionsWithoutTypedefs-class.html  |   4 +-
 .../getAFunctionReturningBool.html            |   2 +-
 .../getAFunctionReturningVoid.html            |   2 +-
 .../test_package_docs/ex/aComplexTypedef.html |   2 +-
 testing/test_package_docs/ex/ex-library.html  |   2 +-
 .../fake/ABaseClass-class.html                |   2 +
 .../fake/AClassUsingASuperMixin-class.html    |   2 +
 .../fake/AClassWithFancyProperties-class.html |   2 +
 .../fake/AMixinCallingSuper-class.html        |   2 +
 .../fake/ATypeTakingClass-class.html          |   2 +
 .../fake/ATypeTakingClassMixedIn-class.html   |   2 +
 .../fake/Annotation-class.html                |   2 +
 .../fake/AnotherInterface-class.html          |   2 +
 .../fake/BaseForDocComments-class.html        |   2 +
 .../fake/BaseThingy-class.html                |   2 +
 .../fake/BaseThingy2-class.html               |   2 +
 .../fake/CUSTOM_CLASS-constant.html           |   2 +
 .../fake/CUSTOM_CLASS_PRIVATE-constant.html   |   2 +
 testing/test_package_docs/fake/Callback2.html |   2 +
 .../ClassWithUnusualProperties-class.html     |   2 +
 .../test_package_docs/fake/Color-class.html   |   2 +
 .../fake/ConstantClass-class.html             |   2 +
 .../fake/ConstructorTester-class.html         |   2 +
 .../test_package_docs/fake/Cool-class.html    |   2 +
 .../test_package_docs/fake/DOWN-constant.html |   2 +
 .../fake/DocumentWithATable-class.html        |   2 +
 testing/test_package_docs/fake/Doh-class.html |   2 +
 .../fake/ExtendsFutureVoid-class.html         |   2 +
 .../fake/ExtraSpecialList-class.html          |   2 +
 .../test_package_docs/fake/FakeProcesses.html |   2 +
 .../test_package_docs/fake/Foo2-class.html    |   2 +
 .../fake/GenericTypedef.html                  |   2 +
 .../fake/HasGenericWithExtends-class.html     |   2 +
 .../fake/HasGenerics-class.html               |   2 +
 .../fake/ImplementingThingy-class.html        |   2 +
 .../fake/ImplementingThingy2-class.html       |   2 +
 .../fake/ImplementsFutureVoid-class.html      |   2 +
 .../fake/ImplicitProperties-class.html        |   2 +
 .../fake/InheritingClassOne-class.html        |   2 +
 .../fake/InheritingClassTwo-class.html        |   2 +
 .../fake/Interface-class.html                 |   2 +
 .../fake/LongFirstLine-class.html             |   2 +
 .../fake/LotsAndLotsOfParameters.html         |   2 +
 .../fake/MIEEBase-class.html                  |   2 +
 .../fake/MIEEMixin-class.html                 |   2 +
 .../fake/MIEEMixinWithOverride-class.html     |   2 +
 .../fake/MIEEThing-class.html                 |   2 +
 .../test_package_docs/fake/MixMeIn-class.html |   2 +
 .../fake/NAME_SINGLEUNDERSCORE-constant.html  |   2 +
 .../NAME_WITH_TWO_UNDERSCORES-constant.html   |   2 +
 .../fake/NewGenericTypedef.html               |   2 +
 .../fake/NotAMixin-class.html                 |   2 +
 .../test_package_docs/fake/Oops-class.html    |   2 +
 .../fake/OperatorReferenceClass-class.html    |   2 +
 .../fake/OtherGenericsThing-class.html        |   2 +
 .../test_package_docs/fake/PI-constant.html   |   2 +
 .../fake/ReferringClass-class.html            |   2 +
 .../fake/SpecialList-class.html               |   2 +
 .../fake/SubForDocComments-class.html         |   2 +
 .../fake/SuperAwesomeClass-class.html         |   2 +
 .../fake/TypedefUsingClass-class.html         |   2 +
 .../test_package_docs/fake/UP-constant.html   |   2 +
 .../test_package_docs/fake/VoidCallback.html  |   2 +
 .../fake/WithGetterAndSetter-class.html       |   2 +
 .../test_package_docs/fake/ZERO-constant.html |   2 +
 .../test_package_docs/fake/aCoolVariable.html |   2 +
 .../fake/aVoidParameter.html                  |   2 +
 .../test_package_docs/fake/addCallback.html   |   2 +
 .../test_package_docs/fake/addCallback2.html  |   2 +
 .../fake/complicatedReturn.html               | 197 +++++++++++++
 .../test_package_docs/fake/dynamicGetter.html |   2 +
 .../test_package_docs/fake/fake-library.html  |  18 ++
 .../fake/functionWithFunctionParameters.html  |   2 +
 .../fake/getterSetterNodocGetter.html         |   2 +
 .../fake/getterSetterNodocSetter.html         |   2 +
 .../fake/greatAnnotation-constant.html        |   2 +
 .../fake/greatestAnnotation-constant.html     |   2 +
 .../fake/importantComputations.html           | 193 +++++++++++++
 .../fake/incorrectDocReference-constant.html  |   2 +
 .../test_package_docs/fake/justGetter.html    |   2 +
 .../test_package_docs/fake/justSetter.html    |   2 +
 .../fake/mapWithDynamicKeys.html              |   2 +
 .../test_package_docs/fake/meaningOfLife.html |   2 +
 .../test_package_docs/fake/myCoolTypedef.html |   2 +
 .../fake/myGenericFunction.html               |   2 +
 .../fake/myMap-constant.html                  |   2 +
 .../onlyPositionalWithNoDefaultNoType.html    |   2 +
 .../test_package_docs/fake/paintImage1.html   |   2 +
 .../test_package_docs/fake/paintImage2.html   |   2 +
 .../fake/paramFromAnotherLib.html             |   2 +
 .../fake/paramOfFutureOrNull.html             |   2 +
 .../fake/required-constant.html               |   2 +
 .../fake/returningFutureVoid.html             |   2 +
 testing/test_package_docs/fake/setAndGet.html |   2 +
 testing/test_package_docs/fake/short.html     |   2 +
 .../fake/simpleProperty.html                  |   2 +
 testing/test_package_docs/fake/soIntense.html |   2 +
 ...testingCodeSyntaxInOneLiners-constant.html |   2 +
 .../fake/thisIsAlsoAsync.html                 |   2 +
 .../test_package_docs/fake/thisIsAsync.html   |   2 +
 .../fake/thisIsFutureOr.html                  |   2 +
 .../fake/thisIsFutureOrNull.html              |   2 +
 .../fake/thisIsFutureOrT.html                 |   2 +
 .../fake/topLevelFunction.html                |   2 +
 .../fake/typeParamOfFutureOr.html             |   2 +
 testing/test_package_docs/index.json          |  22 ++
 111 files changed, 766 insertions(+), 161 deletions(-)
 create mode 100644 testing/test_package_docs/fake/complicatedReturn.html
 create mode 100644 testing/test_package_docs/fake/importantComputations.html

diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
index ffe3886a25..d90a6e61da 100644
--- a/lib/src/element_type.dart
+++ b/lib/src/element_type.dart
@@ -29,8 +29,6 @@ abstract class ElementType extends Privacy {
       assert(f is ParameterizedType || f is TypeParameterType);
       bool isGenericTypeAlias =
           f.element.enclosingElement is GenericTypeAliasElement;
-      // can happen if element is dynamic
-      assert(f.element.library != null);
       if (f is FunctionType) {
         assert(f is ParameterizedType);
         if (isGenericTypeAlias) {
@@ -38,9 +36,7 @@ abstract class ElementType extends Privacy {
           return new CallableGenericTypeAliasElementType(
               f, packageGraph, element, returnedFrom);
         } else {
-          if ((f.name ?? f.element.name) == '' ||
-              (f.name ?? f.element.name) == null) {
-            assert(element is ModelFunctionAnonymous);
+          if (element is ModelFunctionAnonymous) {
             return new CallableAnonymousElementType(
                 f, packageGraph, element, returnedFrom);
           } else {
@@ -301,7 +297,7 @@ class CallableAnonymousElementType extends CallableElementType {
   String get linkedName {
     if (_linkedName == null) {
       _linkedName =
-          '${super.linkedName}<span class="signature">(${element.linkedParams()})</span>';
+          '${returnType.linkedName} ${super.linkedName}<span class="signature">(${element.linkedParams()})</span>';
     }
     return _linkedName;
   }
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 84f222fd8e..0d5bf57c61 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -225,23 +225,23 @@ class InheritableAccessor extends Accessor with Inheritable {
     InheritableAccessor accessor;
     if (element == null) return null;
     if (inheritedAccessors.contains(element)) {
-      accessor = new ModelElement.from(element, enclosingClass.library,
+      accessor = new ModelElement.from(element, enclosingClass.library, enclosingClass.packageGraph,
           enclosingClass: enclosingClass);
     } else {
-      accessor = new ModelElement.from(element, enclosingClass.library);
+      accessor = new ModelElement.from(element, enclosingClass.library, enclosingClass.packageGraph);
     }
     return accessor;
   }
 
   ModelElement _enclosingElement;
   bool _isInherited = false;
-  InheritableAccessor(PropertyAccessorElement element, Library library)
-      : super(element, library, null);
+  InheritableAccessor(PropertyAccessorElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph, null);
 
   InheritableAccessor.inherited(
-      PropertyAccessorElement element, Library library, this._enclosingElement,
+      PropertyAccessorElement element, Library library, PackageGraph packageGraph, this._enclosingElement,
       {Member originalMember})
-      : super(element, library, originalMember) {
+      : super(element, library, packageGraph, originalMember) {
     _isInherited = true;
   }
 
@@ -271,8 +271,8 @@ class Accessor extends ModelElement
   GetterSetterCombo _enclosingCombo;
 
   Accessor(
-      PropertyAccessorElement element, Library library, Member originalMember)
-      : super(element, library, originalMember);
+      PropertyAccessorElement element, Library library, PackageGraph packageGraph, Member originalMember)
+      : super(element, library, packageGraph, originalMember);
 
   get linkedReturnType {
     assert(isGetter);
@@ -370,7 +370,7 @@ class Accessor extends ModelElement
           .findOrCreateLibraryFor(_accessor.enclosingElement.enclosingElement);
     }
 
-    return new ModelElement.from(_accessor.enclosingElement, library);
+    return new ModelElement.from(_accessor.enclosingElement, library, packageGraph);
   }
 
   @override
@@ -458,7 +458,7 @@ class Class extends ModelElement
   List<Field> _inheritedProperties;
   List<Field> _allInstanceProperties;
 
-  Class(ClassElement element, Library library) : super(element, library, null) {
+  Class(ClassElement element, Library library, PackageGraph packageGraph) : super(element, library, packageGraph, null) {
     _mixins = _cls.mixins
         .map((f) {
           ElementType t = new ElementType.from(f, packageGraph);
@@ -623,7 +623,7 @@ class Class extends ModelElement
     if (_constructors != null) return _constructors;
 
     _constructors = _cls.constructors.map((e) {
-      return new ModelElement.from(e, library);
+      return new ModelElement.from(e, library, packageGraph);
     }).toList(growable: true)
       ..sort(byName);
 
@@ -712,7 +712,7 @@ class Class extends ModelElement
       }).toSet();
 
       for (ExecutableElement e in inheritedMethodElements) {
-        Method m = new ModelElement.from(e, library, enclosingClass: this);
+        Method m = new ModelElement.from(e, library, packageGraph, enclosingClass: this);
         _inheritedMethods.add(m);
         _genPageMethods.add(m);
       }
@@ -737,7 +737,7 @@ class Class extends ModelElement
             !operatorNames.contains(e.name));
       }).toSet();
       for (ExecutableElement e in inheritedOperatorElements) {
-        Operator o = new ModelElement.from(e, library, enclosingClass: this);
+        Operator o = new ModelElement.from(e, library, packageGraph, enclosingClass: this);
         _inheritedOperators.add(o);
         _genPageOperators.add(o);
       }
@@ -1038,14 +1038,14 @@ class Class extends ModelElement
     if ((getter == null || getter.isInherited) &&
         (setter == null || setter.isInherited)) {
       // Field is 100% inherited.
-      field = new ModelElement.from(f, library,
+      field = new ModelElement.from(f, library, packageGraph,
           enclosingClass: this, getter: getter, setter: setter);
     } else {
       // Field is <100% inherited (could be half-inherited).
       // TODO(jcollins-g): Navigation is probably still confusing for
       // half-inherited fields when traversing the inheritance tree.  Make
       // this better, somehow.
-      field = new ModelElement.from(f, library, getter: getter, setter: setter);
+      field = new ModelElement.from(f, library, packageGraph, getter: getter, setter: setter);
     }
     _fields.add(field);
   }
@@ -1056,7 +1056,7 @@ class Class extends ModelElement
     if (_allMethods != null) return _allMethods;
 
     _allMethods = _cls.methods.map((e) {
-      return new ModelElement.from(e, library);
+      return new ModelElement.from(e, library, packageGraph);
     }).toList(growable: false)
       ..sort(byName);
 
@@ -1067,7 +1067,7 @@ class Class extends ModelElement
   @override
   List<TypeParameter> get typeParameters => _cls.typeParameters.map((f) {
         var lib = new Library(f.enclosingElement.library, packageGraph);
-        return new ModelElement.from(f, lib);
+        return new ModelElement.from(f, lib, packageGraph);
       }).toList();
 
   @override
@@ -1081,8 +1081,8 @@ class Class extends ModelElement
 class Constructor extends ModelElement
     with SourceCodeMixin, TypeParameters
     implements EnclosedElement {
-  Constructor(ConstructorElement element, Library library)
-      : super(element, library, null);
+  Constructor(ConstructorElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph, null);
 
   @override
   // TODO(jcollins-g): Revisit this when dart-lang/sdk#31517 is implemented.
@@ -1091,7 +1091,7 @@ class Constructor extends ModelElement
 
   @override
   ModelElement get enclosingElement =>
-      new ModelElement.from(_constructor.enclosingElement, library);
+      new ModelElement.from(_constructor.enclosingElement, library, packageGraph);
 
   String get fullKind {
     if (isConst) return 'const $kind';
@@ -1259,15 +1259,8 @@ abstract class Canonicalization extends Object
 }
 
 class Dynamic extends ModelElement {
-  @override
-  PackageGraph packageGraph;
-
-  Dynamic(Element element, Library library, PackageGraph p)
-      : super(element, library, null) {
-    packageGraph = p;
-    assert(packageGraph != null || library != null);
-    if (p == null) packageGraph = library.packageGraph;
-  }
+  Dynamic(Element element, PackageGraph packageGraph)
+      : super(element, null, packageGraph, null);
 
   @override
   ModelElement get enclosingElement => throw new UnsupportedError('');
@@ -1290,13 +1283,13 @@ abstract class EnclosedElement {
 }
 
 class Enum extends Class {
-  Enum(ClassElement element, Library library) : super(element, library);
+  Enum(ClassElement element, Library library, PackageGraph packageGraph) : super(element, library, packageGraph);
 
   @override
   List<EnumField> get instanceProperties {
     return super
         .instanceProperties
-        .map((Field p) => new ModelElement.from(p.element, p.library,
+        .map((Field p) => new ModelElement.from(p.element, p.library, p.packageGraph,
             getter: p.getter, setter: p.setter))
         .toList(growable: false);
   }
@@ -1314,12 +1307,12 @@ class EnumField extends Field {
   int _index;
 
   EnumField(
-      FieldElement element, Library library, Accessor getter, Accessor setter)
-      : super(element, library, getter, setter);
+      FieldElement element, Library library, PackageGraph packageGraph, Accessor getter, Accessor setter)
+      : super(element, library, packageGraph, getter, setter);
 
   EnumField.forConstant(
-      this._index, FieldElement element, Library library, Accessor getter)
-      : super(element, library, getter, null);
+      this._index, FieldElement element, Library library, PackageGraph packageGraph, Accessor getter)
+      : super(element, library, packageGraph, getter, null);
 
   @override
   String get constantValueBase {
@@ -1388,16 +1381,16 @@ class Field extends ModelElement
   @override
   final InheritableAccessor setter;
 
-  Field(FieldElement element, Library library, this.getter, this.setter)
-      : super(element, library, null) {
+  Field(FieldElement element, Library library, PackageGraph packageGraph, this.getter, this.setter)
+      : super(element, library, packageGraph, null) {
     if (getter != null) getter.enclosingCombo = this;
     if (setter != null) setter.enclosingCombo = this;
     _setModelType();
   }
 
   factory Field.inherited(FieldElement element, Class enclosingClass,
-      Library library, Accessor getter, Accessor setter) {
-    Field newField = new Field(element, library, getter, setter);
+      Library library, PackageGraph packageGraph, Accessor getter, Accessor setter) {
+    Field newField = new Field(element, library, packageGraph, getter, setter);
     newField._isInherited = true;
     newField._enclosingClass = enclosingClass;
     // Can't set _isInherited to true if this is the defining element, because
@@ -1422,7 +1415,7 @@ class Field extends ModelElement
   @override
   ModelElement get enclosingElement {
     if (_enclosingClass == null) {
-      _enclosingClass = new ModelElement.from(_field.enclosingElement, library);
+      _enclosingClass = new ModelElement.from(_field.enclosingElement, library, packageGraph);
     }
     return _enclosingClass;
   }
@@ -1727,9 +1720,6 @@ abstract class GetterSetterCombo implements ModelElement {
 }
 
 class Library extends ModelElement with Categorization {
-  @override
-  final PackageGraph packageGraph;
-
   List<Class> _classes;
   List<Class> _enums;
   List<ModelFunction> _functions;
@@ -1741,8 +1731,8 @@ class Library extends ModelElement with Categorization {
     return packageGraph.findOrCreateLibraryFor(element);
   }
 
-  Library._(LibraryElement element, this.packageGraph)
-      : super(element, null, null) {
+  Library._(LibraryElement element, PackageGraph packageGraph)
+      : super(element, null, packageGraph, null) {
     if (element == null) throw new ArgumentError.notNull('element');
     _exportedNamespace =
         new NamespaceBuilder().createExportNamespaceForLibrary(element);
@@ -1772,7 +1762,7 @@ class Library extends ModelElement with Categorization {
           }
         }
         return new ModelElement.from(
-                e.element, packageGraph.findOrCreateLibraryFor(e.element),
+                e.element, packageGraph.findOrCreateLibraryFor(e.element), packageGraph,
                 getter: getter, setter: setter)
             .fullyQualifiedName;
       }).toList();
@@ -1856,7 +1846,7 @@ class Library extends ModelElement with Categorization {
       importedExportedLibraryElements
           .addAll((element as LibraryElement).exportedLibraries);
       for (LibraryElement l in importedExportedLibraryElements) {
-        Library lib = new ModelElement.from(l, library);
+        Library lib = new ModelElement.from(l, library, packageGraph);
         _importedExportedLibraries.add(lib);
         _importedExportedLibraries.addAll(lib.importedExportedLibraries);
       }
@@ -1933,7 +1923,7 @@ class Library extends ModelElement with Categorization {
     enumClasses.addAll(_exportedNamespace.definedNames.values
         .where((element) => element is ClassElement && element.isEnum));
     _enums = enumClasses
-        .map((e) => new ModelElement.from(e, this))
+        .map((e) => new ModelElement.from(e, this, packageGraph))
         .toList(growable: false)
           ..sort(byName);
 
@@ -1966,7 +1956,7 @@ class Library extends ModelElement with Categorization {
         .where((element) => element is FunctionElement));
 
     _functions = elements.map((e) {
-      return new ModelElement.from(e, this);
+      return new ModelElement.from(e, this, packageGraph);
     }).toList(growable: false)
       ..sort(byName);
 
@@ -2081,7 +2071,7 @@ class Library extends ModelElement with Categorization {
     elements.addAll(_exportedNamespace.definedNames.values
         .where((element) => element is FunctionTypeAliasElement));
     _typeDefs = elements
-        .map((e) => new ModelElement.from(e, this))
+        .map((e) => new ModelElement.from(e, this, packageGraph))
         .toList(growable: false)
           ..sort(byName);
 
@@ -2108,7 +2098,7 @@ class Library extends ModelElement with Categorization {
         .where((element) => element is ClassElement && !element.isEnum));
 
     _classes = types
-        .map((e) => new ModelElement.from(e, this))
+        .map((e) => new ModelElement.from(e, this, packageGraph))
         .toList(growable: false)
           ..sort(byName);
 
@@ -2150,12 +2140,12 @@ class Library extends ModelElement with Categorization {
     for (TopLevelVariableElement element in elements) {
       Accessor getter;
       if (element.getter != null)
-        getter = new ModelElement.from(element.getter, this);
+        getter = new ModelElement.from(element.getter, this, packageGraph);
       Accessor setter;
       if (element.setter != null)
-        setter = new ModelElement.from(element.setter, this);
+        setter = new ModelElement.from(element.setter, this, packageGraph);
       ModelElement me =
-          new ModelElement.from(element, this, getter: getter, setter: setter);
+          new ModelElement.from(element, this, packageGraph, getter: getter, setter: setter);
       _variables.add(me);
     }
 
@@ -2325,21 +2315,21 @@ class Method extends ModelElement
   @override
   List<TypeParameter> typeParameters = [];
 
-  Method(MethodElement element, Library library)
-      : super(element, library, null) {
+  Method(MethodElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph, null) {
     _calcTypeParameters();
   }
 
   Method.inherited(MethodElement element, this._enclosingClass, Library library,
-      {Member originalMember})
-      : super(element, library, originalMember) {
+      PackageGraph packageGraph, {Member originalMember})
+      : super(element, library, packageGraph, originalMember) {
     _isInherited = true;
     _calcTypeParameters();
   }
 
   void _calcTypeParameters() {
     typeParameters = _method.typeParameters.map((f) {
-      return new ModelElement.from(f, library);
+      return new ModelElement.from(f, library, packageGraph);
     }).toList();
   }
 
@@ -2347,7 +2337,7 @@ class Method extends ModelElement
   ModelElement get enclosingElement {
     if (_enclosingClass == null) {
       _enclosingClass =
-          new ModelElement.from(_method.enclosingElement, library);
+          new ModelElement.from(_method.enclosingElement, library, packageGraph);
     }
     return _enclosingClass;
   }
@@ -2445,9 +2435,10 @@ class ScoredCandidate implements Comparable<ScoredCandidate> {
 ModelElement resolveMultiplyInheritedElement(
     MultiplyInheritedExecutableElement e,
     Library library,
+    PackageGraph packageGraph,
     Class enclosingClass) {
   Iterable<Inheritable> inheritables = e.inheritedElements.map((ee) =>
-      new ModelElement.fromElement(ee, library.packageGraph) as Inheritable);
+      new ModelElement.fromElement(ee, packageGraph) as Inheritable);
   Inheritable foundInheritable;
   int lowIndex = enclosingClass.inheritanceChain.length;
   for (var inheritable in inheritables) {
@@ -2458,7 +2449,7 @@ ModelElement resolveMultiplyInheritedElement(
       lowIndex = index;
     }
   }
-  return new ModelElement.from(foundInheritable.element, library,
+  return new ModelElement.from(foundInheritable.element, library, packageGraph,
       enclosingClass: enclosingClass);
 }
 
@@ -2512,11 +2503,12 @@ abstract class ModelElement extends Canonicalization
 
   // TODO(jcollins-g): make _originalMember optional after dart-lang/sdk#15101
   // is fixed.
-  ModelElement(this._element, this._library, this._originalMember) {}
+  ModelElement(this._element, this._library, this._packageGraph,
+               this._originalMember) {}
 
   factory ModelElement.fromElement(Element e, PackageGraph p) {
     Library lib = _findOrCreateEnclosingLibraryForStatic(e, p);
-    return new ModelElement.from(e, lib, packageGraph: p);
+    return new ModelElement.from(e, lib, p);
   }
 
   // TODO(jcollins-g): this way of using the optional parameter is messy,
@@ -2529,14 +2521,12 @@ abstract class ModelElement extends Canonicalization
   // parameter when given a null.
   /// Do not construct any ModelElements unless they are from this constructor.
   /// Specify enclosingClass only if this is to be an inherited object.
-  factory ModelElement.from(Element e, Library library,
+  factory ModelElement.from(Element e, Library library, PackageGraph packageGraph,
       {Class enclosingClass,
       Accessor getter,
-      Accessor setter,
-      PackageGraph packageGraph}) {
-    if (packageGraph == null)
-      packageGraph = library?.packageGraph;
-    assert(packageGraph != null || library != null);
+      Accessor setter}) {
+    assert(packageGraph != null && e != null);
+    assert(library != null || e is ParameterElement || e is TypeParameterElement || e is GenericFunctionTypeElementImpl);
     // With AnalysisDriver, we sometimes get ElementHandles when building
     // docs for the SDK, seen via [Library.importedExportedLibraries].  Why?
     if (e is ElementHandle) {
@@ -2560,19 +2550,19 @@ abstract class ModelElement extends Canonicalization
       assert(newModelElement.element is! MultiplyInheritedExecutableElement);
     } else {
       if (e.kind == ElementKind.DYNAMIC) {
-        newModelElement = new Dynamic(e, library, packageGraph);
+        newModelElement = new Dynamic(e, packageGraph);
       }
       if (e is MultiplyInheritedExecutableElement) {
         newModelElement =
-            resolveMultiplyInheritedElement(e, library, enclosingClass);
+            resolveMultiplyInheritedElement(e, library, packageGraph, enclosingClass);
       } else {
         if (e is LibraryElement) {
-          newModelElement = new Library(e, library.packageGraph);
+          newModelElement = new Library(e, packageGraph);
         }
         // Also handles enums
         if (e is ClassElement) {
           if (!e.isEnum) {
-            newModelElement = new Class(e, library);
+            newModelElement = new Class(e, library, packageGraph);
             if (newModelElement.name == 'Object' &&
                 newModelElement.library.name == 'dart:core') {
               // We've found Object.  This is an important object, so save it in the package.
@@ -2589,30 +2579,29 @@ abstract class ModelElement extends Canonicalization
                   newModelElement;
             }
           } else {
-            newModelElement = new Enum(e, library);
+            newModelElement = new Enum(e, library, packageGraph);
           }
         }
         if (e is FunctionElement) {
-          newModelElement = new ModelFunction(e, library);
+          newModelElement = new ModelFunction(e, library, packageGraph);
         } else if (e is GenericFunctionTypeElement) {
           if (e is FunctionTypeAliasElement) {
             assert(e.name != '');
-            newModelElement = new ModelFunctionTypedef(e, library);
+            newModelElement = new ModelFunctionTypedef(e, library, packageGraph);
           } else {
             if (e.enclosingElement is GenericTypeAliasElement) {
               assert(e.enclosingElement.name != '');
-              newModelElement = new ModelFunctionTypedef(e, library);
+              newModelElement = new ModelFunctionTypedef(e, library, packageGraph);
             } else {
               // Allowing null here is allowed as a workaround for
               // dart-lang/sdk#32005.
               assert(e.name == '' || e.name == null);
-              assert(library == null);
               newModelElement = new ModelFunctionAnonymous(e, packageGraph);
             }
           }
         }
         if (e is FunctionTypeAliasElement) {
-          newModelElement = new Typedef(e, library);
+          newModelElement = new Typedef(e, library, packageGraph);
         }
         if (e is FieldElement) {
           if (enclosingClass == null) {
@@ -2620,34 +2609,34 @@ abstract class ModelElement extends Canonicalization
               int index =
                   e.computeConstantValue().getField(e.name).toIntValue();
               newModelElement =
-                  new EnumField.forConstant(index, e, library, getter);
+                  new EnumField.forConstant(index, e, library, packageGraph, getter);
             } else if (e.enclosingElement.isEnum) {
-              newModelElement = new EnumField(e, library, getter, setter);
+              newModelElement = new EnumField(e, library, packageGraph, getter, setter);
             } else {
-              newModelElement = new Field(e, library, getter, setter);
+              newModelElement = new Field(e, library, packageGraph, getter, setter);
             }
           } else {
             // EnumFields can't be inherited, so this case is simpler.
             newModelElement =
-                new Field.inherited(e, enclosingClass, library, getter, setter);
+                new Field.inherited(e, enclosingClass, library, packageGraph, getter, setter);
           }
         }
         if (e is ConstructorElement) {
-          newModelElement = new Constructor(e, library);
+          newModelElement = new Constructor(e, library, packageGraph);
         }
         if (e is MethodElement && e.isOperator) {
           if (enclosingClass == null)
-            newModelElement = new Operator(e, library);
+            newModelElement = new Operator(e, library, packageGraph);
           else
             newModelElement = new Operator.inherited(e, enclosingClass, library,
-                originalMember: originalMember);
+                packageGraph, originalMember: originalMember);
         }
         if (e is MethodElement && !e.isOperator) {
           if (enclosingClass == null)
-            newModelElement = new Method(e, library);
+            newModelElement = new Method(e, library, packageGraph);
           else
             newModelElement = new Method.inherited(e, enclosingClass, library,
-                originalMember: originalMember);
+                packageGraph, originalMember: originalMember);
         }
         if (e is TopLevelVariableElement) {
           if (getter == null && setter == null) {
@@ -2656,7 +2645,7 @@ abstract class ModelElement extends Canonicalization
               ..addAll(library.constants);
             newModelElement = allVariables.firstWhere((v) => v.element == e);
           } else {
-            newModelElement = new TopLevelVariable(e, library, getter, setter);
+            newModelElement = new TopLevelVariable(e, library, packageGraph, getter, setter);
           }
         }
         if (e is PropertyAccessorElement) {
@@ -2664,22 +2653,21 @@ abstract class ModelElement extends Canonicalization
           if (e.enclosingElement is ClassElement ||
               e is MultiplyInheritedExecutableElement) {
             if (enclosingClass == null)
-              newModelElement = new InheritableAccessor(e, library);
+              newModelElement = new InheritableAccessor(e, library, packageGraph);
             else
               newModelElement = new InheritableAccessor.inherited(
-                  e, library, enclosingClass,
+                  e, library, packageGraph, enclosingClass,
                   originalMember: originalMember);
           } else {
-            newModelElement = new Accessor(e, library, null);
+            newModelElement = new Accessor(e, library, packageGraph, null);
           }
         }
         if (e is TypeParameterElement) {
-          newModelElement = new TypeParameter(e, library);
+          newModelElement = new TypeParameter(e, library, packageGraph);
         }
         if (e is ParameterElement) {
-          assert(library == null);
           newModelElement =
-              new Parameter(e, packageGraph, originalMember: originalMember);
+              new Parameter(e, library, packageGraph, originalMember: originalMember);
         }
       }
     }
@@ -2825,15 +2813,16 @@ abstract class ModelElement extends Canonicalization
         GetterSetterCombo thisAsCombo = this as GetterSetterCombo;
         if (thisAsCombo.hasGetter) {
           newGetter = new ModelElement.from(
-              thisAsCombo.getter.element, thisAsCombo.getter.definingLibrary);
+              thisAsCombo.getter.element, thisAsCombo.getter.definingLibrary, thisAsCombo.getter.packageGraph);
         }
         if (thisAsCombo.hasSetter) {
           newSetter = new ModelElement.from(
-              thisAsCombo.setter.element, thisAsCombo.setter.definingLibrary);
+              thisAsCombo.setter.element, thisAsCombo.setter.definingLibrary, thisAsCombo.setter.packageGraph);
         }
       }
       ModelElement fromThis = new ModelElement.from(
           element, thisInheritable.definingEnclosingElement.library,
+          thisInheritable.definingEnclosingElement.packageGraph,
           getter: newGetter, setter: newSetter);
       docFrom = fromThis.documentationFrom;
     } else {
@@ -3199,10 +3188,9 @@ abstract class ModelElement extends Canonicalization
     return _overriddenDepth;
   }
 
+  final PackageGraph _packageGraph;
   @override
-  PackageGraph get packageGraph => (this is Library)
-      ? (this as Library).packageGraph
-      : this.library.packageGraph;
+  PackageGraph get packageGraph => _packageGraph;
 
   bool get isPublicAndPackageDocumented =>
       isPublic && library.packageGraph.packageDocumentedFor(this);
@@ -3258,7 +3246,7 @@ abstract class ModelElement extends Canonicalization
       }
 
       _parameters = new UnmodifiableListView<Parameter>(params
-          .map((p) => new ModelElement.from(p, library, packageGraph: packageGraph))
+          .map((p) => new ModelElement.from(p, library, packageGraph))
           .toList() as Iterable<Parameter>);
     }
     return _parameters;
@@ -3422,8 +3410,7 @@ abstract class ModelElement extends Canonicalization
     assert(!name.isEmpty ||
         (this.element is TypeDefiningElement &&
             (this.element as TypeDefiningElement).type.name == "dynamic") ||
-        (this is ModelFunction &&
-            element.enclosingElement is ParameterElement));
+        this is ModelFunction);
 
     if (href == null) {
       if (isPublicAndPackageDocumented) {
@@ -3449,9 +3436,6 @@ abstract class ModelElement extends Canonicalization
     if (lib == null) {
       lib = packageGraph.findOrCreateLibraryFor(e);
     }
-    if (lib == null) {
-      assert(e.kind == ElementKind.DYNAMIC);
-    }
     return lib;
   }
 
@@ -3597,14 +3581,17 @@ abstract class ModelElement extends Canonicalization
 
 /// A [ModelElement] for a [FunctionElement] that isn't part of a type definition.
 class ModelFunction extends ModelFunctionTyped {
-  ModelFunction(FunctionElement element, Library library)
-      : super(element, library);
+  ModelFunction(FunctionElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph);
 
   @override
   bool get isStatic {
     return _func.isStatic;
   }
 
+  @override
+  String get name => element.name ?? '';
+
   @override
   FunctionElement get _func => (element as FunctionElement);
 }
@@ -3616,12 +3603,8 @@ class ModelFunction extends ModelFunctionTyped {
 /// have a name, but we document it as "Function" to match how these are
 /// written in declarations.
 class ModelFunctionAnonymous extends ModelFunctionTyped {
-  ModelFunctionAnonymous(FunctionTypedElement element, this._packageGraph)
-      : super(element, null) {}
-
-  final PackageGraph _packageGraph;
-  @override
-  PackageGraph get packageGraph => _packageGraph;
+  ModelFunctionAnonymous(FunctionTypedElement element, PackageGraph packageGraph)
+      : super(element, null, packageGraph) {}
 
   @override
   String get name => 'Function';
@@ -3636,8 +3619,8 @@ class ModelFunctionAnonymous extends ModelFunctionTyped {
 /// A [ModelElement] for a [GenericModelFunctionElement] that is part of an
 /// explicit typedef.
 class ModelFunctionTypedef extends ModelFunctionTyped {
-  ModelFunctionTypedef(FunctionTypedElement element, Library library)
-      : super(element, library);
+  ModelFunctionTypedef(FunctionTypedElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph);
 
   @override
   String get name {
@@ -3658,14 +3641,14 @@ class ModelFunctionTyped extends ModelElement
   @override
   List<TypeParameter> typeParameters = [];
 
-  ModelFunctionTyped(FunctionTypedElement element, Library library)
-      : super(element, library, null) {
+  ModelFunctionTyped(FunctionTypedElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph, null) {
     _calcTypeParameters();
   }
 
   void _calcTypeParameters() {
     typeParameters = _func.typeParameters.map((f) {
-      return new ModelElement.from(f, library, packageGraph: packageGraph);
+      return new ModelElement.from(f, library, packageGraph);
     }).toList();
   }
 
@@ -3730,12 +3713,12 @@ class Operator extends Method {
     "%": "modulo"
   };
 
-  Operator(MethodElement element, Library library) : super(element, library);
+  Operator(MethodElement element, Library library, PackageGraph packageGraph) : super(element, library, packageGraph);
 
   Operator.inherited(
       MethodElement element, Class enclosingClass, Library library,
-      {Member originalMember})
-      : super.inherited(element, enclosingClass, library,
+      PackageGraph packageGraph, {Member originalMember})
+      : super.inherited(element, enclosingClass, library, packageGraph,
             originalMember: originalMember) {
     _isInherited = true;
   }
@@ -4435,11 +4418,11 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
         Accessor getter;
         Accessor setter;
         if (e is PropertyInducingElement) {
-          if (e.getter != null) getter = new ModelElement.from(e.getter, lib);
-          if (e.setter != null) setter = new ModelElement.from(e.setter, lib);
+          if (e.getter != null) getter = new ModelElement.from(e.getter, lib, packageGraph);
+          if (e.setter != null) setter = new ModelElement.from(e.setter, lib, packageGraph);
         }
         modelElement =
-            new ModelElement.from(e, lib, getter: getter, setter: setter);
+            new ModelElement.from(e, lib, packageGraph, getter: getter, setter: setter);
       }
       assert(modelElement is! Inheritable);
       if (modelElement != null && !modelElement.isCanonical) {
@@ -4696,8 +4679,8 @@ class Package extends LibraryContainer implements Comparable<Package>, Privacy {
 }
 
 class Parameter extends ModelElement implements EnclosedElement {
-  Parameter(ParameterElement element, this._packageGraph, {Member originalMember})
-      : super(element, null, originalMember);
+  Parameter(ParameterElement element, Library library, PackageGraph packageGraph, {Member originalMember})
+      : super(element, library, packageGraph, originalMember);
   String get defaultValue {
     if (!hasDefaultValue) return null;
     return _parameter.defaultValueCode;
@@ -4705,7 +4688,7 @@ class Parameter extends ModelElement implements EnclosedElement {
 
   @override
   ModelElement get enclosingElement =>
-      new ModelElement.from(_parameter.enclosingElement, library);
+      new ModelElement.from(_parameter.enclosingElement, library, packageGraph);
 
   bool get hasDefaultValue {
     return _parameter.defaultValueCode != null &&
@@ -4745,10 +4728,6 @@ class Parameter extends ModelElement implements EnclosedElement {
 
   ParameterElement get _parameter => element as ParameterElement;
 
-  final PackageGraph _packageGraph;
-  @override
-  PackageGraph get packageGraph => _packageGraph;
-
   @override
   String toString() => element.name;
 }
@@ -4896,9 +4875,9 @@ class TopLevelVariable extends ModelElement
   @override
   final Accessor setter;
 
-  TopLevelVariable(TopLevelVariableElement element, Library library,
+  TopLevelVariable(TopLevelVariableElement element, Library library, PackageGraph packageGraph,
       this.getter, this.setter)
-      : super(element, library, null) {
+      : super(element, library, packageGraph, null) {
     if (getter != null) {
       getter.enclosingCombo = this;
       assert(getter.enclosingCombo != null);
@@ -4972,8 +4951,8 @@ class TopLevelVariable extends ModelElement
 class Typedef extends ModelElement
     with SourceCodeMixin, TypeParameters
     implements EnclosedElement {
-  Typedef(FunctionTypeAliasElement element, Library library)
-      : super(element, library, null);
+  Typedef(FunctionTypeAliasElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph, null);
 
   @override
   ModelElement get enclosingElement => library;
@@ -5015,17 +4994,17 @@ class Typedef extends ModelElement
 
   @override
   List<TypeParameter> get typeParameters => _typedef.typeParameters.map((f) {
-        return new ModelElement.from(f, library);
+        return new ModelElement.from(f, library, packageGraph);
       }).toList();
 }
 
 class TypeParameter extends ModelElement {
-  TypeParameter(TypeParameterElement element, Library library)
-      : super(element, library, null);
+  TypeParameter(TypeParameterElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph, null);
 
   @override
   ModelElement get enclosingElement =>
-      new ModelElement.from(element.enclosingElement, library);
+      new ModelElement.from(element.enclosingElement, library, packageGraph);
 
   @override
   String get href {
diff --git a/pubspec.lock b/pubspec.lock
index b272f2af91..e3ad5b8acc 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -408,4 +408,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.40.0"
+  dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.42.0"
diff --git a/test/model_test.dart b/test/model_test.dart
index e4fdef5007..25136ed709 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -1416,7 +1416,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           getAFunctionReturningVoid.linkedReturnType,
           equals(
-              'Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span>'));
+              'void Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span>'));
     });
 
     test(
@@ -1425,7 +1425,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           getAFunctionReturningBool.linkedReturnType,
           equals(
-              'Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span>'));
+              'bool Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span>'));
     });
 
     test('has a fully qualified name', () {
@@ -1937,10 +1937,13 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     TopLevelVariable v3, justGetter, justSetter;
     TopLevelVariable setAndGet, mapWithDynamicKeys;
     TopLevelVariable nodocGetter, nodocSetter;
+    TopLevelVariable complicatedReturn;
 
     setUp(() {
       v = exLibrary.properties.firstWhere((p) => p.name == 'number');
       v3 = exLibrary.properties.firstWhere((p) => p.name == 'y');
+      complicatedReturn =
+          fakeLibrary.properties.firstWhere((f) => f.name == 'complicatedReturn');
       nodocGetter = fakeLibrary.properties
           .firstWhere((p) => p.name == 'getterSetterNodocGetter');
       nodocSetter = fakeLibrary.properties
@@ -1955,6 +1958,10 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .firstWhere((p) => p.name == 'mapWithDynamicKeys');
     });
 
+    test('Verify that a complex type parameter with an anonymous function works correctly', () {
+      expect(complicatedReturn.linkedReturnType, equals('<a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span>&gt;</span>'));
+    });
+
     test('@nodoc on simple property works', () {
       TopLevelVariable nodocSimple = fakeLibrary.publicProperties.firstWhere(
           (p) => p.name == 'simplePropertyHidden',
@@ -2262,6 +2269,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       t = exLibrary.typedefs.firstWhere((t) => t.name == 'processMessage');
       generic =
           fakeLibrary.typedefs.firstWhere((t) => t.name == 'NewGenericTypedef');
+
       aComplexTypedef =
           exLibrary.typedefs.firstWhere((t) => t.name == 'aComplexTypedef');
       TypedefUsingClass =
@@ -2280,7 +2288,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('anonymous nested functions inside typedefs are handled', () {
       expect(aComplexTypedef, isNotNull);
-      expect(aComplexTypedef.linkedReturnType, startsWith('Function'));
+      expect(aComplexTypedef.linkedReturnType, startsWith('void Function'));
       expect(aComplexTypedef.nameWithGenerics,
           equals('aComplexTypedef&lt;A1, A2, A3&gt;'));
     });
@@ -2290,7 +2298,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           aComplexTypedef.linkedReturnType,
           equals(
-              'Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span>'));
+              'void Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span>'));
       expect(
           aComplexTypedef.linkedParamsLines,
           equals(
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index 027d4931d6..ab33f786af 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -221,11 +221,9 @@ typedef T GenericTypedef<T>(T input);
 /// A typedef with the new style generic function syntax.
 typedef NewGenericTypedef<T> = List<S> Function<S>(T, int, bool);
 
-
-
+/// A complicated type parameter to ATypeTakingClass.
 ATypeTakingClass<String Function(int)> get complicatedReturn => null;
 
-
 /// Lots and lots of parameters.
 typedef int LotsAndLotsOfParameters(so, many, parameters, it, should, wrap,
     when, converted, to, html, documentation);
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
index d2eab36995..f5227a43ea 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
@@ -164,7 +164,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="getAFunctionReturningBool" class="callable">
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html">getAFunctionReturningBool</a></span><span class="signature">&lt;T1, T2, T3&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
+            <span class="returntype parameter">&#8594; bool Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
           </span>
         </dt>
         <dd>
@@ -174,7 +174,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="getAFunctionReturningVoid" class="callable">
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html">getAFunctionReturningVoid</a></span><span class="signature">&lt;T1, T2&gt;</span><span class="signature">(<wbr><span class="parameter" id="getAFunctionReturningVoid-param-callback"><span class="type-annotation">void</span> <span class="parameter-name">callback</span>(<span class="parameter" id="callback-param-argument1"><span class="type-annotation">T1</span> <span class="parameter-name">argument1</span>, </span> <span class="parameter" id="callback-param-argument2"><span class="type-annotation">T2</span> <span class="parameter-name">argument2</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span></span>
+            <span class="returntype parameter">&#8594; void Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span></span>
           </span>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
index c6bf9a5030..25da6aeb0c 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
@@ -67,7 +67,7 @@ <h5>TypedFunctionsWithoutTypedefs class</h5>
     <h1>getAFunctionReturningBool&lt;T1, T2, T3&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
+      <span class="returntype">bool Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
       <span class="name ">getAFunctionReturningBool</span>
 &lt;T1, T2, T3&gt;(<wbr>)
     </section>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
index d53d98a4fe..fa02fa56ca 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
@@ -67,7 +67,7 @@ <h5>TypedFunctionsWithoutTypedefs class</h5>
     <h1>getAFunctionReturningVoid&lt;T1, T2&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span></span>
+      <span class="returntype">void Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span></span>
       <span class="name ">getAFunctionReturningVoid</span>
 &lt;T1, T2&gt;(<wbr><span class="parameter" id="getAFunctionReturningVoid-param-callback"><span class="type-annotation">void</span> <span class="parameter-name">callback</span>(<span class="parameter" id="callback-param-argument1"><span class="type-annotation">T1</span> <span class="parameter-name">argument1</span>, </span> <span class="parameter" id="callback-param-argument2"><span class="type-annotation">T2</span> <span class="parameter-name">argument2</span></span>)</span>)
     </section>
diff --git a/testing/test_package_docs/ex/aComplexTypedef.html b/testing/test_package_docs/ex/aComplexTypedef.html
index 77b1099c28..881008db83 100644
--- a/testing/test_package_docs/ex/aComplexTypedef.html
+++ b/testing/test_package_docs/ex/aComplexTypedef.html
@@ -110,7 +110,7 @@ <h5>ex library</h5>
     <h1>aComplexTypedef&lt;A1, A2, A3&gt; typedef</h1>
 
     <section class="multi-line-signature">
-        <span class="returntype">Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
+        <span class="returntype">void Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
         <span class="name ">aComplexTypedef</span>
 (<wbr><span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">String</span></span>)
     </section>
diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html
index beefc48964..f6dd70e36a 100644
--- a/testing/test_package_docs/ex/ex-library.html
+++ b/testing/test_package_docs/ex/ex-library.html
@@ -440,7 +440,7 @@ <h2>Typedefs</h2>
       <dl class="callables">
         <dt id="aComplexTypedef" class="callable">
           <span class="name"><a href="ex/aComplexTypedef.html">aComplexTypedef</a></span><span class="signature">&lt;A1, A2, A3&gt;</span><span class="signature">(<wbr><span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">String</span></span>)
-            <span class="returntype parameter">&#8594; Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
+            <span class="returntype parameter">&#8594; void Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
           </span>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/fake/ABaseClass-class.html b/testing/test_package_docs/fake/ABaseClass-class.html
index 57793ce6d8..ec9405de01 100644
--- a/testing/test_package_docs/fake/ABaseClass-class.html
+++ b/testing/test_package_docs/fake/ABaseClass-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
index 1d3e8c147e..b705de0e55 100644
--- a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
+++ b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/AClassWithFancyProperties-class.html b/testing/test_package_docs/fake/AClassWithFancyProperties-class.html
index 5c220ce906..318509552f 100644
--- a/testing/test_package_docs/fake/AClassWithFancyProperties-class.html
+++ b/testing/test_package_docs/fake/AClassWithFancyProperties-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/AMixinCallingSuper-class.html b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
index 6077b80b22..9b980c2716 100644
--- a/testing/test_package_docs/fake/AMixinCallingSuper-class.html
+++ b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass-class.html b/testing/test_package_docs/fake/ATypeTakingClass-class.html
index f30c050be6..b9dfdb1f34 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass-class.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html b/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
index 439dc5ee4f..dccae38c4f 100644
--- a/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
+++ b/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/Annotation-class.html b/testing/test_package_docs/fake/Annotation-class.html
index 4aa53c9e36..ac8a4640f0 100644
--- a/testing/test_package_docs/fake/Annotation-class.html
+++ b/testing/test_package_docs/fake/Annotation-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/AnotherInterface-class.html b/testing/test_package_docs/fake/AnotherInterface-class.html
index 1249880900..4e34253676 100644
--- a/testing/test_package_docs/fake/AnotherInterface-class.html
+++ b/testing/test_package_docs/fake/AnotherInterface-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/BaseForDocComments-class.html b/testing/test_package_docs/fake/BaseForDocComments-class.html
index 9e8ed14333..a12fe20139 100644
--- a/testing/test_package_docs/fake/BaseForDocComments-class.html
+++ b/testing/test_package_docs/fake/BaseForDocComments-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/BaseThingy-class.html b/testing/test_package_docs/fake/BaseThingy-class.html
index 4317b3a717..090957bd08 100644
--- a/testing/test_package_docs/fake/BaseThingy-class.html
+++ b/testing/test_package_docs/fake/BaseThingy-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/BaseThingy2-class.html b/testing/test_package_docs/fake/BaseThingy2-class.html
index 24ca694133..d6ab678540 100644
--- a/testing/test_package_docs/fake/BaseThingy2-class.html
+++ b/testing/test_package_docs/fake/BaseThingy2-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
index e733847a72..c5394a4ff3 100644
--- a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
+++ b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html b/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html
index 09226731ce..7b26d8dafc 100644
--- a/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html
+++ b/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/Callback2.html b/testing/test_package_docs/fake/Callback2.html
index c8a224e847..d7fc6be25a 100644
--- a/testing/test_package_docs/fake/Callback2.html
+++ b/testing/test_package_docs/fake/Callback2.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
index 69f8e8a788..d90e552f23 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/Color-class.html b/testing/test_package_docs/fake/Color-class.html
index ef8b3b9d8f..f932585f0b 100644
--- a/testing/test_package_docs/fake/Color-class.html
+++ b/testing/test_package_docs/fake/Color-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ConstantClass-class.html b/testing/test_package_docs/fake/ConstantClass-class.html
index 9b081d7276..c65d54982c 100644
--- a/testing/test_package_docs/fake/ConstantClass-class.html
+++ b/testing/test_package_docs/fake/ConstantClass-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ConstructorTester-class.html b/testing/test_package_docs/fake/ConstructorTester-class.html
index 43bb59f754..acd3c82fbc 100644
--- a/testing/test_package_docs/fake/ConstructorTester-class.html
+++ b/testing/test_package_docs/fake/ConstructorTester-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/Cool-class.html b/testing/test_package_docs/fake/Cool-class.html
index bf892b25c0..28c01dba56 100644
--- a/testing/test_package_docs/fake/Cool-class.html
+++ b/testing/test_package_docs/fake/Cool-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/DOWN-constant.html b/testing/test_package_docs/fake/DOWN-constant.html
index a9b6736a4f..a240b20641 100644
--- a/testing/test_package_docs/fake/DOWN-constant.html
+++ b/testing/test_package_docs/fake/DOWN-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/DocumentWithATable-class.html b/testing/test_package_docs/fake/DocumentWithATable-class.html
index bcfef59d60..a6e805064c 100644
--- a/testing/test_package_docs/fake/DocumentWithATable-class.html
+++ b/testing/test_package_docs/fake/DocumentWithATable-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/Doh-class.html b/testing/test_package_docs/fake/Doh-class.html
index a5884987a2..f37f30a18f 100644
--- a/testing/test_package_docs/fake/Doh-class.html
+++ b/testing/test_package_docs/fake/Doh-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
index 8f910bcd57..5e5bc6f3fa 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index 47661f15e1..136a565583 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/FakeProcesses.html b/testing/test_package_docs/fake/FakeProcesses.html
index 9ff61b98db..6114002164 100644
--- a/testing/test_package_docs/fake/FakeProcesses.html
+++ b/testing/test_package_docs/fake/FakeProcesses.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/Foo2-class.html b/testing/test_package_docs/fake/Foo2-class.html
index 8432eeb23f..3ee53342e7 100644
--- a/testing/test_package_docs/fake/Foo2-class.html
+++ b/testing/test_package_docs/fake/Foo2-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/GenericTypedef.html b/testing/test_package_docs/fake/GenericTypedef.html
index 977c29d039..379f500188 100644
--- a/testing/test_package_docs/fake/GenericTypedef.html
+++ b/testing/test_package_docs/fake/GenericTypedef.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends-class.html b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
index b27b0015a9..489b565109 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends-class.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/HasGenerics-class.html b/testing/test_package_docs/fake/HasGenerics-class.html
index 7fca4e804a..a08115d39d 100644
--- a/testing/test_package_docs/fake/HasGenerics-class.html
+++ b/testing/test_package_docs/fake/HasGenerics-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ImplementingThingy-class.html b/testing/test_package_docs/fake/ImplementingThingy-class.html
index 1045442c62..ac056e0547 100644
--- a/testing/test_package_docs/fake/ImplementingThingy-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ImplementingThingy2-class.html b/testing/test_package_docs/fake/ImplementingThingy2-class.html
index 03709fc660..c4242cba0d 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
index 7005b73997..aa11bff557 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ImplicitProperties-class.html b/testing/test_package_docs/fake/ImplicitProperties-class.html
index 44cb641b00..f0d470b427 100644
--- a/testing/test_package_docs/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs/fake/ImplicitProperties-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/InheritingClassOne-class.html b/testing/test_package_docs/fake/InheritingClassOne-class.html
index 326edbbeac..69e19c1fc3 100644
--- a/testing/test_package_docs/fake/InheritingClassOne-class.html
+++ b/testing/test_package_docs/fake/InheritingClassOne-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/InheritingClassTwo-class.html b/testing/test_package_docs/fake/InheritingClassTwo-class.html
index b90b9ebefc..d56922fd70 100644
--- a/testing/test_package_docs/fake/InheritingClassTwo-class.html
+++ b/testing/test_package_docs/fake/InheritingClassTwo-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/Interface-class.html b/testing/test_package_docs/fake/Interface-class.html
index 0df9ffa67e..fe0afaff47 100644
--- a/testing/test_package_docs/fake/Interface-class.html
+++ b/testing/test_package_docs/fake/Interface-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/LongFirstLine-class.html b/testing/test_package_docs/fake/LongFirstLine-class.html
index aefc8eb105..35b5e04af3 100644
--- a/testing/test_package_docs/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs/fake/LongFirstLine-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
index 48cb1eea4c..149898fec8 100644
--- a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
+++ b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/MIEEBase-class.html b/testing/test_package_docs/fake/MIEEBase-class.html
index 1e8b635794..dabb529e7f 100644
--- a/testing/test_package_docs/fake/MIEEBase-class.html
+++ b/testing/test_package_docs/fake/MIEEBase-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/MIEEMixin-class.html b/testing/test_package_docs/fake/MIEEMixin-class.html
index be5edf79e1..d1a3c7ed39 100644
--- a/testing/test_package_docs/fake/MIEEMixin-class.html
+++ b/testing/test_package_docs/fake/MIEEMixin-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html b/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
index 912b9b9de6..1aed898e93 100644
--- a/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
+++ b/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/MIEEThing-class.html b/testing/test_package_docs/fake/MIEEThing-class.html
index bb2dfcb6ff..3178eb1546 100644
--- a/testing/test_package_docs/fake/MIEEThing-class.html
+++ b/testing/test_package_docs/fake/MIEEThing-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/MixMeIn-class.html b/testing/test_package_docs/fake/MixMeIn-class.html
index 50a20906ea..725258906b 100644
--- a/testing/test_package_docs/fake/MixMeIn-class.html
+++ b/testing/test_package_docs/fake/MixMeIn-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
index 2753e6a799..e0345ec6a8 100644
--- a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
+++ b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
index 8eaf5eed5e..5954864dab 100644
--- a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
+++ b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/NewGenericTypedef.html b/testing/test_package_docs/fake/NewGenericTypedef.html
index 7d9058dfe0..b2b04fc647 100644
--- a/testing/test_package_docs/fake/NewGenericTypedef.html
+++ b/testing/test_package_docs/fake/NewGenericTypedef.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/NotAMixin-class.html b/testing/test_package_docs/fake/NotAMixin-class.html
index 429a6564f3..77e654b6bc 100644
--- a/testing/test_package_docs/fake/NotAMixin-class.html
+++ b/testing/test_package_docs/fake/NotAMixin-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/Oops-class.html b/testing/test_package_docs/fake/Oops-class.html
index da30193168..84159607bc 100644
--- a/testing/test_package_docs/fake/Oops-class.html
+++ b/testing/test_package_docs/fake/Oops-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass-class.html b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
index d581ba965b..da3faadf75 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass-class.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing-class.html b/testing/test_package_docs/fake/OtherGenericsThing-class.html
index 364250bbd0..11516a67ef 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing-class.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/PI-constant.html b/testing/test_package_docs/fake/PI-constant.html
index 13baaa58e7..502d21694a 100644
--- a/testing/test_package_docs/fake/PI-constant.html
+++ b/testing/test_package_docs/fake/PI-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ReferringClass-class.html b/testing/test_package_docs/fake/ReferringClass-class.html
index 7a85bef636..8f4a0b77d1 100644
--- a/testing/test_package_docs/fake/ReferringClass-class.html
+++ b/testing/test_package_docs/fake/ReferringClass-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList-class.html b/testing/test_package_docs/fake/SpecialList-class.html
index 91cd13282f..5906f72c9f 100644
--- a/testing/test_package_docs/fake/SpecialList-class.html
+++ b/testing/test_package_docs/fake/SpecialList-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/SubForDocComments-class.html b/testing/test_package_docs/fake/SubForDocComments-class.html
index 21c293d0e4..e04822508a 100644
--- a/testing/test_package_docs/fake/SubForDocComments-class.html
+++ b/testing/test_package_docs/fake/SubForDocComments-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass-class.html b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
index 3aa3d95267..7f57c95e19 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/TypedefUsingClass-class.html b/testing/test_package_docs/fake/TypedefUsingClass-class.html
index 6d3d46bce5..10647741e3 100644
--- a/testing/test_package_docs/fake/TypedefUsingClass-class.html
+++ b/testing/test_package_docs/fake/TypedefUsingClass-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/UP-constant.html b/testing/test_package_docs/fake/UP-constant.html
index e4370c3f47..e88e1c215d 100644
--- a/testing/test_package_docs/fake/UP-constant.html
+++ b/testing/test_package_docs/fake/UP-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/VoidCallback.html b/testing/test_package_docs/fake/VoidCallback.html
index 8303565b0f..6f579b5236 100644
--- a/testing/test_package_docs/fake/VoidCallback.html
+++ b/testing/test_package_docs/fake/VoidCallback.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter-class.html b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
index 02999da445..21bbbbcfba 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter-class.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/ZERO-constant.html b/testing/test_package_docs/fake/ZERO-constant.html
index 9564cce7ec..001e82466e 100644
--- a/testing/test_package_docs/fake/ZERO-constant.html
+++ b/testing/test_package_docs/fake/ZERO-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/aCoolVariable.html b/testing/test_package_docs/fake/aCoolVariable.html
index bacff2a876..6306188b8b 100644
--- a/testing/test_package_docs/fake/aCoolVariable.html
+++ b/testing/test_package_docs/fake/aCoolVariable.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/aVoidParameter.html b/testing/test_package_docs/fake/aVoidParameter.html
index 1129169672..2862c9edca 100644
--- a/testing/test_package_docs/fake/aVoidParameter.html
+++ b/testing/test_package_docs/fake/aVoidParameter.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/addCallback.html b/testing/test_package_docs/fake/addCallback.html
index 81cd65cc47..5b98195c5c 100644
--- a/testing/test_package_docs/fake/addCallback.html
+++ b/testing/test_package_docs/fake/addCallback.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/addCallback2.html b/testing/test_package_docs/fake/addCallback2.html
index ea8b2c12ad..b6587c1b0e 100644
--- a/testing/test_package_docs/fake/addCallback2.html
+++ b/testing/test_package_docs/fake/addCallback2.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/complicatedReturn.html b/testing/test_package_docs/fake/complicatedReturn.html
new file mode 100644
index 0000000000..d624c84235
--- /dev/null
+++ b/testing/test_package_docs/fake/complicatedReturn.html
@@ -0,0 +1,197 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the complicatedReturn property from the fake library, for the Dart programming language.">
+  <title>complicatedReturn property - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">complicatedReturn property</li>
+  </ol>
+  <div class="self-name">complicatedReturn</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>complicatedReturn top-level property</h1>
+
+
+    <section id="getter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype"><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span>&gt;</span></span>
+      <span class="name ">complicatedReturn</span>
+  
+</section>
+    
+    <section class="desc markdown">
+  <p>A complicated type parameter to ATypeTakingClass.</p>
+</section>
+
+</section>
+    
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/dynamicGetter.html b/testing/test_package_docs/fake/dynamicGetter.html
index d52bb66856..6b1305bc5b 100644
--- a/testing/test_package_docs/fake/dynamicGetter.html
+++ b/testing/test_package_docs/fake/dynamicGetter.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index 7be70a412a..d8d18daac3 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -525,6 +525,14 @@ <h2>Properties</h2>
         <dd>
           A variable initalization making use of optional new.
           <div class="features">read / write</div>
+</dd>
+        <dt id="complicatedReturn" class="property">
+          <span class="name"><a href="fake/complicatedReturn.html">complicatedReturn</a></span>
+          <span class="signature">&#8594; <a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span>&gt;</span></span>
+        </dt>
+        <dd>
+          A complicated type parameter to ATypeTakingClass.
+          <div class="features">read-only</div>
 </dd>
         <dt id="dynamicGetter" class="property">
           <span class="name"><a href="fake/dynamicGetter.html">dynamicGetter</a></span>
@@ -549,6 +557,14 @@ <h2>Properties</h2>
         <dd>
           Getter docs should be shown.
           <div class="features">read-only</div>
+</dd>
+        <dt id="importantComputations" class="property">
+          <span class="name"><a href="fake/importantComputations.html">importantComputations</a></span>
+          <span class="signature">&#8594; Map<span class="signature">&lt;int, &gt;</span></span>
+        </dt>
+        <dd>
+          Type inference mixing with anonymous functions.
+          <div class="features">final</div>
 </dd>
         <dt id="justGetter" class="property">
           <span class="name"><a href="fake/justGetter.html">justGetter</a></span>
@@ -959,9 +975,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/functionWithFunctionParameters.html b/testing/test_package_docs/fake/functionWithFunctionParameters.html
index fc5c8c5c00..b76c1c8ca1 100644
--- a/testing/test_package_docs/fake/functionWithFunctionParameters.html
+++ b/testing/test_package_docs/fake/functionWithFunctionParameters.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/getterSetterNodocGetter.html b/testing/test_package_docs/fake/getterSetterNodocGetter.html
index c4ff4152bb..7bc15d913c 100644
--- a/testing/test_package_docs/fake/getterSetterNodocGetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocGetter.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/getterSetterNodocSetter.html b/testing/test_package_docs/fake/getterSetterNodocSetter.html
index 7081f9cc4c..5e01ea76a2 100644
--- a/testing/test_package_docs/fake/getterSetterNodocSetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocSetter.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/greatAnnotation-constant.html b/testing/test_package_docs/fake/greatAnnotation-constant.html
index 35ac9f4fc1..82c3127fa8 100644
--- a/testing/test_package_docs/fake/greatAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatAnnotation-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/greatestAnnotation-constant.html b/testing/test_package_docs/fake/greatestAnnotation-constant.html
index a04319ae5d..bf6deff277 100644
--- a/testing/test_package_docs/fake/greatestAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatestAnnotation-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/importantComputations.html b/testing/test_package_docs/fake/importantComputations.html
new file mode 100644
index 0000000000..5d571b0d0d
--- /dev/null
+++ b/testing/test_package_docs/fake/importantComputations.html
@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the importantComputations property from the fake library, for the Dart programming language.">
+  <title>importantComputations property - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">importantComputations property</li>
+  </ol>
+  <div class="self-name">importantComputations</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>importantComputations top-level property</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">Map<span class="signature">&lt;int, &gt;</span></span>
+      <span class="name ">importantComputations</span>
+      <div class="features">final</div>
+    </section>
+    <section class="desc markdown">
+      <p>Type inference mixing with anonymous functions.</p>
+    </section>
+        
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/incorrectDocReference-constant.html b/testing/test_package_docs/fake/incorrectDocReference-constant.html
index 1e780a75b0..57fc56f746 100644
--- a/testing/test_package_docs/fake/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/fake/incorrectDocReference-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/justGetter.html b/testing/test_package_docs/fake/justGetter.html
index ee2b551015..1e114cdd6e 100644
--- a/testing/test_package_docs/fake/justGetter.html
+++ b/testing/test_package_docs/fake/justGetter.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/justSetter.html b/testing/test_package_docs/fake/justSetter.html
index 28b129c692..bd464c109e 100644
--- a/testing/test_package_docs/fake/justSetter.html
+++ b/testing/test_package_docs/fake/justSetter.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/mapWithDynamicKeys.html b/testing/test_package_docs/fake/mapWithDynamicKeys.html
index c92e43ec57..6089c0ba2f 100644
--- a/testing/test_package_docs/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs/fake/mapWithDynamicKeys.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/meaningOfLife.html b/testing/test_package_docs/fake/meaningOfLife.html
index b7dcca4ccc..f0c3c3e58b 100644
--- a/testing/test_package_docs/fake/meaningOfLife.html
+++ b/testing/test_package_docs/fake/meaningOfLife.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/myCoolTypedef.html b/testing/test_package_docs/fake/myCoolTypedef.html
index 0d0aadca15..37f1e91009 100644
--- a/testing/test_package_docs/fake/myCoolTypedef.html
+++ b/testing/test_package_docs/fake/myCoolTypedef.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/myGenericFunction.html b/testing/test_package_docs/fake/myGenericFunction.html
index 87c249c917..781124cb89 100644
--- a/testing/test_package_docs/fake/myGenericFunction.html
+++ b/testing/test_package_docs/fake/myGenericFunction.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/myMap-constant.html b/testing/test_package_docs/fake/myMap-constant.html
index d0453ae658..f48a4591a0 100644
--- a/testing/test_package_docs/fake/myMap-constant.html
+++ b/testing/test_package_docs/fake/myMap-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
index 3ce2bab0f0..250d34f88f 100644
--- a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
+++ b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/paintImage1.html b/testing/test_package_docs/fake/paintImage1.html
index a00b47c6bf..d8a01c9abe 100644
--- a/testing/test_package_docs/fake/paintImage1.html
+++ b/testing/test_package_docs/fake/paintImage1.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/paintImage2.html b/testing/test_package_docs/fake/paintImage2.html
index dcd77054a2..e3010efa4f 100644
--- a/testing/test_package_docs/fake/paintImage2.html
+++ b/testing/test_package_docs/fake/paintImage2.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/paramFromAnotherLib.html b/testing/test_package_docs/fake/paramFromAnotherLib.html
index 13d6c4fce3..57b8824714 100644
--- a/testing/test_package_docs/fake/paramFromAnotherLib.html
+++ b/testing/test_package_docs/fake/paramFromAnotherLib.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/paramOfFutureOrNull.html b/testing/test_package_docs/fake/paramOfFutureOrNull.html
index 3a68ca5f29..8cfadfe1b2 100644
--- a/testing/test_package_docs/fake/paramOfFutureOrNull.html
+++ b/testing/test_package_docs/fake/paramOfFutureOrNull.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/required-constant.html b/testing/test_package_docs/fake/required-constant.html
index 39813d9373..8c9c1cc26b 100644
--- a/testing/test_package_docs/fake/required-constant.html
+++ b/testing/test_package_docs/fake/required-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/returningFutureVoid.html b/testing/test_package_docs/fake/returningFutureVoid.html
index 426a39ebd7..1f1269b9ad 100644
--- a/testing/test_package_docs/fake/returningFutureVoid.html
+++ b/testing/test_package_docs/fake/returningFutureVoid.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/setAndGet.html b/testing/test_package_docs/fake/setAndGet.html
index 28b51b2087..bedaf73791 100644
--- a/testing/test_package_docs/fake/setAndGet.html
+++ b/testing/test_package_docs/fake/setAndGet.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/short.html b/testing/test_package_docs/fake/short.html
index c4b72471d1..d2f9b44470 100644
--- a/testing/test_package_docs/fake/short.html
+++ b/testing/test_package_docs/fake/short.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/simpleProperty.html b/testing/test_package_docs/fake/simpleProperty.html
index bbd6541281..2f6b1c904c 100644
--- a/testing/test_package_docs/fake/simpleProperty.html
+++ b/testing/test_package_docs/fake/simpleProperty.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/soIntense.html b/testing/test_package_docs/fake/soIntense.html
index f2f24ed6e4..7abe907b4f 100644
--- a/testing/test_package_docs/fake/soIntense.html
+++ b/testing/test_package_docs/fake/soIntense.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
index 4d4cece011..02d5243084 100644
--- a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
+++ b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/thisIsAlsoAsync.html b/testing/test_package_docs/fake/thisIsAlsoAsync.html
index 84fa861a04..4ed794d5ea 100644
--- a/testing/test_package_docs/fake/thisIsAlsoAsync.html
+++ b/testing/test_package_docs/fake/thisIsAlsoAsync.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/thisIsAsync.html b/testing/test_package_docs/fake/thisIsAsync.html
index 4080a53395..c297c1f884 100644
--- a/testing/test_package_docs/fake/thisIsAsync.html
+++ b/testing/test_package_docs/fake/thisIsAsync.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/thisIsFutureOr.html b/testing/test_package_docs/fake/thisIsFutureOr.html
index f731b26057..e53aa69965 100644
--- a/testing/test_package_docs/fake/thisIsFutureOr.html
+++ b/testing/test_package_docs/fake/thisIsFutureOr.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/thisIsFutureOrNull.html b/testing/test_package_docs/fake/thisIsFutureOrNull.html
index 7a5a48a6c8..e8bffff6ed 100644
--- a/testing/test_package_docs/fake/thisIsFutureOrNull.html
+++ b/testing/test_package_docs/fake/thisIsFutureOrNull.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/thisIsFutureOrT.html b/testing/test_package_docs/fake/thisIsFutureOrT.html
index 0a2cf17e79..a2bcb5bd6f 100644
--- a/testing/test_package_docs/fake/thisIsFutureOrT.html
+++ b/testing/test_package_docs/fake/thisIsFutureOrT.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/topLevelFunction.html b/testing/test_package_docs/fake/topLevelFunction.html
index bd52e9d2de..d453033429 100644
--- a/testing/test_package_docs/fake/topLevelFunction.html
+++ b/testing/test_package_docs/fake/topLevelFunction.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/fake/typeParamOfFutureOr.html b/testing/test_package_docs/fake/typeParamOfFutureOr.html
index b40d99ae17..0bc970797e 100644
--- a/testing/test_package_docs/fake/typeParamOfFutureOr.html
+++ b/testing/test_package_docs/fake/typeParamOfFutureOr.html
@@ -101,9 +101,11 @@ <h5>fake library</h5>
     
       <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
       <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
       <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
       <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
       <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
       <li><a href="fake/justGetter.html">justGetter</a></li>
       <li><a href="fake/justSetter.html">justSetter</a></li>
       <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
diff --git a/testing/test_package_docs/index.json b/testing/test_package_docs/index.json
index 6bf07d553e..8fce2a5e33 100644
--- a/testing/test_package_docs/index.json
+++ b/testing/test_package_docs/index.json
@@ -8181,6 +8181,17 @@
    "type": "library"
   }
  },
+ {
+  "name": "complicatedReturn",
+  "qualifiedName": "fake.complicatedReturn",
+  "href": "fake/complicatedReturn.html",
+  "type": "top-level property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
  {
   "name": "dynamicGetter",
   "qualifiedName": "fake.dynamicGetter",
@@ -8247,6 +8258,17 @@
    "type": "library"
   }
  },
+ {
+  "name": "importantComputations",
+  "qualifiedName": "fake.importantComputations",
+  "href": "fake/importantComputations.html",
+  "type": "top-level property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
  {
   "name": "incorrectDocReference",
   "qualifiedName": "fake.incorrectDocReference",

From f41e8b54fa30e3882c406c8932eae6f116b7d92c Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Mon, 26 Mar 2018 16:23:54 -0700
Subject: [PATCH 3/7] dartfmt

---
 lib/src/model.dart                 | 205 ++++++++++++++++++-----------
 test/model_test.dart               |  13 +-
 testing/test_package/lib/fake.dart |   2 +-
 3 files changed, 135 insertions(+), 85 deletions(-)

diff --git a/lib/src/model.dart b/lib/src/model.dart
index 0d5bf57c61..83c12ce778 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -225,21 +225,24 @@ class InheritableAccessor extends Accessor with Inheritable {
     InheritableAccessor accessor;
     if (element == null) return null;
     if (inheritedAccessors.contains(element)) {
-      accessor = new ModelElement.from(element, enclosingClass.library, enclosingClass.packageGraph,
+      accessor = new ModelElement.from(
+          element, enclosingClass.library, enclosingClass.packageGraph,
           enclosingClass: enclosingClass);
     } else {
-      accessor = new ModelElement.from(element, enclosingClass.library, enclosingClass.packageGraph);
+      accessor = new ModelElement.from(
+          element, enclosingClass.library, enclosingClass.packageGraph);
     }
     return accessor;
   }
 
   ModelElement _enclosingElement;
   bool _isInherited = false;
-  InheritableAccessor(PropertyAccessorElement element, Library library, PackageGraph packageGraph)
+  InheritableAccessor(PropertyAccessorElement element, Library library,
+      PackageGraph packageGraph)
       : super(element, library, packageGraph, null);
 
-  InheritableAccessor.inherited(
-      PropertyAccessorElement element, Library library, PackageGraph packageGraph, this._enclosingElement,
+  InheritableAccessor.inherited(PropertyAccessorElement element,
+      Library library, PackageGraph packageGraph, this._enclosingElement,
       {Member originalMember})
       : super(element, library, packageGraph, originalMember) {
     _isInherited = true;
@@ -270,8 +273,8 @@ class Accessor extends ModelElement
     implements EnclosedElement {
   GetterSetterCombo _enclosingCombo;
 
-  Accessor(
-      PropertyAccessorElement element, Library library, PackageGraph packageGraph, Member originalMember)
+  Accessor(PropertyAccessorElement element, Library library,
+      PackageGraph packageGraph, Member originalMember)
       : super(element, library, packageGraph, originalMember);
 
   get linkedReturnType {
@@ -370,7 +373,8 @@ class Accessor extends ModelElement
           .findOrCreateLibraryFor(_accessor.enclosingElement.enclosingElement);
     }
 
-    return new ModelElement.from(_accessor.enclosingElement, library, packageGraph);
+    return new ModelElement.from(
+        _accessor.enclosingElement, library, packageGraph);
   }
 
   @override
@@ -458,7 +462,8 @@ class Class extends ModelElement
   List<Field> _inheritedProperties;
   List<Field> _allInstanceProperties;
 
-  Class(ClassElement element, Library library, PackageGraph packageGraph) : super(element, library, packageGraph, null) {
+  Class(ClassElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph, null) {
     _mixins = _cls.mixins
         .map((f) {
           ElementType t = new ElementType.from(f, packageGraph);
@@ -712,7 +717,8 @@ class Class extends ModelElement
       }).toSet();
 
       for (ExecutableElement e in inheritedMethodElements) {
-        Method m = new ModelElement.from(e, library, packageGraph, enclosingClass: this);
+        Method m = new ModelElement.from(e, library, packageGraph,
+            enclosingClass: this);
         _inheritedMethods.add(m);
         _genPageMethods.add(m);
       }
@@ -737,7 +743,8 @@ class Class extends ModelElement
             !operatorNames.contains(e.name));
       }).toSet();
       for (ExecutableElement e in inheritedOperatorElements) {
-        Operator o = new ModelElement.from(e, library, packageGraph, enclosingClass: this);
+        Operator o = new ModelElement.from(e, library, packageGraph,
+            enclosingClass: this);
         _inheritedOperators.add(o);
         _genPageOperators.add(o);
       }
@@ -1045,7 +1052,8 @@ class Class extends ModelElement
       // TODO(jcollins-g): Navigation is probably still confusing for
       // half-inherited fields when traversing the inheritance tree.  Make
       // this better, somehow.
-      field = new ModelElement.from(f, library, packageGraph, getter: getter, setter: setter);
+      field = new ModelElement.from(f, library, packageGraph,
+          getter: getter, setter: setter);
     }
     _fields.add(field);
   }
@@ -1081,7 +1089,8 @@ class Class extends ModelElement
 class Constructor extends ModelElement
     with SourceCodeMixin, TypeParameters
     implements EnclosedElement {
-  Constructor(ConstructorElement element, Library library, PackageGraph packageGraph)
+  Constructor(
+      ConstructorElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph, null);
 
   @override
@@ -1090,8 +1099,8 @@ class Constructor extends ModelElement
       (enclosingElement as Class).typeParameters;
 
   @override
-  ModelElement get enclosingElement =>
-      new ModelElement.from(_constructor.enclosingElement, library, packageGraph);
+  ModelElement get enclosingElement => new ModelElement.from(
+      _constructor.enclosingElement, library, packageGraph);
 
   String get fullKind {
     if (isConst) return 'const $kind';
@@ -1283,13 +1292,15 @@ abstract class EnclosedElement {
 }
 
 class Enum extends Class {
-  Enum(ClassElement element, Library library, PackageGraph packageGraph) : super(element, library, packageGraph);
+  Enum(ClassElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph);
 
   @override
   List<EnumField> get instanceProperties {
     return super
         .instanceProperties
-        .map((Field p) => new ModelElement.from(p.element, p.library, p.packageGraph,
+        .map((Field p) => new ModelElement.from(
+            p.element, p.library, p.packageGraph,
             getter: p.getter, setter: p.setter))
         .toList(growable: false);
   }
@@ -1306,12 +1317,12 @@ class Enum extends Class {
 class EnumField extends Field {
   int _index;
 
-  EnumField(
-      FieldElement element, Library library, PackageGraph packageGraph, Accessor getter, Accessor setter)
+  EnumField(FieldElement element, Library library, PackageGraph packageGraph,
+      Accessor getter, Accessor setter)
       : super(element, library, packageGraph, getter, setter);
 
-  EnumField.forConstant(
-      this._index, FieldElement element, Library library, PackageGraph packageGraph, Accessor getter)
+  EnumField.forConstant(this._index, FieldElement element, Library library,
+      PackageGraph packageGraph, Accessor getter)
       : super(element, library, packageGraph, getter, null);
 
   @override
@@ -1381,15 +1392,21 @@ class Field extends ModelElement
   @override
   final InheritableAccessor setter;
 
-  Field(FieldElement element, Library library, PackageGraph packageGraph, this.getter, this.setter)
+  Field(FieldElement element, Library library, PackageGraph packageGraph,
+      this.getter, this.setter)
       : super(element, library, packageGraph, null) {
     if (getter != null) getter.enclosingCombo = this;
     if (setter != null) setter.enclosingCombo = this;
     _setModelType();
   }
 
-  factory Field.inherited(FieldElement element, Class enclosingClass,
-      Library library, PackageGraph packageGraph, Accessor getter, Accessor setter) {
+  factory Field.inherited(
+      FieldElement element,
+      Class enclosingClass,
+      Library library,
+      PackageGraph packageGraph,
+      Accessor getter,
+      Accessor setter) {
     Field newField = new Field(element, library, packageGraph, getter, setter);
     newField._isInherited = true;
     newField._enclosingClass = enclosingClass;
@@ -1415,7 +1432,8 @@ class Field extends ModelElement
   @override
   ModelElement get enclosingElement {
     if (_enclosingClass == null) {
-      _enclosingClass = new ModelElement.from(_field.enclosingElement, library, packageGraph);
+      _enclosingClass =
+          new ModelElement.from(_field.enclosingElement, library, packageGraph);
     }
     return _enclosingClass;
   }
@@ -1761,8 +1779,8 @@ class Library extends ModelElement with Categorization {
                 new ModelElement.fromElement(e.setter.element, packageGraph);
           }
         }
-        return new ModelElement.from(
-                e.element, packageGraph.findOrCreateLibraryFor(e.element), packageGraph,
+        return new ModelElement.from(e.element,
+                packageGraph.findOrCreateLibraryFor(e.element), packageGraph,
                 getter: getter, setter: setter)
             .fullyQualifiedName;
       }).toList();
@@ -2144,8 +2162,8 @@ class Library extends ModelElement with Categorization {
       Accessor setter;
       if (element.setter != null)
         setter = new ModelElement.from(element.setter, this, packageGraph);
-      ModelElement me =
-          new ModelElement.from(element, this, packageGraph, getter: getter, setter: setter);
+      ModelElement me = new ModelElement.from(element, this, packageGraph,
+          getter: getter, setter: setter);
       _variables.add(me);
     }
 
@@ -2321,7 +2339,8 @@ class Method extends ModelElement
   }
 
   Method.inherited(MethodElement element, this._enclosingClass, Library library,
-      PackageGraph packageGraph, {Member originalMember})
+      PackageGraph packageGraph,
+      {Member originalMember})
       : super(element, library, packageGraph, originalMember) {
     _isInherited = true;
     _calcTypeParameters();
@@ -2336,8 +2355,8 @@ class Method extends ModelElement
   @override
   ModelElement get enclosingElement {
     if (_enclosingClass == null) {
-      _enclosingClass =
-          new ModelElement.from(_method.enclosingElement, library, packageGraph);
+      _enclosingClass = new ModelElement.from(
+          _method.enclosingElement, library, packageGraph);
     }
     return _enclosingClass;
   }
@@ -2437,8 +2456,8 @@ ModelElement resolveMultiplyInheritedElement(
     Library library,
     PackageGraph packageGraph,
     Class enclosingClass) {
-  Iterable<Inheritable> inheritables = e.inheritedElements.map((ee) =>
-      new ModelElement.fromElement(ee, packageGraph) as Inheritable);
+  Iterable<Inheritable> inheritables = e.inheritedElements.map(
+      (ee) => new ModelElement.fromElement(ee, packageGraph) as Inheritable);
   Inheritable foundInheritable;
   int lowIndex = enclosingClass.inheritanceChain.length;
   for (var inheritable in inheritables) {
@@ -2503,8 +2522,8 @@ abstract class ModelElement extends Canonicalization
 
   // TODO(jcollins-g): make _originalMember optional after dart-lang/sdk#15101
   // is fixed.
-  ModelElement(this._element, this._library, this._packageGraph,
-               this._originalMember) {}
+  ModelElement(
+      this._element, this._library, this._packageGraph, this._originalMember) {}
 
   factory ModelElement.fromElement(Element e, PackageGraph p) {
     Library lib = _findOrCreateEnclosingLibraryForStatic(e, p);
@@ -2521,12 +2540,14 @@ abstract class ModelElement extends Canonicalization
   // parameter when given a null.
   /// Do not construct any ModelElements unless they are from this constructor.
   /// Specify enclosingClass only if this is to be an inherited object.
-  factory ModelElement.from(Element e, Library library, PackageGraph packageGraph,
-      {Class enclosingClass,
-      Accessor getter,
-      Accessor setter}) {
+  factory ModelElement.from(
+      Element e, Library library, PackageGraph packageGraph,
+      {Class enclosingClass, Accessor getter, Accessor setter}) {
     assert(packageGraph != null && e != null);
-    assert(library != null || e is ParameterElement || e is TypeParameterElement || e is GenericFunctionTypeElementImpl);
+    assert(library != null ||
+        e is ParameterElement ||
+        e is TypeParameterElement ||
+        e is GenericFunctionTypeElementImpl);
     // With AnalysisDriver, we sometimes get ElementHandles when building
     // docs for the SDK, seen via [Library.importedExportedLibraries].  Why?
     if (e is ElementHandle) {
@@ -2553,8 +2574,8 @@ abstract class ModelElement extends Canonicalization
         newModelElement = new Dynamic(e, packageGraph);
       }
       if (e is MultiplyInheritedExecutableElement) {
-        newModelElement =
-            resolveMultiplyInheritedElement(e, library, packageGraph, enclosingClass);
+        newModelElement = resolveMultiplyInheritedElement(
+            e, library, packageGraph, enclosingClass);
       } else {
         if (e is LibraryElement) {
           newModelElement = new Library(e, packageGraph);
@@ -2587,11 +2608,13 @@ abstract class ModelElement extends Canonicalization
         } else if (e is GenericFunctionTypeElement) {
           if (e is FunctionTypeAliasElement) {
             assert(e.name != '');
-            newModelElement = new ModelFunctionTypedef(e, library, packageGraph);
+            newModelElement =
+                new ModelFunctionTypedef(e, library, packageGraph);
           } else {
             if (e.enclosingElement is GenericTypeAliasElement) {
               assert(e.enclosingElement.name != '');
-              newModelElement = new ModelFunctionTypedef(e, library, packageGraph);
+              newModelElement =
+                  new ModelFunctionTypedef(e, library, packageGraph);
             } else {
               // Allowing null here is allowed as a workaround for
               // dart-lang/sdk#32005.
@@ -2608,17 +2631,19 @@ abstract class ModelElement extends Canonicalization
             if (e.isEnumConstant) {
               int index =
                   e.computeConstantValue().getField(e.name).toIntValue();
-              newModelElement =
-                  new EnumField.forConstant(index, e, library, packageGraph, getter);
+              newModelElement = new EnumField.forConstant(
+                  index, e, library, packageGraph, getter);
             } else if (e.enclosingElement.isEnum) {
-              newModelElement = new EnumField(e, library, packageGraph, getter, setter);
+              newModelElement =
+                  new EnumField(e, library, packageGraph, getter, setter);
             } else {
-              newModelElement = new Field(e, library, packageGraph, getter, setter);
+              newModelElement =
+                  new Field(e, library, packageGraph, getter, setter);
             }
           } else {
             // EnumFields can't be inherited, so this case is simpler.
-            newModelElement =
-                new Field.inherited(e, enclosingClass, library, packageGraph, getter, setter);
+            newModelElement = new Field.inherited(
+                e, enclosingClass, library, packageGraph, getter, setter);
           }
         }
         if (e is ConstructorElement) {
@@ -2628,15 +2653,17 @@ abstract class ModelElement extends Canonicalization
           if (enclosingClass == null)
             newModelElement = new Operator(e, library, packageGraph);
           else
-            newModelElement = new Operator.inherited(e, enclosingClass, library,
-                packageGraph, originalMember: originalMember);
+            newModelElement = new Operator.inherited(
+                e, enclosingClass, library, packageGraph,
+                originalMember: originalMember);
         }
         if (e is MethodElement && !e.isOperator) {
           if (enclosingClass == null)
             newModelElement = new Method(e, library, packageGraph);
           else
-            newModelElement = new Method.inherited(e, enclosingClass, library,
-                packageGraph, originalMember: originalMember);
+            newModelElement = new Method.inherited(
+                e, enclosingClass, library, packageGraph,
+                originalMember: originalMember);
         }
         if (e is TopLevelVariableElement) {
           if (getter == null && setter == null) {
@@ -2645,7 +2672,8 @@ abstract class ModelElement extends Canonicalization
               ..addAll(library.constants);
             newModelElement = allVariables.firstWhere((v) => v.element == e);
           } else {
-            newModelElement = new TopLevelVariable(e, library, packageGraph, getter, setter);
+            newModelElement =
+                new TopLevelVariable(e, library, packageGraph, getter, setter);
           }
         }
         if (e is PropertyAccessorElement) {
@@ -2653,7 +2681,8 @@ abstract class ModelElement extends Canonicalization
           if (e.enclosingElement is ClassElement ||
               e is MultiplyInheritedExecutableElement) {
             if (enclosingClass == null)
-              newModelElement = new InheritableAccessor(e, library, packageGraph);
+              newModelElement =
+                  new InheritableAccessor(e, library, packageGraph);
             else
               newModelElement = new InheritableAccessor.inherited(
                   e, library, packageGraph, enclosingClass,
@@ -2666,8 +2695,8 @@ abstract class ModelElement extends Canonicalization
           newModelElement = new TypeParameter(e, library, packageGraph);
         }
         if (e is ParameterElement) {
-          newModelElement =
-              new Parameter(e, library, packageGraph, originalMember: originalMember);
+          newModelElement = new Parameter(e, library, packageGraph,
+              originalMember: originalMember);
         }
       }
     }
@@ -2813,17 +2842,23 @@ abstract class ModelElement extends Canonicalization
         GetterSetterCombo thisAsCombo = this as GetterSetterCombo;
         if (thisAsCombo.hasGetter) {
           newGetter = new ModelElement.from(
-              thisAsCombo.getter.element, thisAsCombo.getter.definingLibrary, thisAsCombo.getter.packageGraph);
+              thisAsCombo.getter.element,
+              thisAsCombo.getter.definingLibrary,
+              thisAsCombo.getter.packageGraph);
         }
         if (thisAsCombo.hasSetter) {
           newSetter = new ModelElement.from(
-              thisAsCombo.setter.element, thisAsCombo.setter.definingLibrary, thisAsCombo.setter.packageGraph);
+              thisAsCombo.setter.element,
+              thisAsCombo.setter.definingLibrary,
+              thisAsCombo.setter.packageGraph);
         }
       }
       ModelElement fromThis = new ModelElement.from(
-          element, thisInheritable.definingEnclosingElement.library,
+          element,
+          thisInheritable.definingEnclosingElement.library,
           thisInheritable.definingEnclosingElement.packageGraph,
-          getter: newGetter, setter: newSetter);
+          getter: newGetter,
+          setter: newSetter);
       docFrom = fromThis.documentationFrom;
     } else {
       docFrom = [this];
@@ -3581,7 +3616,8 @@ abstract class ModelElement extends Canonicalization
 
 /// A [ModelElement] for a [FunctionElement] that isn't part of a type definition.
 class ModelFunction extends ModelFunctionTyped {
-  ModelFunction(FunctionElement element, Library library, PackageGraph packageGraph)
+  ModelFunction(
+      FunctionElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph);
 
   @override
@@ -3603,7 +3639,8 @@ class ModelFunction extends ModelFunctionTyped {
 /// have a name, but we document it as "Function" to match how these are
 /// written in declarations.
 class ModelFunctionAnonymous extends ModelFunctionTyped {
-  ModelFunctionAnonymous(FunctionTypedElement element, PackageGraph packageGraph)
+  ModelFunctionAnonymous(
+      FunctionTypedElement element, PackageGraph packageGraph)
       : super(element, null, packageGraph) {}
 
   @override
@@ -3619,7 +3656,8 @@ class ModelFunctionAnonymous extends ModelFunctionTyped {
 /// A [ModelElement] for a [GenericModelFunctionElement] that is part of an
 /// explicit typedef.
 class ModelFunctionTypedef extends ModelFunctionTyped {
-  ModelFunctionTypedef(FunctionTypedElement element, Library library, PackageGraph packageGraph)
+  ModelFunctionTypedef(
+      FunctionTypedElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph);
 
   @override
@@ -3641,7 +3679,8 @@ class ModelFunctionTyped extends ModelElement
   @override
   List<TypeParameter> typeParameters = [];
 
-  ModelFunctionTyped(FunctionTypedElement element, Library library, PackageGraph packageGraph)
+  ModelFunctionTyped(
+      FunctionTypedElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph, null) {
     _calcTypeParameters();
   }
@@ -3713,11 +3752,11 @@ class Operator extends Method {
     "%": "modulo"
   };
 
-  Operator(MethodElement element, Library library, PackageGraph packageGraph) : super(element, library, packageGraph);
+  Operator(MethodElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph);
 
-  Operator.inherited(
-      MethodElement element, Class enclosingClass, Library library,
-      PackageGraph packageGraph, {Member originalMember})
+  Operator.inherited(MethodElement element, Class enclosingClass,
+      Library library, PackageGraph packageGraph, {Member originalMember})
       : super.inherited(element, enclosingClass, library, packageGraph,
             originalMember: originalMember) {
     _isInherited = true;
@@ -4418,11 +4457,13 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
         Accessor getter;
         Accessor setter;
         if (e is PropertyInducingElement) {
-          if (e.getter != null) getter = new ModelElement.from(e.getter, lib, packageGraph);
-          if (e.setter != null) setter = new ModelElement.from(e.setter, lib, packageGraph);
+          if (e.getter != null)
+            getter = new ModelElement.from(e.getter, lib, packageGraph);
+          if (e.setter != null)
+            setter = new ModelElement.from(e.setter, lib, packageGraph);
         }
-        modelElement =
-            new ModelElement.from(e, lib, packageGraph, getter: getter, setter: setter);
+        modelElement = new ModelElement.from(e, lib, packageGraph,
+            getter: getter, setter: setter);
       }
       assert(modelElement is! Inheritable);
       if (modelElement != null && !modelElement.isCanonical) {
@@ -4679,7 +4720,9 @@ class Package extends LibraryContainer implements Comparable<Package>, Privacy {
 }
 
 class Parameter extends ModelElement implements EnclosedElement {
-  Parameter(ParameterElement element, Library library, PackageGraph packageGraph, {Member originalMember})
+  Parameter(
+      ParameterElement element, Library library, PackageGraph packageGraph,
+      {Member originalMember})
       : super(element, library, packageGraph, originalMember);
   String get defaultValue {
     if (!hasDefaultValue) return null;
@@ -4875,8 +4918,8 @@ class TopLevelVariable extends ModelElement
   @override
   final Accessor setter;
 
-  TopLevelVariable(TopLevelVariableElement element, Library library, PackageGraph packageGraph,
-      this.getter, this.setter)
+  TopLevelVariable(TopLevelVariableElement element, Library library,
+      PackageGraph packageGraph, this.getter, this.setter)
       : super(element, library, packageGraph, null) {
     if (getter != null) {
       getter.enclosingCombo = this;
@@ -4951,7 +4994,8 @@ class TopLevelVariable extends ModelElement
 class Typedef extends ModelElement
     with SourceCodeMixin, TypeParameters
     implements EnclosedElement {
-  Typedef(FunctionTypeAliasElement element, Library library, PackageGraph packageGraph)
+  Typedef(FunctionTypeAliasElement element, Library library,
+      PackageGraph packageGraph)
       : super(element, library, packageGraph, null);
 
   @override
@@ -4999,7 +5043,8 @@ class Typedef extends ModelElement
 }
 
 class TypeParameter extends ModelElement {
-  TypeParameter(TypeParameterElement element, Library library, PackageGraph packageGraph)
+  TypeParameter(
+      TypeParameterElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph, null);
 
   @override
diff --git a/test/model_test.dart b/test/model_test.dart
index 25136ed709..4c3b186e42 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -1942,8 +1942,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     setUp(() {
       v = exLibrary.properties.firstWhere((p) => p.name == 'number');
       v3 = exLibrary.properties.firstWhere((p) => p.name == 'y');
-      complicatedReturn =
-          fakeLibrary.properties.firstWhere((f) => f.name == 'complicatedReturn');
+      complicatedReturn = fakeLibrary.properties
+          .firstWhere((f) => f.name == 'complicatedReturn');
       nodocGetter = fakeLibrary.properties
           .firstWhere((p) => p.name == 'getterSetterNodocGetter');
       nodocSetter = fakeLibrary.properties
@@ -1958,8 +1958,13 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .firstWhere((p) => p.name == 'mapWithDynamicKeys');
     });
 
-    test('Verify that a complex type parameter with an anonymous function works correctly', () {
-      expect(complicatedReturn.linkedReturnType, equals('<a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span>&gt;</span>'));
+    test(
+        'Verify that a complex type parameter with an anonymous function works correctly',
+        () {
+      expect(
+          complicatedReturn.linkedReturnType,
+          equals(
+              '<a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span>&gt;</span>'));
     });
 
     test('@nodoc on simple property works', () {
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index ab33f786af..0e1112d5da 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -235,7 +235,7 @@ class Cool {
 }
 
 /// A map initialization making use of optional const.
-const Map<int, String> myMap = { 1: "hello" };
+const Map<int, String> myMap = {1: "hello"};
 
 /// A variable initalization making use of optional new.
 Cool aCoolVariable = Cool();

From d8de2bcd3a81731805af83d58f9148889df8a590 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 28 Mar 2018 10:52:39 -0700
Subject: [PATCH 4/7] Working

---
 lib/resources/styles.css           |  12 +++
 lib/src/element_type.dart          |  20 +++--
 lib/src/model.dart                 |   8 +-
 pubspec.lock                       |   2 +-
 test/model_test.dart               | 139 +++++++++++++++++++----------
 testing/test_package/lib/fake.dart |   2 +
 6 files changed, 127 insertions(+), 56 deletions(-)

diff --git a/lib/resources/styles.css b/lib/resources/styles.css
index ade56f4653..4aab435232 100644
--- a/lib/resources/styles.css
+++ b/lib/resources/styles.css
@@ -359,6 +359,18 @@ dl dt.callable .name {
   white-space: nowrap;
 }
 
+.type-parameter {
+  white-space: nowrap;
+}
+
+.multi-line-signature .type-parameter {
+  display: -webkit-inline-box;
+}
+
+.multi-line-signature .type-parameter .parameter {
+  margin-left: 0px;
+}
+
 .signature {
   color: #727272;
 }
diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
index d90a6e61da..4e677f4d3f 100644
--- a/lib/src/element_type.dart
+++ b/lib/src/element_type.dart
@@ -125,9 +125,10 @@ class ParameterizedElementType extends DefinedElementType {
       if (!typeArguments.every((t) => t.name == 'dynamic') &&
           typeArguments.isNotEmpty) {
         buf.write('<span class="signature">');
-        buf.write('&lt;');
-        buf.writeAll(typeArguments.map((t) => t.linkedName), ', ');
-        buf.write('&gt;');
+        buf.write('&lt;<wbr><span class="type-parameter">');
+        buf.writeAll(typeArguments.map((t) => t.linkedName),
+            '</span>, <span class="type-parameter">');
+        buf.write('</span>&gt;');
         buf.write('</span>');
       }
 
@@ -146,9 +147,10 @@ class ParameterizedElementType extends DefinedElementType {
 
       if (!typeArguments.every((t) => t.name == 'dynamic') &&
           typeArguments.isNotEmpty) {
-        buf.write('&lt;');
-        buf.writeAll(typeArguments.map((t) => t.nameWithGenerics), ', ');
-        buf.write('&gt;');
+        buf.write('&lt;<wbr><span class="type-parameter">');
+        buf.writeAll(typeArguments.map((t) => t.nameWithGenerics),
+            '</span>, <span class="type-parameter">');
+        buf.write('</span>&gt;');
       }
       _nameWithGenerics = buf.toString();
     }
@@ -282,6 +284,12 @@ class CallableElementType extends ParameterizedElementType
   CallableElementType(FunctionType t, PackageGraph packageGraph,
       ModelElement element, ElementType returnedFrom)
       : super(t, packageGraph, element, returnedFrom);
+
+  @override
+  String get linkedName {
+    if (name != null && name.isNotEmpty) return super.linkedName;
+    return '${nameWithGenerics}(${element.linkedParams(showNames: false).trim()}) → ${returnType.linkedName}';
+  }
 }
 
 /// This is an anonymous function using the generic function syntax (declared
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 83c12ce778..cc49e8aa09 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -1328,7 +1328,7 @@ class EnumField extends Field {
   @override
   String get constantValueBase {
     if (name == 'values') {
-      return 'const List&lt;${_field.enclosingElement.name}&gt;';
+      return 'const List&lt;<wbr><span class="type-parameter">${_field.enclosingElement.name}</span>&gt;';
     } else {
       return 'const ${_field.enclosingElement.name}($_index)';
     }
@@ -4895,12 +4895,12 @@ abstract class TypeParameters implements ModelElement {
 
   String get genericParameters {
     if (typeParameters.isEmpty) return '';
-    return '&lt;${typeParameters.map((t) => t.name).join(', ')}&gt;';
+    return '&lt;<wbr><span class="type-parameter">${typeParameters.map((t) => t.name).join('</span>, <span class="type-parameter">')}</span>&gt;';
   }
 
   String get linkedGenericParameters {
     if (typeParameters.isEmpty) return '';
-    return '<span class="signature">&lt;${typeParameters.map((t) => t.linkedName).join(', ')}&gt;</span>';
+    return '<span class="signature">&lt;<wbr><span class="type-parameter">${typeParameters.map((t) => t.linkedName).join('</span>, <span class="type-parameter">')}</span>&gt;</span>';
   }
 
   @override
@@ -5010,7 +5010,7 @@ class Typedef extends ModelElement
       List<TypeParameterElement> genericTypeParameters =
           (element as GenericTypeAliasElement).function.typeParameters;
       if (genericTypeParameters.isNotEmpty) {
-        return '&lt;${genericTypeParameters.map((t) => t.name).join(', ')}&gt;';
+        return '&lt;<wbr><span class="type-parameter">${genericTypeParameters.map((t) => t.name).join('</span>, <span class="type-parameter">')}</span>&gt;';
       }
     } // else, all types are resolved.
     return '';
diff --git a/pubspec.lock b/pubspec.lock
index e3ad5b8acc..f8530019e1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -408,4 +408,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.42.0"
+  dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.43.0"
diff --git a/test/model_test.dart b/test/model_test.dart
index 4c3b186e42..8e2f7243a4 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -835,7 +835,10 @@ void main() {
     });
 
     test('class name with generics', () {
-      expect(F.nameWithGenerics, equals('F&lt;T extends String&gt;'));
+      expect(
+          F.nameWithGenerics,
+          equals(
+              'F&lt;<wbr><span class="type-parameter">T extends String</span>&gt;'));
     });
 
     test('correctly finds all the classes', () {
@@ -1062,7 +1065,10 @@ void main() {
     test("has a (synthetic) values constant", () {
       var values = animal.constants.firstWhere((f) => f.name == 'values');
       expect(values, isNotNull);
-      expect(values.constantValue, equals('const List&lt;Animal&gt;'));
+      expect(
+          values.constantValue,
+          equals(
+              'const List&lt;<wbr><span class="type-parameter">Animal</span>&gt;'));
       expect(values.documentation, startsWith('A constant List'));
     });
 
@@ -1173,28 +1179,32 @@ void main() {
 
     test('function returning FutureOr<Null>', () {
       expect(thisIsFutureOrNull.isAsynchronous, isFalse);
-      expect(thisIsFutureOrNull.linkedReturnType,
-          equals('FutureOr<span class="signature">&lt;Null&gt;</span>'));
+      expect(
+          thisIsFutureOrNull.linkedReturnType,
+          equals(
+              'FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span>'));
     });
 
     test('function returning FutureOr<T>', () {
       expect(thisIsFutureOrNull.isAsynchronous, isFalse);
-      expect(thisIsFutureOrT.linkedReturnType,
-          equals('FutureOr<span class="signature">&lt;T&gt;</span>'));
+      expect(
+          thisIsFutureOrT.linkedReturnType,
+          equals(
+              'FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span>'));
     });
 
     test('function with a parameter having type FutureOr<Null>', () {
       expect(
           paramOfFutureOrNull.linkedParams(),
           equals(
-              '<span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;Null&gt;</span></span> <span class="parameter-name">future</span></span>'));
+              '<span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span> <span class="parameter-name">future</span></span>'));
     });
 
     test('function with a bound type to FutureOr', () {
       expect(
           typeParamOfFutureOr.linkedGenericParameters,
           equals(
-              '<span class=\"signature\">&lt;T extends FutureOr<span class=\"signature\">&lt;List&gt;</span>&gt;</span>'));
+              '<span class="signature">&lt;<wbr><span class="type-parameter">T extends FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">List</span>&gt;</span></span>&gt;</span>'));
     });
 
     test('docs do not lose brackets in code blocks', () {
@@ -1232,7 +1242,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('supports generic methods', () {
-      expect(genericFunction.nameWithGenerics, 'genericFunction&lt;T&gt;');
+      expect(genericFunction.nameWithGenerics,
+          'genericFunction&lt;<wbr><span class="type-parameter">T</span>&gt;');
     });
   });
 
@@ -1252,21 +1263,21 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       // TODO(jcollins-g): really, these shouldn't be called "parameters" in
       // the span class.
       expect(explicitSetter.linkedReturnType,
-          '<span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;int&gt;</span></span></span>)</span>');
+          '<span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span></span>)</span>');
     });
 
     test('parameterized type from field is correctly displayed', () {
       Field aField = TemplatedInterface.instanceProperties
           .singleWhere((f) => f.name == 'aField');
       expect(aField.linkedReturnType,
-          '<a href=\"ex/AnotherParameterizedClass-class.html\">AnotherParameterizedClass</a><span class="signature">&lt;Stream<span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>&gt;</span>');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Stream<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>&gt;</span>');
     });
 
     test('parameterized type from inherited field is correctly displayed', () {
       Field aInheritedField = TemplatedInterface.inheritedProperties
           .singleWhere((f) => f.name == 'aInheritedField');
       expect(aInheritedField.linkedReturnType,
-          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span>');
     });
 
     test(
@@ -1276,7 +1287,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .singleWhere((f) => f.name == 'aGetter')
           .getter;
       expect(aGetter.linkedReturnType,
-          '<a href=\"ex/AnotherParameterizedClass-class.html\">AnotherParameterizedClass</a><span class="signature">&lt;Map<span class="signature">&lt;A, List<span class="signature">&lt;String&gt;</span>&gt;</span>&gt;</span>');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Map<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>&gt;</span>');
     });
 
     test(
@@ -1286,7 +1297,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .singleWhere((f) => f.name == 'aInheritedGetter')
           .getter;
       expect(aInheritedGetter.linkedReturnType,
-          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span>');
     });
 
     test(
@@ -1296,11 +1307,11 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .singleWhere((f) => f.name == 'aInheritedSetter')
           .setter;
       expect(aInheritedSetter.allParameters.first.modelType.linkedName,
-          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span>');
       // TODO(jcollins-g): really, these shouldn't be called "parameters" in
       // the span class.
       expect(aInheritedSetter.enclosingCombo.linkedReturnType,
-          '<span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span></span>');
+          '<span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span></span>');
     });
 
     test(
@@ -1309,7 +1320,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       Method aMethodInterface = TemplatedInterface.allInstanceMethods
           .singleWhere((m) => m.name == 'aMethodInterface');
       expect(aMethodInterface.linkedReturnType,
-          '<a href=\"ex/AnotherParameterizedClass-class.html\">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span>');
     });
 
     test(
@@ -1318,7 +1329,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       Method aInheritedMethod = TemplatedInterface.allInstanceMethods
           .singleWhere((m) => m.name == 'aInheritedMethod');
       expect(aInheritedMethod.linkedReturnType,
-          '<a href=\"ex/AnotherParameterizedClass-class.html\">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span>');
     });
 
     test(
@@ -1328,7 +1339,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .allInstanceMethods
           .singleWhere((m) => m.name == 'aTypedefReturningMethodInterface');
       expect(aTypedefReturningMethodInterface.linkedReturnType,
-          '<a href=\"ex/ParameterizedTypedef.html\">ParameterizedTypedef</a><span class="signature">&lt;List<span class="signature">&lt;String&gt;</span>&gt;</span>');
+          '<a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span>');
     });
 
     test(
@@ -1338,7 +1349,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .allInstanceMethods
           .singleWhere((m) => m.name == 'aInheritedTypedefReturningMethod');
       expect(aInheritedTypedefReturningMethod.linkedReturnType,
-          '<a href=\"ex/ParameterizedTypedef.html\">ParameterizedTypedef</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
+          '<a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span>');
     });
 
     test('parameterized types for inherited operator is correctly displayed',
@@ -1347,9 +1358,9 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .inheritedOperators
           .singleWhere((m) => m.name == 'operator +');
       expect(aInheritedAdditionOperator.linkedReturnType,
-          '<a href=\"ex/ParameterizedClass-class.html\">ParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
+          '<a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span>');
       expect(aInheritedAdditionOperator.linkedParams(),
-          '<span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span> <span class="parameter-name">other</span></span>');
+          '<span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">other</span></span>');
     });
 
     test('', () {});
@@ -1425,7 +1436,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           getAFunctionReturningBool.linkedReturnType,
           equals(
-              'bool Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span>'));
+              'bool Function<span class="signature">&lt;<wbr><span class="type-parameter">T4</span>&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span>'));
     });
 
     test('has a fully qualified name', () {
@@ -1499,7 +1510,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('parameter has generics in signature', () {
       expect(testGeneric.parameters[0].modelType.linkedName,
-          'Map<span class="signature">&lt;String, dynamic&gt;</span>');
+          'Map<span class="signature">&lt;<wbr><span class="type-parameter">String</span>, <span class="type-parameter">dynamic</span>&gt;</span>');
     });
 
     test('parameter is a function', () {
@@ -1508,7 +1519,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('generic method type args are rendered', () {
-      expect(testGenericMethod.nameWithGenerics, 'testGenericMethod&lt;T&gt;');
+      expect(testGenericMethod.nameWithGenerics,
+          'testGenericMethod&lt;<wbr><span class="type-parameter">T</span>&gt;');
     });
 
     test('doc for method with no return type', () {
@@ -1928,7 +1940,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           fieldWithTypedef.linkedReturnType,
           equals(
-              '<a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;bool&gt;</span>'));
+              '<a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span>'));
     });
   });
 
@@ -1938,10 +1950,13 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     TopLevelVariable setAndGet, mapWithDynamicKeys;
     TopLevelVariable nodocGetter, nodocSetter;
     TopLevelVariable complicatedReturn;
+    TopLevelVariable importantComputations;
 
     setUp(() {
       v = exLibrary.properties.firstWhere((p) => p.name == 'number');
       v3 = exLibrary.properties.firstWhere((p) => p.name == 'y');
+      importantComputations = fakeLibrary.properties
+          .firstWhere((v) => v.name == 'importantComputations');
       complicatedReturn = fakeLibrary.properties
           .firstWhere((f) => f.name == 'complicatedReturn');
       nodocGetter = fakeLibrary.properties
@@ -1958,13 +1973,30 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .firstWhere((p) => p.name == 'mapWithDynamicKeys');
     });
 
+    test(
+        'Verify that a map containing anonymous functions as values works correctly',
+        () {
+      Iterable<CallableElementType> typeArguments =
+          (importantComputations.modelType.returnType as DefinedElementType)
+              .typeArguments;
+      expect(typeArguments, isNotEmpty);
+      expect(
+          typeArguments.last.linkedName,
+          equals(
+              '(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic'));
+      expect(
+          importantComputations.linkedReturnType,
+          equals(
+              'Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic</span>&gt;</span>'));
+    });
+
     test(
         'Verify that a complex type parameter with an anonymous function works correctly',
         () {
       expect(
           complicatedReturn.linkedReturnType,
           equals(
-              '<a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span>&gt;</span>'));
+              '<a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span></span>&gt;</span>'));
     });
 
     test('@nodoc on simple property works', () {
@@ -2147,9 +2179,9 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('displays generic parameters correctly', () {
       expect(constructorTesterDefault.nameWithGenerics,
-          'ConstructorTester&lt;A, B&gt;');
+          'ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;');
       expect(constructorTesterFromSomething.nameWithGenerics,
-          'ConstructorTester&lt;A, B&gt;.fromSomething');
+          'ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;.fromSomething');
     });
 
     test('has a fully qualified name', () {
@@ -2202,15 +2234,17 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('a function returning a Future<void>', () {
-      expect(returningFutureVoid.linkedReturnType,
-          equals('Future<span class="signature">&lt;void&gt;</span>'));
+      expect(
+          returningFutureVoid.linkedReturnType,
+          equals(
+              'Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span>'));
     });
 
     test('a function requiring a Future<void> parameter', () {
       expect(
           aVoidParameter.linkedParams(showMetadata: true, showNames: true),
           equals(
-              '<span class="parameter" id="aVoidParameter-param-p1"><span class="type-annotation">Future<span class="signature">&lt;void&gt;</span></span> <span class="parameter-name">p1</span></span>'));
+              '<span class="parameter" id="aVoidParameter-param-p1"><span class="type-annotation">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">p1</span></span>'));
     });
 
     test('a class that extends Future<void>', () {
@@ -2220,8 +2254,10 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
               '<a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a>'));
       DefinedElementType FutureVoid = ExtendsFutureVoid.publicSuperChain
           .firstWhere((c) => c.name == 'Future');
-      expect(FutureVoid.linkedName,
-          equals('Future<span class="signature">&lt;void&gt;</span>'));
+      expect(
+          FutureVoid.linkedName,
+          equals(
+              'Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span>'));
     });
 
     test('a class that implements Future<void>', () {
@@ -2231,8 +2267,10 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
               '<a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a>'));
       DefinedElementType FutureVoid = ImplementsFutureVoid.publicInterfaces
           .firstWhere((c) => c.name == 'Future');
-      expect(FutureVoid.linkedName,
-          equals('Future<span class="signature">&lt;void&gt;</span>'));
+      expect(
+          FutureVoid.linkedName,
+          equals(
+              'Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span>'));
     });
 
     test('Verify that a mixin with a void type parameter works', () {
@@ -2245,7 +2283,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           ATypeTakingClassVoid.linkedName,
           equals(
-              '<a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;void&gt;</span>'));
+              '<a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span>'));
     });
   });
 
@@ -2288,14 +2326,16 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           theConstructor.linkedParams(),
           equals(
-              '<span class="parameter" id="-param-x"><span class="type-annotation"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;double&gt;</span></span> <span class="parameter-name">x</span></span>'));
+              '<span class="parameter" id="-param-x"><span class="type-annotation"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">double</span>&gt;</span></span> <span class="parameter-name">x</span></span>'));
     });
 
     test('anonymous nested functions inside typedefs are handled', () {
       expect(aComplexTypedef, isNotNull);
       expect(aComplexTypedef.linkedReturnType, startsWith('void Function'));
-      expect(aComplexTypedef.nameWithGenerics,
-          equals('aComplexTypedef&lt;A1, A2, A3&gt;'));
+      expect(
+          aComplexTypedef.nameWithGenerics,
+          equals(
+              'aComplexTypedef&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt;'));
     });
 
     test('anonymous nested functions inside typedefs are handled correctly',
@@ -2328,18 +2368,27 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('linked return type', () {
       expect(t.linkedReturnType, equals('String'));
-      expect(generic.linkedReturnType,
-          equals('List<span class="signature">&lt;S&gt;</span>'));
+      expect(
+          generic.linkedReturnType,
+          equals(
+              'List<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span>'));
     });
 
     test("name with generics", () {
-      expect(t.nameWithGenerics, equals('processMessage&lt;T&gt;'));
-      expect(generic.nameWithGenerics, equals('NewGenericTypedef&lt;T&gt;'));
+      expect(
+          t.nameWithGenerics,
+          equals(
+              'processMessage&lt;<wbr><span class="type-parameter">T</span>&gt;'));
+      expect(
+          generic.nameWithGenerics,
+          equals(
+              'NewGenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt;'));
     });
 
     test("generic parameters", () {
       expect(t.genericParameters, equals(''));
-      expect(generic.genericParameters, equals('&lt;S&gt;'));
+      expect(generic.genericParameters,
+          equals('&lt;<wbr><span class="type-parameter">S</span>&gt;'));
     });
   });
 
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index 0e1112d5da..d7c79eab6b 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -300,6 +300,7 @@ void aVoidParameter(Future<void> p1) {}
 
 /// This class extends Future<void>
 abstract class ExtendsFutureVoid extends Future<void> {
+  // ignore: missing_return
   factory ExtendsFutureVoid(FutureOr<void> computation()) {}
 }
 
@@ -308,6 +309,7 @@ abstract class ImplementsFutureVoid implements Future<void> {}
 
 /// This class takes a type, and it might be void.
 class ATypeTakingClass<T> {
+  // ignore: missing_return
   T aMethodMaybeReturningVoid() {}
 }
 

From ef928b8cf4d124e7bc6547c5f1da81d669503618 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 28 Mar 2018 10:56:33 -0700
Subject: [PATCH 5/7] rebuild package docs

---
 .../test_package_docs/ex/Animal-class.html    |  4 +-
 .../ex/AnotherParameterizedClass-class.html   |  4 +-
 .../AnotherParameterizedClass.html            |  6 +-
 .../AnotherParameterizedClass/hashCode.html   |  2 +-
 .../noSuchMethod.html                         |  2 +-
 .../operator_equals.html                      |  2 +-
 .../runtimeType.html                          |  2 +-
 .../AnotherParameterizedClass/toString.html   |  2 +-
 testing/test_package_docs/ex/Apple-class.html |  4 +-
 .../ex/Apple/fieldWithTypedef.html            |  2 +-
 .../ex/Apple/whataclass.html                  |  2 +-
 testing/test_package_docs/ex/B-class.html     |  6 +-
 testing/test_package_docs/ex/B/list.html      |  2 +-
 testing/test_package_docs/ex/Dog-class.html   |  8 +--
 .../ex/Dog/getAnotherClassD.html              |  2 +-
 .../test_package_docs/ex/Dog/getClassA.html   |  2 +-
 .../test_package_docs/ex/Dog/testGeneric.html |  2 +-
 .../ex/Dog/testGenericMethod.html             |  6 +-
 testing/test_package_docs/ex/F-class.html     | 14 ++--
 testing/test_package_docs/ex/F/F.html         |  6 +-
 .../ex/F/methodWithGenericParam.html          |  4 +-
 testing/test_package_docs/ex/F/test.html      |  2 +-
 .../ex/ParameterizedClass-class.html          | 18 ++---
 .../ParameterizedClass.html                   |  6 +-
 .../ParameterizedClass/aInheritedField.html   |  4 +-
 .../ParameterizedClass/aInheritedGetter.html  |  4 +-
 .../ParameterizedClass/aInheritedMethod.html  |  4 +-
 .../ParameterizedClass/aInheritedSetter.html  |  4 +-
 .../aInheritedTypedefReturningMethod.html     |  4 +-
 .../ex/ParameterizedClass/hashCode.html       |  2 +-
 .../ex/ParameterizedClass/noSuchMethod.html   |  2 +-
 .../ParameterizedClass/operator_equals.html   |  2 +-
 .../ex/ParameterizedClass/operator_plus.html  |  6 +-
 .../ex/ParameterizedClass/runtimeType.html    |  2 +-
 .../ex/ParameterizedClass/toString.html       |  2 +-
 .../ex/ParameterizedTypedef.html              |  4 +-
 .../ex/TemplatedClass-class.html              |  4 +-
 .../ex/TemplatedClass/TemplatedClass.html     |  6 +-
 .../ex/TemplatedClass/aMethod.html            |  2 +-
 .../ex/TemplatedClass/hashCode.html           |  2 +-
 .../ex/TemplatedClass/noSuchMethod.html       |  2 +-
 .../ex/TemplatedClass/operator_equals.html    |  2 +-
 .../ex/TemplatedClass/runtimeType.html        |  2 +-
 .../ex/TemplatedClass/toString.html           |  2 +-
 .../ex/TemplatedInterface-class.html          | 30 ++++----
 .../TemplatedInterface.html                   |  6 +-
 .../ex/TemplatedInterface/aField.html         |  4 +-
 .../ex/TemplatedInterface/aGetter.html        |  4 +-
 .../TemplatedInterface/aMethodInterface.html  |  4 +-
 .../ex/TemplatedInterface/aSetter.html        |  4 +-
 .../aTypedefReturningMethodInterface.html     |  4 +-
 .../TypedFunctionsWithoutTypedefs-class.html  |  8 +--
 .../getAComplexTypedef.html                   |  6 +-
 .../getAFunctionReturningBool.html            |  8 +--
 .../getAFunctionReturningVoid.html            |  6 +-
 .../ex/WithGeneric-class.html                 |  4 +-
 .../ex/WithGeneric/WithGeneric.html           |  6 +-
 .../ex/WithGeneric/hashCode.html              |  2 +-
 .../ex/WithGeneric/noSuchMethod.html          |  2 +-
 .../ex/WithGeneric/operator_equals.html       |  2 +-
 .../ex/WithGeneric/prop.html                  |  2 +-
 .../ex/WithGeneric/runtimeType.html           |  2 +-
 .../ex/WithGeneric/toString.html              |  2 +-
 .../ex/WithGenericSub-class.html              |  2 +-
 .../test_package_docs/ex/aComplexTypedef.html |  4 +-
 testing/test_package_docs/ex/ex-library.html  | 22 +++---
 .../test_package_docs/ex/genericFunction.html |  6 +-
 .../test_package_docs/ex/processMessage.html  |  4 +-
 .../fake/ATypeTakingClass-class.html          |  4 +-
 .../ATypeTakingClass/ATypeTakingClass.html    |  6 +-
 .../aMethodMaybeReturningVoid.html            |  2 +-
 .../fake/ATypeTakingClass/hashCode.html       |  2 +-
 .../fake/ATypeTakingClass/noSuchMethod.html   |  2 +-
 .../ATypeTakingClass/operator_equals.html     |  2 +-
 .../fake/ATypeTakingClass/runtimeType.html    |  2 +-
 .../fake/ATypeTakingClass/toString.html       |  2 +-
 .../fake/ATypeTakingClassMixedIn-class.html   |  2 +-
 .../ClassWithUnusualProperties-class.html     |  4 +-
 .../explicitGetterImplicitSetter.html         |  4 +-
 .../explicitSetter.html                       |  2 +-
 .../test_package_docs/fake/Color-class.html   |  4 +-
 .../fake/ConstructorTester-class.html         |  4 +-
 .../ConstructorTester.fromSomething.html      |  6 +-
 .../ConstructorTester/ConstructorTester.html  |  6 +-
 .../fake/ConstructorTester/hashCode.html      |  2 +-
 .../fake/ConstructorTester/noSuchMethod.html  |  2 +-
 .../ConstructorTester/operator_equals.html    |  2 +-
 .../fake/ConstructorTester/runtimeType.html   |  2 +-
 .../fake/ConstructorTester/toString.html      |  2 +-
 .../fake/ExtendsFutureVoid-class.html         | 18 ++---
 .../ExtendsFutureVoid/ExtendsFutureVoid.html  |  2 +-
 .../fake/ExtendsFutureVoid/asStream.html      |  2 +-
 .../fake/ExtendsFutureVoid/catchError.html    |  2 +-
 .../fake/ExtendsFutureVoid/then.html          |  8 +--
 .../fake/ExtendsFutureVoid/timeout.html       |  4 +-
 .../fake/ExtendsFutureVoid/whenComplete.html  |  2 +-
 .../fake/ExtraSpecialList-class.html          | 30 ++++----
 .../ExtraSpecialList/ExtraSpecialList.html    |  6 +-
 .../fake/GenericTypedef.html                  |  4 +-
 .../fake/HasGenericWithExtends-class.html     |  4 +-
 .../HasGenericWithExtends.html                |  6 +-
 .../fake/HasGenericWithExtends/hashCode.html  |  2 +-
 .../HasGenericWithExtends/noSuchMethod.html   |  2 +-
 .../operator_equals.html                      |  2 +-
 .../HasGenericWithExtends/runtimeType.html    |  2 +-
 .../fake/HasGenericWithExtends/toString.html  |  2 +-
 .../fake/HasGenerics-class.html               |  6 +-
 .../fake/HasGenerics/HasGenerics.html         |  6 +-
 .../fake/HasGenerics/convertToMap.html        |  4 +-
 .../fake/HasGenerics/doStuff.html             |  2 +-
 .../fake/HasGenerics/hashCode.html            |  2 +-
 .../fake/HasGenerics/noSuchMethod.html        |  2 +-
 .../fake/HasGenerics/operator_equals.html     |  2 +-
 .../fake/HasGenerics/returnX.html             |  2 +-
 .../fake/HasGenerics/returnZ.html             |  2 +-
 .../fake/HasGenerics/runtimeType.html         |  2 +-
 .../fake/HasGenerics/toString.html            |  2 +-
 .../fake/ImplementsFutureVoid-class.html      | 16 ++---
 .../fake/ImplementsFutureVoid/asStream.html   |  2 +-
 .../fake/ImplementsFutureVoid/catchError.html |  2 +-
 .../fake/ImplementsFutureVoid/then.html       |  8 +--
 .../fake/ImplementsFutureVoid/timeout.html    |  4 +-
 .../ImplementsFutureVoid/whenComplete.html    |  2 +-
 .../fake/ImplicitProperties-class.html        |  2 +-
 .../explicitGetterImplicitSetter.html         |  2 +-
 .../fake/LongFirstLine-class.html             |  2 +-
 .../fake/MIEEBase-class.html                  |  6 +-
 .../fake/MIEEBase/MIEEBase.html               |  6 +-
 .../fake/MIEEMixin-class.html                 |  6 +-
 .../fake/MIEEMixin/MIEEMixin.html             |  6 +-
 .../fake/MIEEMixin/operator_put.html          |  2 +-
 .../fake/MIEEMixinWithOverride-class.html     |  8 +--
 .../MIEEMixinWithOverride.html                |  6 +-
 .../MIEEMixinWithOverride/operator_put.html   |  2 +-
 .../fake/MIEEThing-class.html                 |  4 +-
 .../fake/MIEEThing/MIEEThing.html             |  6 +-
 .../fake/MIEEThing/hashCode.html              |  2 +-
 .../fake/MIEEThing/noSuchMethod.html          |  2 +-
 .../fake/MIEEThing/operator_equals.html       |  2 +-
 .../fake/MIEEThing/operator_put.html          |  2 +-
 .../fake/MIEEThing/runtimeType.html           |  2 +-
 .../fake/MIEEThing/toString.html              |  2 +-
 .../fake/NewGenericTypedef.html               |  8 +--
 .../fake/OtherGenericsThing-class.html        |  6 +-
 .../OtherGenericsThing.html                   |  6 +-
 .../fake/OtherGenericsThing/convert.html      |  4 +-
 .../fake/OtherGenericsThing/hashCode.html     |  2 +-
 .../fake/OtherGenericsThing/noSuchMethod.html |  2 +-
 .../OtherGenericsThing/operator_equals.html   |  2 +-
 .../fake/OtherGenericsThing/runtimeType.html  |  2 +-
 .../fake/OtherGenericsThing/toString.html     |  2 +-
 .../fake/SpecialList-class.html               | 70 +++++++++----------
 .../fake/SpecialList/SpecialList.html         |  6 +-
 .../fake/SpecialList/add.html                 |  2 +-
 .../fake/SpecialList/addAll.html              |  4 +-
 .../fake/SpecialList/any.html                 |  2 +-
 .../fake/SpecialList/asMap.html               |  4 +-
 .../fake/SpecialList/cast.html                | 10 +--
 .../fake/SpecialList/clear.html               |  2 +-
 .../fake/SpecialList/contains.html            |  2 +-
 .../fake/SpecialList/elementAt.html           |  2 +-
 .../fake/SpecialList/every.html               |  2 +-
 .../fake/SpecialList/expand.html              | 10 +--
 .../fake/SpecialList/fillRange.html           |  2 +-
 .../fake/SpecialList/first.html               |  2 +-
 .../fake/SpecialList/firstWhere.html          |  2 +-
 .../fake/SpecialList/fold.html                |  8 +--
 .../fake/SpecialList/followedBy.html          |  6 +-
 .../fake/SpecialList/forEach.html             |  2 +-
 .../fake/SpecialList/getRange.html            |  4 +-
 .../fake/SpecialList/hashCode.html            |  2 +-
 .../fake/SpecialList/indexOf.html             |  2 +-
 .../fake/SpecialList/indexWhere.html          |  2 +-
 .../fake/SpecialList/insert.html              |  2 +-
 .../fake/SpecialList/insertAll.html           |  4 +-
 .../fake/SpecialList/isEmpty.html             |  2 +-
 .../fake/SpecialList/isNotEmpty.html          |  2 +-
 .../fake/SpecialList/iterator.html            |  4 +-
 .../fake/SpecialList/join.html                |  2 +-
 .../fake/SpecialList/last.html                |  2 +-
 .../fake/SpecialList/lastIndexOf.html         |  2 +-
 .../fake/SpecialList/lastIndexWhere.html      |  2 +-
 .../fake/SpecialList/lastWhere.html           |  2 +-
 .../fake/SpecialList/length.html              |  2 +-
 .../fake/SpecialList/map.html                 | 10 +--
 .../fake/SpecialList/noSuchMethod.html        |  2 +-
 .../fake/SpecialList/operator_equals.html     |  2 +-
 .../fake/SpecialList/operator_get.html        |  2 +-
 .../fake/SpecialList/operator_plus.html       |  6 +-
 .../fake/SpecialList/operator_put.html        |  2 +-
 .../fake/SpecialList/reduce.html              |  2 +-
 .../fake/SpecialList/remove.html              |  2 +-
 .../fake/SpecialList/removeAt.html            |  2 +-
 .../fake/SpecialList/removeLast.html          |  2 +-
 .../fake/SpecialList/removeRange.html         |  2 +-
 .../fake/SpecialList/removeWhere.html         |  2 +-
 .../fake/SpecialList/replaceRange.html        |  4 +-
 .../fake/SpecialList/retainWhere.html         |  2 +-
 .../fake/SpecialList/retype.html              | 10 +--
 .../fake/SpecialList/reversed.html            |  4 +-
 .../fake/SpecialList/runtimeType.html         |  2 +-
 .../fake/SpecialList/setAll.html              |  4 +-
 .../fake/SpecialList/setRange.html            |  4 +-
 .../fake/SpecialList/shuffle.html             |  2 +-
 .../fake/SpecialList/single.html              |  2 +-
 .../fake/SpecialList/singleWhere.html         |  2 +-
 .../fake/SpecialList/skip.html                |  4 +-
 .../fake/SpecialList/skipWhile.html           |  4 +-
 .../fake/SpecialList/sort.html                |  2 +-
 .../fake/SpecialList/sublist.html             |  4 +-
 .../fake/SpecialList/take.html                |  4 +-
 .../fake/SpecialList/takeWhile.html           |  4 +-
 .../fake/SpecialList/toList.html              |  4 +-
 .../fake/SpecialList/toSet.html               |  4 +-
 .../fake/SpecialList/toString.html            |  2 +-
 .../fake/SpecialList/where.html               |  4 +-
 .../fake/SpecialList/whereType.html           | 10 +--
 .../fake/SuperAwesomeClass-class.html         |  2 +-
 .../fake/SuperAwesomeClass/powers.html        |  2 +-
 .../fake/TypedefUsingClass-class.html         |  4 +-
 .../TypedefUsingClass/TypedefUsingClass.html  |  2 +-
 .../fake/TypedefUsingClass/x.html             |  2 +-
 .../fake/aVoidParameter.html                  |  2 +-
 .../fake/complicatedReturn.html               |  2 +-
 .../test_package_docs/fake/fake-library.html  | 52 +++++++-------
 .../fake/importantComputations.html           |  2 +-
 .../fake/mapWithDynamicKeys.html              |  2 +-
 .../fake/myGenericFunction.html               |  6 +-
 .../fake/paramOfFutureOrNull.html             |  2 +-
 .../fake/returningFutureVoid.html             |  2 +-
 .../fake/thisIsFutureOrNull.html              |  2 +-
 .../fake/thisIsFutureOrT.html                 |  8 +--
 .../fake/typeParamOfFutureOr.html             |  6 +-
 .../static-assets/styles.css                  | 12 ++++
 .../Whataclass-class.html                     |  4 +-
 .../Whataclass/Whataclass.html                |  6 +-
 .../Whataclass/hashCode.html                  |  2 +-
 .../Whataclass/noSuchMethod.html              |  2 +-
 .../Whataclass/operator_equals.html           |  2 +-
 .../Whataclass/runtimeType.html               |  2 +-
 .../Whataclass/toString.html                  |  2 +-
 .../test_package_imported.main-library.html   |  2 +-
 242 files changed, 542 insertions(+), 530 deletions(-)

diff --git a/testing/test_package_docs/ex/Animal-class.html b/testing/test_package_docs/ex/Animal-class.html
index 0cda6e486e..a58ab32dae 100644
--- a/testing/test_package_docs/ex/Animal-class.html
+++ b/testing/test_package_docs/ex/Animal-class.html
@@ -155,13 +155,13 @@ <h2>Constants</h2>
         </dd>
         <dt id="values" class="constant">
           <span class="name ">values</span>
-          <span class="signature">&#8594; const List<span class="signature">&lt;<a href="ex/Animal-class.html">Animal</a>&gt;</span></span>
+          <span class="signature">&#8594; const List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Animal-class.html">Animal</a></span>&gt;</span></span>
         </dt>
         <dd>
           <p>A constant List of the values in this enum, in order of their declaration.</p>
           
   <div>
-            <span class="signature"><code>const List&lt;Animal&gt;</code></span>
+            <span class="signature"><code>const List&lt;<wbr><span class="type-parameter">Animal</span>&gt;</code></span>
           </div>
         </dd>
       </dl>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass-class.html b/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
index 79bfd63f9a..2df64ea5dd 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span> class</li>
+    <li class="self-crumb">AnotherParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">AnotherParameterizedClass</div>
   <form class="search navbar-right" role="search">
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AnotherParameterizedClass&lt;B&gt; class</h1>
+    <h1>AnotherParameterizedClass&lt;<wbr><span class="type-parameter">B</span>&gt; class</h1>
 
     
 
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html b/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
index 216369f8e3..3e849d7713 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">AnotherParameterizedClass constructor</li>
   </ol>
   <div class="self-name">AnotherParameterizedClass</div>
@@ -61,11 +61,11 @@ <h5>AnotherParameterizedClass class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AnotherParameterizedClass&lt;B&gt; constructor</h1>
+    <h1>AnotherParameterizedClass&lt;<wbr><span class="type-parameter">B</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">AnotherParameterizedClass&lt;B&gt;</span>(<wbr>)
+      <span class="name ">AnotherParameterizedClass&lt;<wbr><span class="type-parameter">B</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html b/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
index e7cd4e2c2d..3244d5ec13 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html b/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html
index a81d2c064d..4894ce66ca 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html b/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html
index 12f5f8aae6..0cc511edc3 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html b/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html
index 514cf96e6d..296c5bbd12 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html b/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html
index 00b380e1be..6b4edb609f 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/ex/Apple-class.html b/testing/test_package_docs/ex/Apple-class.html
index b923832f22..4a2378fd20 100644
--- a/testing/test_package_docs/ex/Apple-class.html
+++ b/testing/test_package_docs/ex/Apple-class.html
@@ -154,7 +154,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="fieldWithTypedef" class="property">
           <span class="name"><a href="ex/Apple/fieldWithTypedef.html">fieldWithTypedef</a></span>
-          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;bool&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>
         </dt>
         <dd>
           fieldWithTypedef docs here
@@ -244,7 +244,7 @@ <h2>Methods</h2>
           
 </dd>
         <dt id="whataclass" class="callable">
-          <span class="name"><a href="ex/Apple/whataclass.html">whataclass</a></span><span class="signature">(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;bool&gt;</span>&gt;</span></span> <span class="parameter-name">list</span></span>)
+          <span class="name"><a href="ex/Apple/whataclass.html">whataclass</a></span><span class="signature">(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">list</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/ex/Apple/fieldWithTypedef.html b/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
index 64780ccd26..4b3e83d40a 100644
--- a/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
+++ b/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
@@ -79,7 +79,7 @@ <h5>Apple class</h5>
     <h1>fieldWithTypedef property</h1>
 
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;bool&gt;</span></span>
+          <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>
           <span class="name ">fieldWithTypedef</span>
           <div class="features">final</div>
         </section>
diff --git a/testing/test_package_docs/ex/Apple/whataclass.html b/testing/test_package_docs/ex/Apple/whataclass.html
index cbac01f12f..316159ba9b 100644
--- a/testing/test_package_docs/ex/Apple/whataclass.html
+++ b/testing/test_package_docs/ex/Apple/whataclass.html
@@ -81,7 +81,7 @@ <h1>whataclass method</h1>
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">whataclass</span>
-(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;bool&gt;</span>&gt;</span></span> <span class="parameter-name">list</span></span>)
+(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">list</span></span>)
     </section>
     <section class="desc markdown">
       <p>Apple docs for whataclass</p>
diff --git a/testing/test_package_docs/ex/B-class.html b/testing/test_package_docs/ex/B-class.html
index ce481ef110..5a3e870241 100644
--- a/testing/test_package_docs/ex/B-class.html
+++ b/testing/test_package_docs/ex/B-class.html
@@ -170,7 +170,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="list" class="property">
           <span class="name"><a href="ex/B/list.html">list</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;String&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
         </dt>
         <dd>
           A list of Strings
@@ -186,7 +186,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="fieldWithTypedef" class="property inherited">
           <span class="name"><a href="ex/Apple/fieldWithTypedef.html">fieldWithTypedef</a></span>
-          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;bool&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>
         </dt>
         <dd class="inherited">
           fieldWithTypedef docs here
@@ -313,7 +313,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="whataclass" class="callable inherited">
-          <span class="name"><a href="ex/Apple/whataclass.html">whataclass</a></span><span class="signature">(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;bool&gt;</span>&gt;</span></span> <span class="parameter-name">list</span></span>)
+          <span class="name"><a href="ex/Apple/whataclass.html">whataclass</a></span><span class="signature">(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">list</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/ex/B/list.html b/testing/test_package_docs/ex/B/list.html
index 9348d03605..d34ab28bad 100644
--- a/testing/test_package_docs/ex/B/list.html
+++ b/testing/test_package_docs/ex/B/list.html
@@ -80,7 +80,7 @@ <h5>B class</h5>
     <h1>list property</h1>
 
         <section class="multi-line-signature">
-          <span class="returntype">List<span class="signature">&lt;String&gt;</span></span>
+          <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
           <span class="name ">list</span>
           <div class="features">read / write</div>
         </section>
diff --git a/testing/test_package_docs/ex/Dog-class.html b/testing/test_package_docs/ex/Dog-class.html
index 02fabd3050..c5cb95fbdd 100644
--- a/testing/test_package_docs/ex/Dog-class.html
+++ b/testing/test_package_docs/ex/Dog-class.html
@@ -270,7 +270,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="getAnotherClassD" class="callable">
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getAnotherClassD.html">getAnotherClassD</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<a href="ex/Dog-class.html">Dog</a>&gt;</span></span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Dog-class.html">Dog</a></span>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -279,7 +279,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="getClassA" class="callable">
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getClassA.html">getClassA</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span></span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -287,7 +287,7 @@ <h2>Methods</h2>
           
 </dd>
         <dt id="testGeneric" class="callable">
-          <span class="name"><a href="ex/Dog/testGeneric.html">testGeneric</a></span><span class="signature">(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;String, dynamic&gt;</span></span> <span class="parameter-name">args</span></span>)
+          <span class="name"><a href="ex/Dog/testGeneric.html">testGeneric</a></span><span class="signature">(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;<wbr><span class="type-parameter">String</span>, <span class="type-parameter">dynamic</span>&gt;</span></span> <span class="parameter-name">args</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -296,7 +296,7 @@ <h2>Methods</h2>
           
 </dd>
         <dt id="testGenericMethod" class="callable">
-          <span class="name"><a href="ex/Dog/testGenericMethod.html">testGenericMethod</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
+          <span class="name"><a href="ex/Dog/testGenericMethod.html">testGenericMethod</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/ex/Dog/getAnotherClassD.html b/testing/test_package_docs/ex/Dog/getAnotherClassD.html
index 00efc82671..967e0d3174 100644
--- a/testing/test_package_docs/ex/Dog/getAnotherClassD.html
+++ b/testing/test_package_docs/ex/Dog/getAnotherClassD.html
@@ -97,7 +97,7 @@ <h1>getAnotherClassD method</h1>
           <li>@<a href="ex/Deprecated-class.html">Deprecated</a>(&#39;before v27.3&#39;)</li>
         </ol>
       </div>
-      <span class="returntype">List<span class="signature">&lt;<a href="ex/Dog-class.html">Dog</a>&gt;</span></span>
+      <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Dog-class.html">Dog</a></span>&gt;</span></span>
       <span class="name deprecated">getAnotherClassD</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/ex/Dog/getClassA.html b/testing/test_package_docs/ex/Dog/getClassA.html
index b691c55a5b..546f2b4d26 100644
--- a/testing/test_package_docs/ex/Dog/getClassA.html
+++ b/testing/test_package_docs/ex/Dog/getClassA.html
@@ -97,7 +97,7 @@ <h1>getClassA method</h1>
           <li>@deprecated</li>
         </ol>
       </div>
-      <span class="returntype">List<span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span></span>
+      <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span>
       <span class="name deprecated">getClassA</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/ex/Dog/testGeneric.html b/testing/test_package_docs/ex/Dog/testGeneric.html
index 891d48b9a3..34adafef6b 100644
--- a/testing/test_package_docs/ex/Dog/testGeneric.html
+++ b/testing/test_package_docs/ex/Dog/testGeneric.html
@@ -94,7 +94,7 @@ <h1>testGeneric method</h1>
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">testGeneric</span>
-(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;String, dynamic&gt;</span></span> <span class="parameter-name">args</span></span>)
+(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;<wbr><span class="type-parameter">String</span>, <span class="type-parameter">dynamic</span>&gt;</span></span> <span class="parameter-name">args</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/ex/Dog/testGenericMethod.html b/testing/test_package_docs/ex/Dog/testGenericMethod.html
index 50013f7885..95c2b22361 100644
--- a/testing/test_package_docs/ex/Dog/testGenericMethod.html
+++ b/testing/test_package_docs/ex/Dog/testGenericMethod.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/Dog-class.html">Dog</a></li>
-    <li class="self-crumb">testGenericMethod&lt;T&gt; method</li>
+    <li class="self-crumb">testGenericMethod&lt;<wbr><span class="type-parameter">T</span>&gt; method</li>
   </ol>
   <div class="self-name">testGenericMethod</div>
   <form class="search navbar-right" role="search">
@@ -89,12 +89,12 @@ <h5>Dog class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>testGenericMethod&lt;T&gt; method</h1>
+    <h1>testGenericMethod&lt;<wbr><span class="type-parameter">T</span>&gt; method</h1>
 
     <section class="multi-line-signature">
       <span class="returntype">T</span>
       <span class="name ">testGenericMethod</span>
-&lt;T&gt;(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
+&lt;<wbr><span class="type-parameter">T</span>&gt;(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/ex/F-class.html b/testing/test_package_docs/ex/F-class.html
index eae7cfc322..2e3d9ed138 100644
--- a/testing/test_package_docs/ex/F-class.html
+++ b/testing/test_package_docs/ex/F-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">F<span class="signature">&lt;T extends String&gt;</span> class</li>
+    <li class="self-crumb">F<span class="signature">&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">F</div>
   <form class="search navbar-right" role="search">
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>F&lt;T extends String&gt; class</h1>
+    <h1>F&lt;<wbr><span class="type-parameter">T extends String</span>&gt; class</h1>
 
     
     <section>
@@ -229,7 +229,7 @@ <h2>Properties</h2>
       <h2>Methods</h2>
       <dl class="callables">
         <dt id="methodWithGenericParam" class="callable">
-          <span class="name"><a href="ex/F/methodWithGenericParam.html">methodWithGenericParam</a></span><span class="signature">(<wbr>[<span class="parameter" id="methodWithGenericParam-param-msgs"><span class="type-annotation">List<span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span></span> <span class="parameter-name">msgs</span></span> ])
+          <span class="name"><a href="ex/F/methodWithGenericParam.html">methodWithGenericParam</a></span><span class="signature">(<wbr>[<span class="parameter" id="methodWithGenericParam-param-msgs"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span> <span class="parameter-name">msgs</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -257,7 +257,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="getAnotherClassD" class="callable inherited">
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getAnotherClassD.html">getAnotherClassD</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<a href="ex/Dog-class.html">Dog</a>&gt;</span></span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Dog-class.html">Dog</a></span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -266,7 +266,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="getClassA" class="callable inherited">
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getClassA.html">getClassA</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span></span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -292,7 +292,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="testGeneric" class="callable inherited">
-          <span class="name"><a href="ex/Dog/testGeneric.html">testGeneric</a></span><span class="signature">(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;String, dynamic&gt;</span></span> <span class="parameter-name">args</span></span>)
+          <span class="name"><a href="ex/Dog/testGeneric.html">testGeneric</a></span><span class="signature">(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;<wbr><span class="type-parameter">String</span>, <span class="type-parameter">dynamic</span>&gt;</span></span> <span class="parameter-name">args</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -301,7 +301,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="testGenericMethod" class="callable inherited">
-          <span class="name"><a href="ex/Dog/testGenericMethod.html">testGenericMethod</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
+          <span class="name"><a href="ex/Dog/testGenericMethod.html">testGenericMethod</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/ex/F/F.html b/testing/test_package_docs/ex/F/F.html
index 5756815053..8de10465a9 100644
--- a/testing/test_package_docs/ex/F/F.html
+++ b/testing/test_package_docs/ex/F/F.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/F-class.html">F<span class="signature">&lt;T extends String&gt;</span></a></li>
+    <li><a href="ex/F-class.html">F<span class="signature">&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span></a></li>
     <li class="self-crumb">F constructor</li>
   </ol>
   <div class="self-name">F</div>
@@ -82,11 +82,11 @@ <h5>F class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>F&lt;T extends String&gt; constructor</h1>
+    <h1>F&lt;<wbr><span class="type-parameter">T extends String</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">F&lt;T extends String&gt;</span>(<wbr>)
+      <span class="name ">F&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/F/methodWithGenericParam.html b/testing/test_package_docs/ex/F/methodWithGenericParam.html
index 4e2a9b2c62..f14e9b1142 100644
--- a/testing/test_package_docs/ex/F/methodWithGenericParam.html
+++ b/testing/test_package_docs/ex/F/methodWithGenericParam.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/F-class.html">F<span class="signature">&lt;T extends String&gt;</span></a></li>
+    <li><a href="ex/F-class.html">F<span class="signature">&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span></a></li>
     <li class="self-crumb">methodWithGenericParam method</li>
   </ol>
   <div class="self-name">methodWithGenericParam</div>
@@ -87,7 +87,7 @@ <h1>methodWithGenericParam method</h1>
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">methodWithGenericParam</span>
-(<wbr>[<span class="parameter" id="methodWithGenericParam-param-msgs"><span class="type-annotation">List<span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span></span> <span class="parameter-name">msgs</span></span> ])
+(<wbr>[<span class="parameter" id="methodWithGenericParam-param-msgs"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span> <span class="parameter-name">msgs</span></span> ])
     </section>
     
     
diff --git a/testing/test_package_docs/ex/F/test.html b/testing/test_package_docs/ex/F/test.html
index 158fb85c0f..80fe610e0a 100644
--- a/testing/test_package_docs/ex/F/test.html
+++ b/testing/test_package_docs/ex/F/test.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/F-class.html">F<span class="signature">&lt;T extends String&gt;</span></a></li>
+    <li><a href="ex/F-class.html">F<span class="signature">&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span></a></li>
     <li class="self-crumb">test method</li>
   </ol>
   <div class="self-name">test</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass-class.html b/testing/test_package_docs/ex/ParameterizedClass-class.html
index 11d9f04113..36a9dfe5e7 100644
--- a/testing/test_package_docs/ex/ParameterizedClass-class.html
+++ b/testing/test_package_docs/ex/ParameterizedClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">ParameterizedClass<span class="signature">&lt;T&gt;</span> abstract class</li>
+    <li class="self-crumb">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> abstract class</li>
   </ol>
   <div class="self-name">ParameterizedClass</div>
   <form class="search navbar-right" role="search">
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ParameterizedClass&lt;T&gt; class</h1>
+    <h1>ParameterizedClass&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
 
     <section class="desc markdown">
       <p>Support class to test inheritance + type expansion from implements clause.</p>
@@ -145,7 +145,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aInheritedField" class="property">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedField.html">aInheritedField</a></span>
-          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -153,7 +153,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedGetter" class="property">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedGetter.html">aInheritedGetter</a></span>
-          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -161,7 +161,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedSetter" class="property">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedSetter.html">aInheritedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span></span></span>
         </dt>
         <dd>
           
@@ -191,7 +191,7 @@ <h2>Methods</h2>
       <dl class="callables">
         <dt id="aInheritedMethod" class="callable">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedMethod.html">aInheritedMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aInheritedMethod-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
-            <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
+            <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -200,7 +200,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="aInheritedTypedefReturningMethod" class="callable">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedTypedefReturningMethod.html">aInheritedTypedefReturningMethod</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;T&gt;</span></span>
+            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -232,8 +232,8 @@ <h2>Methods</h2>
       <h2>Operators</h2>
       <dl class="callables">
         <dt id="operator +" class="callable">
-          <span class="name"><a href="ex/ParameterizedClass/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;T&gt;</span></span> <span class="parameter-name">other</span></span>)
-            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
+          <span class="name"><a href="ex/ParameterizedClass/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html b/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
index 2e8f5f4607..fd8ea734b2 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">ParameterizedClass constructor</li>
   </ol>
   <div class="self-name">ParameterizedClass</div>
@@ -67,11 +67,11 @@ <h5>ParameterizedClass class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ParameterizedClass&lt;T&gt; constructor</h1>
+    <h1>ParameterizedClass&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">ParameterizedClass&lt;T&gt;</span>(<wbr>)
+      <span class="name ">ParameterizedClass&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
index 473b193a66..6c1b22835d 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">aInheritedField property</li>
   </ol>
   <div class="self-name">aInheritedField</div>
@@ -70,7 +70,7 @@ <h5>ParameterizedClass class</h5>
     <h1>aInheritedField property</h1>
 
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
+          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           <span class="name ">aInheritedField</span>
           <div class="features">read / write</div>
         </section>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html
index 61230f4e64..acae138901 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">aInheritedGetter property</li>
   </ol>
   <div class="self-name">aInheritedGetter</div>
@@ -73,7 +73,7 @@ <h1>aInheritedGetter property</h1>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
+          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           <span class="name ">aInheritedGetter</span>
   
 </section>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html
index ef56637600..0cf069c56f 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">aInheritedMethod abstract method</li>
   </ol>
   <div class="self-name">aInheritedMethod</div>
@@ -70,7 +70,7 @@ <h5>ParameterizedClass class</h5>
     <h1>aInheritedMethod method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
+      <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
       <span class="name ">aInheritedMethod</span>
 (<wbr><span class="parameter" id="aInheritedMethod-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
     </section>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html
index 5993e5c6a1..cc1b2c0094 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">aInheritedSetter property</li>
   </ol>
   <div class="self-name">aInheritedSetter</div>
@@ -76,7 +76,7 @@ <h1>aInheritedSetter property</h1>
         <section class="multi-line-signature">
           <span class="returntype">void</span>
             <span class="name ">aInheritedSetter=</span>
-<span class="signature">(<wbr><span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span> <span class="parameter-name">thingToSet</span></span>)</span>
+<span class="signature">(<wbr><span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">thingToSet</span></span>)</span>
           
 </section>
         
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
index fac2e42a84..8248fa127c 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">aInheritedTypedefReturningMethod abstract method</li>
   </ol>
   <div class="self-name">aInheritedTypedefReturningMethod</div>
@@ -70,7 +70,7 @@ <h5>ParameterizedClass class</h5>
     <h1>aInheritedTypedefReturningMethod method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;T&gt;</span></span>
+      <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
       <span class="name ">aInheritedTypedefReturningMethod</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/hashCode.html b/testing/test_package_docs/ex/ParameterizedClass/hashCode.html
index 18e44d2df1..487eb6d26e 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/hashCode.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html b/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html
index 05474b009e..95ebe969c7 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html b/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html
index eb4a915d51..f99c63e427 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html b/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html
index a793043036..3e8d9b1721 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">operator + abstract method</li>
   </ol>
   <div class="self-name">operator +</div>
@@ -70,9 +70,9 @@ <h5>ParameterizedClass class</h5>
     <h1>operator + method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
+      <span class="returntype"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
       <span class="name ">operator +</span>
-(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;T&gt;</span></span> <span class="parameter-name">other</span></span>)
+(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html b/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
index a913529fd7..6cbdf5fd86 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/toString.html b/testing/test_package_docs/ex/ParameterizedClass/toString.html
index 40ef573c53..e8f426fb88 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/toString.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/ex/ParameterizedTypedef.html b/testing/test_package_docs/ex/ParameterizedTypedef.html
index 18daa695d0..c6f4c166e1 100644
--- a/testing/test_package_docs/ex/ParameterizedTypedef.html
+++ b/testing/test_package_docs/ex/ParameterizedTypedef.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">ParameterizedTypedef&lt;T&gt; typedef</li>
+    <li class="self-crumb">ParameterizedTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</li>
   </ol>
   <div class="self-name">ParameterizedTypedef</div>
   <form class="search navbar-right" role="search">
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ParameterizedTypedef&lt;T&gt; typedef</h1>
+    <h1>ParameterizedTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs/ex/TemplatedClass-class.html b/testing/test_package_docs/ex/TemplatedClass-class.html
index 6f070655ff..4b8b342a18 100644
--- a/testing/test_package_docs/ex/TemplatedClass-class.html
+++ b/testing/test_package_docs/ex/TemplatedClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">TemplatedClass<span class="signature">&lt;X&gt;</span> class</li>
+    <li class="self-crumb">TemplatedClass<span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">TemplatedClass</div>
   <form class="search navbar-right" role="search">
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TemplatedClass&lt;X&gt; class</h1>
+    <h1>TemplatedClass&lt;<wbr><span class="type-parameter">X</span>&gt; class</h1>
 
     
 
diff --git a/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html b/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
index 1f9b4d200f..e0cbe749f9 100644
--- a/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
+++ b/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></a></li>
     <li class="self-crumb">TemplatedClass constructor</li>
   </ol>
   <div class="self-name">TemplatedClass</div>
@@ -62,11 +62,11 @@ <h5>TemplatedClass class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TemplatedClass&lt;X&gt; constructor</h1>
+    <h1>TemplatedClass&lt;<wbr><span class="type-parameter">X</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">TemplatedClass&lt;X&gt;</span>(<wbr>)
+      <span class="name ">TemplatedClass&lt;<wbr><span class="type-parameter">X</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/TemplatedClass/aMethod.html b/testing/test_package_docs/ex/TemplatedClass/aMethod.html
index 2224cc86a7..b9640e6f07 100644
--- a/testing/test_package_docs/ex/TemplatedClass/aMethod.html
+++ b/testing/test_package_docs/ex/TemplatedClass/aMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></a></li>
     <li class="self-crumb">aMethod method</li>
   </ol>
   <div class="self-name">aMethod</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/hashCode.html b/testing/test_package_docs/ex/TemplatedClass/hashCode.html
index 7fa26f9c70..d9488576f4 100644
--- a/testing/test_package_docs/ex/TemplatedClass/hashCode.html
+++ b/testing/test_package_docs/ex/TemplatedClass/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html b/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html
index c396cef563..e1a6fbbdbb 100644
--- a/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/operator_equals.html b/testing/test_package_docs/ex/TemplatedClass/operator_equals.html
index cef6495a4b..de61e02195 100644
--- a/testing/test_package_docs/ex/TemplatedClass/operator_equals.html
+++ b/testing/test_package_docs/ex/TemplatedClass/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/runtimeType.html b/testing/test_package_docs/ex/TemplatedClass/runtimeType.html
index 566ea70bd6..3e6ad22079 100644
--- a/testing/test_package_docs/ex/TemplatedClass/runtimeType.html
+++ b/testing/test_package_docs/ex/TemplatedClass/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/toString.html b/testing/test_package_docs/ex/TemplatedClass/toString.html
index bdc33cc652..05c1f1e61d 100644
--- a/testing/test_package_docs/ex/TemplatedClass/toString.html
+++ b/testing/test_package_docs/ex/TemplatedClass/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/ex/TemplatedInterface-class.html b/testing/test_package_docs/ex/TemplatedInterface-class.html
index 392677445f..65861965b8 100644
--- a/testing/test_package_docs/ex/TemplatedInterface-class.html
+++ b/testing/test_package_docs/ex/TemplatedInterface-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">TemplatedInterface<span class="signature">&lt;A&gt;</span> abstract class</li>
+    <li class="self-crumb">TemplatedInterface<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span> abstract class</li>
   </ol>
   <div class="self-name">TemplatedInterface</div>
   <form class="search navbar-right" role="search">
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TemplatedInterface&lt;A&gt; class</h1>
+    <h1>TemplatedInterface&lt;<wbr><span class="type-parameter">A</span>&gt; class</h1>
 
     <section class="desc markdown">
       <p>Class for testing expansion of type from implements clause.</p>
@@ -119,7 +119,7 @@ <h1>TemplatedInterface&lt;A&gt; class</h1>
         <dt>Implements</dt>
         <dd>
           <ul class="comma-separated clazz-relationships">
-            <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></li>
+            <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></li>
           </ul>
         </dd>
 
@@ -147,7 +147,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aField" class="property">
           <span class="name"><a href="ex/TemplatedInterface/aField.html">aField</a></span>
-          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;Stream<span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Stream<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -155,7 +155,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aGetter" class="property">
           <span class="name"><a href="ex/TemplatedInterface/aGetter.html">aGetter</a></span>
-          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;Map<span class="signature">&lt;A, List<span class="signature">&lt;String&gt;</span>&gt;</span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Map<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -163,7 +163,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aSetter" class="property">
           <span class="name"><a href="ex/TemplatedInterface/aSetter.html">aSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="aSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;bool&gt;</span>&gt;</span></span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="aSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span></span></span>
         </dt>
         <dd>
           
@@ -171,7 +171,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedField" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedField.html">aInheritedField</a></span>
-          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
         </dt>
         <dd class="inherited">
           
@@ -179,7 +179,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedGetter" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedGetter.html">aInheritedGetter</a></span>
-          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
         </dt>
         <dd class="inherited">
           
@@ -187,7 +187,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedSetter" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedSetter.html">aInheritedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span></span></span>
         </dt>
         <dd class="inherited">
           
@@ -217,7 +217,7 @@ <h2>Methods</h2>
       <dl class="callables">
         <dt id="aMethodInterface" class="callable">
           <span class="name"><a href="ex/TemplatedInterface/aMethodInterface.html">aMethodInterface</a></span><span class="signature">(<wbr><span class="parameter" id="aMethodInterface-param-value"><span class="type-annotation">A</span> <span class="parameter-name">value</span></span>)
-            <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span>
+            <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -226,7 +226,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="aTypedefReturningMethodInterface" class="callable">
           <span class="name"><a href="ex/TemplatedInterface/aTypedefReturningMethodInterface.html">aTypedefReturningMethodInterface</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;List<span class="signature">&lt;String&gt;</span>&gt;</span></span>
+            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -235,7 +235,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="aInheritedMethod" class="callable inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedMethod.html">aInheritedMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aInheritedMethod-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
-            <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span>
+            <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -244,7 +244,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="aInheritedTypedefReturningMethod" class="callable inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedTypedefReturningMethod.html">aInheritedTypedefReturningMethod</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span>
+            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -276,8 +276,8 @@ <h2>Methods</h2>
       <h2>Operators</h2>
       <dl class="callables">
         <dt id="operator +" class="callable inherited">
-          <span class="name"><a href="ex/ParameterizedClass/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
-            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span>
+          <span class="name"><a href="ex/ParameterizedClass/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
diff --git a/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html b/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html
index 19e51bbd39..d5cd135bfc 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">TemplatedInterface constructor</li>
   </ol>
   <div class="self-name">TemplatedInterface</div>
@@ -72,11 +72,11 @@ <h5>TemplatedInterface class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TemplatedInterface&lt;A&gt; constructor</h1>
+    <h1>TemplatedInterface&lt;<wbr><span class="type-parameter">A</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">TemplatedInterface&lt;A&gt;</span>(<wbr>)
+      <span class="name ">TemplatedInterface&lt;<wbr><span class="type-parameter">A</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aField.html b/testing/test_package_docs/ex/TemplatedInterface/aField.html
index 124cebfa0f..0372e91eb8 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aField.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aField.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">aField property</li>
   </ol>
   <div class="self-name">aField</div>
@@ -75,7 +75,7 @@ <h5>TemplatedInterface class</h5>
     <h1>aField property</h1>
 
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;Stream<span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>&gt;</span></span>
+          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Stream<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>&gt;</span></span>
           <span class="name ">aField</span>
           <div class="features">read / write</div>
         </section>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aGetter.html b/testing/test_package_docs/ex/TemplatedInterface/aGetter.html
index 9d046d8f1e..6735cc031d 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aGetter.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aGetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">aGetter property</li>
   </ol>
   <div class="self-name">aGetter</div>
@@ -78,7 +78,7 @@ <h1>aGetter property</h1>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;Map<span class="signature">&lt;A, List<span class="signature">&lt;String&gt;</span>&gt;</span>&gt;</span></span>
+          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Map<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>&gt;</span></span>
           <span class="name ">aGetter</span>
   
 </section>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html b/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html
index 1b0ea41e9f..2e2f0225e5 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">aMethodInterface abstract method</li>
   </ol>
   <div class="self-name">aMethodInterface</div>
@@ -75,7 +75,7 @@ <h5>TemplatedInterface class</h5>
     <h1>aMethodInterface method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></span>
+      <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
       <span class="name ">aMethodInterface</span>
 (<wbr><span class="parameter" id="aMethodInterface-param-value"><span class="type-annotation">A</span> <span class="parameter-name">value</span></span>)
     </section>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aSetter.html b/testing/test_package_docs/ex/TemplatedInterface/aSetter.html
index 9889dd902e..c77bf2790d 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aSetter.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aSetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">aSetter property</li>
   </ol>
   <div class="self-name">aSetter</div>
@@ -81,7 +81,7 @@ <h1>aSetter property</h1>
         <section class="multi-line-signature">
           <span class="returntype">void</span>
             <span class="name ">aSetter=</span>
-<span class="signature">(<wbr><span class="parameter" id="aSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;bool&gt;</span>&gt;</span></span> <span class="parameter-name">thingToSet</span></span>)</span>
+<span class="signature">(<wbr><span class="parameter" id="aSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">thingToSet</span></span>)</span>
           
 </section>
         
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html b/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
index 32f7f6d9a4..6dd958a7c3 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">aTypedefReturningMethodInterface abstract method</li>
   </ol>
   <div class="self-name">aTypedefReturningMethodInterface</div>
@@ -75,7 +75,7 @@ <h5>TemplatedInterface class</h5>
     <h1>aTypedefReturningMethodInterface method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;List<span class="signature">&lt;String&gt;</span>&gt;</span></span>
+      <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>
       <span class="name ">aTypedefReturningMethodInterface</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
index f5227a43ea..d7258e769b 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
@@ -154,7 +154,7 @@ <h2>Properties</h2>
       <h2>Methods</h2>
       <dl class="callables">
         <dt id="getAComplexTypedef" class="callable">
-          <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html">getAComplexTypedef</a></span><span class="signature">&lt;A4, A5, A6&gt;</span><span class="signature">(<wbr>)
+          <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html">getAComplexTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">A4</span>, <span class="type-parameter">A5</span>, <span class="type-parameter">A6</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="ex/aComplexTypedef.html">aComplexTypedef</a></span>
           </span>
         </dt>
@@ -163,8 +163,8 @@ <h2>Methods</h2>
           
 </dd>
         <dt id="getAFunctionReturningBool" class="callable">
-          <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html">getAFunctionReturningBool</a></span><span class="signature">&lt;T1, T2, T3&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; bool Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
+          <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html">getAFunctionReturningBool</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>, <span class="type-parameter">T3</span>&gt;</span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; bool Function<span class="signature">&lt;<wbr><span class="type-parameter">T4</span>&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
           </span>
         </dt>
         <dd>
@@ -173,7 +173,7 @@ <h2>Methods</h2>
           
 </dd>
         <dt id="getAFunctionReturningVoid" class="callable">
-          <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html">getAFunctionReturningVoid</a></span><span class="signature">&lt;T1, T2&gt;</span><span class="signature">(<wbr><span class="parameter" id="getAFunctionReturningVoid-param-callback"><span class="type-annotation">void</span> <span class="parameter-name">callback</span>(<span class="parameter" id="callback-param-argument1"><span class="type-annotation">T1</span> <span class="parameter-name">argument1</span>, </span> <span class="parameter" id="callback-param-argument2"><span class="type-annotation">T2</span> <span class="parameter-name">argument2</span></span>)</span>)
+          <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html">getAFunctionReturningVoid</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="getAFunctionReturningVoid-param-callback"><span class="type-annotation">void</span> <span class="parameter-name">callback</span>(<span class="parameter" id="callback-param-argument1"><span class="type-annotation">T1</span> <span class="parameter-name">argument1</span>, </span> <span class="parameter" id="callback-param-argument2"><span class="type-annotation">T2</span> <span class="parameter-name">argument2</span></span>)</span>)
             <span class="returntype parameter">&#8594; void Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span></span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html
index 06bd4c6cee..742ae6afe9 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">getAComplexTypedef&lt;A4, A5, A6&gt; abstract method</li>
+    <li class="self-crumb">getAComplexTypedef&lt;<wbr><span class="type-parameter">A4</span>, <span class="type-parameter">A5</span>, <span class="type-parameter">A6</span>&gt; abstract method</li>
   </ol>
   <div class="self-name">getAComplexTypedef</div>
   <form class="search navbar-right" role="search">
@@ -64,12 +64,12 @@ <h5>TypedFunctionsWithoutTypedefs class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>getAComplexTypedef&lt;A4, A5, A6&gt; method</h1>
+    <h1>getAComplexTypedef&lt;<wbr><span class="type-parameter">A4</span>, <span class="type-parameter">A5</span>, <span class="type-parameter">A6</span>&gt; method</h1>
 
     <section class="multi-line-signature">
       <span class="returntype"><a href="ex/aComplexTypedef.html">aComplexTypedef</a></span>
       <span class="name ">getAComplexTypedef</span>
-&lt;A4, A5, A6&gt;(<wbr>)
+&lt;<wbr><span class="type-parameter">A4</span>, <span class="type-parameter">A5</span>, <span class="type-parameter">A6</span>&gt;(<wbr>)
     </section>
     <section class="desc markdown">
       <p>Returns a complex typedef that includes some anonymous typed functions.</p>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
index 25da6aeb0c..a7109dd253 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">getAFunctionReturningBool&lt;T1, T2, T3&gt; abstract method</li>
+    <li class="self-crumb">getAFunctionReturningBool&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>, <span class="type-parameter">T3</span>&gt; abstract method</li>
   </ol>
   <div class="self-name">getAFunctionReturningBool</div>
   <form class="search navbar-right" role="search">
@@ -64,12 +64,12 @@ <h5>TypedFunctionsWithoutTypedefs class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>getAFunctionReturningBool&lt;T1, T2, T3&gt; method</h1>
+    <h1>getAFunctionReturningBool&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>, <span class="type-parameter">T3</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">bool Function<span class="signature">&lt;T4&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
+      <span class="returntype">bool Function<span class="signature">&lt;<wbr><span class="type-parameter">T4</span>&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
       <span class="name ">getAFunctionReturningBool</span>
-&lt;T1, T2, T3&gt;(<wbr>)
+&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>, <span class="type-parameter">T3</span>&gt;(<wbr>)
     </section>
     <section class="desc markdown">
       <p>This helps us make sure we get both the empty and the non-empty
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
index fa02fa56ca..f5611c9f62 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
     <li><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></li>
-    <li class="self-crumb">getAFunctionReturningVoid&lt;T1, T2&gt; abstract method</li>
+    <li class="self-crumb">getAFunctionReturningVoid&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>&gt; abstract method</li>
   </ol>
   <div class="self-name">getAFunctionReturningVoid</div>
   <form class="search navbar-right" role="search">
@@ -64,12 +64,12 @@ <h5>TypedFunctionsWithoutTypedefs class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>getAFunctionReturningVoid&lt;T1, T2&gt; method</h1>
+    <h1>getAFunctionReturningVoid&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>&gt; method</h1>
 
     <section class="multi-line-signature">
       <span class="returntype">void Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span></span>
       <span class="name ">getAFunctionReturningVoid</span>
-&lt;T1, T2&gt;(<wbr><span class="parameter" id="getAFunctionReturningVoid-param-callback"><span class="type-annotation">void</span> <span class="parameter-name">callback</span>(<span class="parameter" id="callback-param-argument1"><span class="type-annotation">T1</span> <span class="parameter-name">argument1</span>, </span> <span class="parameter" id="callback-param-argument2"><span class="type-annotation">T2</span> <span class="parameter-name">argument2</span></span>)</span>)
+&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>&gt;(<wbr><span class="parameter" id="getAFunctionReturningVoid-param-callback"><span class="type-annotation">void</span> <span class="parameter-name">callback</span>(<span class="parameter" id="callback-param-argument1"><span class="type-annotation">T1</span> <span class="parameter-name">argument1</span>, </span> <span class="parameter" id="callback-param-argument2"><span class="type-annotation">T2</span> <span class="parameter-name">argument2</span></span>)</span>)
     </section>
     <section class="desc markdown">
       <p>Returns a function that returns a void with some generic types sprinkled in.</p>
diff --git a/testing/test_package_docs/ex/WithGeneric-class.html b/testing/test_package_docs/ex/WithGeneric-class.html
index 01b83233d0..74de37571a 100644
--- a/testing/test_package_docs/ex/WithGeneric-class.html
+++ b/testing/test_package_docs/ex/WithGeneric-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">WithGeneric<span class="signature">&lt;T&gt;</span> class</li>
+    <li class="self-crumb">WithGeneric<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">WithGeneric</div>
   <form class="search navbar-right" role="search">
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>WithGeneric&lt;T&gt; class</h1>
+    <h1>WithGeneric&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
 
     
     <section>
diff --git a/testing/test_package_docs/ex/WithGeneric/WithGeneric.html b/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
index b0ce994a7f..27b3764761 100644
--- a/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
+++ b/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">WithGeneric constructor</li>
   </ol>
   <div class="self-name">WithGeneric</div>
@@ -62,11 +62,11 @@ <h5>WithGeneric class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>WithGeneric&lt;T&gt; constructor</h1>
+    <h1>WithGeneric&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">WithGeneric&lt;T&gt;</span>(<wbr><span class="parameter" id="-param-prop"><span class="type-annotation">T</span> <span class="parameter-name">prop</span></span>)
+      <span class="name ">WithGeneric&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr><span class="parameter" id="-param-prop"><span class="type-annotation">T</span> <span class="parameter-name">prop</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/WithGeneric/hashCode.html b/testing/test_package_docs/ex/WithGeneric/hashCode.html
index d613832f29..9dddcd9e73 100644
--- a/testing/test_package_docs/ex/WithGeneric/hashCode.html
+++ b/testing/test_package_docs/ex/WithGeneric/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html b/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html
index b30f04e215..a52c24a227 100644
--- a/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html
+++ b/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/operator_equals.html b/testing/test_package_docs/ex/WithGeneric/operator_equals.html
index eb62602ca5..4a42557bfc 100644
--- a/testing/test_package_docs/ex/WithGeneric/operator_equals.html
+++ b/testing/test_package_docs/ex/WithGeneric/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/prop.html b/testing/test_package_docs/ex/WithGeneric/prop.html
index b7924f8bd8..2c3eb600fd 100644
--- a/testing/test_package_docs/ex/WithGeneric/prop.html
+++ b/testing/test_package_docs/ex/WithGeneric/prop.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">prop property</li>
   </ol>
   <div class="self-name">prop</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/runtimeType.html b/testing/test_package_docs/ex/WithGeneric/runtimeType.html
index e1ebf5b668..192840926a 100644
--- a/testing/test_package_docs/ex/WithGeneric/runtimeType.html
+++ b/testing/test_package_docs/ex/WithGeneric/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/toString.html b/testing/test_package_docs/ex/WithGeneric/toString.html
index 7a3b104e65..18f2e81a0b 100644
--- a/testing/test_package_docs/ex/WithGeneric/toString.html
+++ b/testing/test_package_docs/ex/WithGeneric/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/ex/WithGenericSub-class.html b/testing/test_package_docs/ex/WithGenericSub-class.html
index 08b1d4c32a..28cb503153 100644
--- a/testing/test_package_docs/ex/WithGenericSub-class.html
+++ b/testing/test_package_docs/ex/WithGenericSub-class.html
@@ -115,7 +115,7 @@ <h1>WithGenericSub class</h1>
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li><a href="ex/WithGeneric-class.html">WithGeneric</a><span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span></li>
+          <li><a href="ex/WithGeneric-class.html">WithGeneric</a><span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></li>
           <li>WithGenericSub</li>
         </ul></dd>
 
diff --git a/testing/test_package_docs/ex/aComplexTypedef.html b/testing/test_package_docs/ex/aComplexTypedef.html
index 881008db83..3cd9a3f959 100644
--- a/testing/test_package_docs/ex/aComplexTypedef.html
+++ b/testing/test_package_docs/ex/aComplexTypedef.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">aComplexTypedef&lt;A1, A2, A3&gt; typedef</li>
+    <li class="self-crumb">aComplexTypedef&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt; typedef</li>
   </ol>
   <div class="self-name">aComplexTypedef</div>
   <form class="search navbar-right" role="search">
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>aComplexTypedef&lt;A1, A2, A3&gt; typedef</h1>
+    <h1>aComplexTypedef&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt; typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html
index f6dd70e36a..1e707a0a79 100644
--- a/testing/test_package_docs/ex/ex-library.html
+++ b/testing/test_package_docs/ex/ex-library.html
@@ -69,7 +69,7 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="AnotherParameterizedClass">
-          <span class="name "><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;B&gt;</span></span>
+          <span class="name "><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -141,7 +141,7 @@ <h2>Classes</h2>
           
         </dd>
         <dt id="F">
-          <span class="name "><a href="ex/F-class.html">F</a><span class="signature">&lt;T extends String&gt;</span></span>
+          <span class="name "><a href="ex/F-class.html">F</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -173,7 +173,7 @@ <h2>Classes</h2>
           A class
         </dd>
         <dt id="ParameterizedClass">
-          <span class="name "><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
+          <span class="name "><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
         </dt>
         <dd>
           Support class to test inheritance + type expansion from implements clause.
@@ -210,13 +210,13 @@ <h2>Classes</h2>
 that has some operators
         </dd>
         <dt id="TemplatedClass">
-          <span class="name "><a href="ex/TemplatedClass-class.html">TemplatedClass</a><span class="signature">&lt;X&gt;</span></span>
+          <span class="name "><a href="ex/TemplatedClass-class.html">TemplatedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></span>
         </dt>
         <dd>
           
         </dd>
         <dt id="TemplatedInterface">
-          <span class="name "><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a><span class="signature">&lt;A&gt;</span></span>
+          <span class="name "><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span>
         </dt>
         <dd>
           Class for testing expansion of type from implements clause.
@@ -228,7 +228,7 @@ <h2>Classes</h2>
           This class has a complicated type situation.
         </dd>
         <dt id="WithGeneric">
-          <span class="name "><a href="ex/WithGeneric-class.html">WithGeneric</a><span class="signature">&lt;T&gt;</span></span>
+          <span class="name "><a href="ex/WithGeneric-class.html">WithGeneric</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -336,7 +336,7 @@ <h2>Constants</h2>
         </dd>
         <dt id="PRETTY_COLORS" class="constant">
           <span class="name "><a href="ex/PRETTY_COLORS-constant.html">PRETTY_COLORS</a></span>
-          <span class="signature">&#8594; const List<span class="signature">&lt;String&gt;</span></span>
+          <span class="signature">&#8594; const List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -409,7 +409,7 @@ <h2>Functions</h2>
           
 </dd>
         <dt id="genericFunction" class="callable">
-          <span class="name"><a href="ex/genericFunction.html">genericFunction</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="genericFunction-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
+          <span class="name"><a href="ex/genericFunction.html">genericFunction</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="genericFunction-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
         </dt>
@@ -439,7 +439,7 @@ <h2>Typedefs</h2>
 
       <dl class="callables">
         <dt id="aComplexTypedef" class="callable">
-          <span class="name"><a href="ex/aComplexTypedef.html">aComplexTypedef</a></span><span class="signature">&lt;A1, A2, A3&gt;</span><span class="signature">(<wbr><span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">String</span></span>)
+          <span class="name"><a href="ex/aComplexTypedef.html">aComplexTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">String</span></span>)
             <span class="returntype parameter">&#8594; void Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
           </span>
         </dt>
@@ -448,7 +448,7 @@ <h2>Typedefs</h2>
           
 </dd>
         <dt id="ParameterizedTypedef" class="callable">
-          <span class="name"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="ParameterizedTypedef-param-msg"><span class="type-annotation">T</span> <span class="parameter-name">msg</span>, </span> <span class="parameter" id="ParameterizedTypedef-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
+          <span class="name"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="ParameterizedTypedef-param-msg"><span class="type-annotation">T</span> <span class="parameter-name">msg</span>, </span> <span class="parameter" id="ParameterizedTypedef-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
         </dt>
@@ -457,7 +457,7 @@ <h2>Typedefs</h2>
           
 </dd>
         <dt id="processMessage" class="callable">
-          <span class="name"><a href="ex/processMessage.html">processMessage</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="processMessage-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>)
+          <span class="name"><a href="ex/processMessage.html">processMessage</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="processMessage-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/ex/genericFunction.html b/testing/test_package_docs/ex/genericFunction.html
index 238fa6db8c..22f15b4553 100644
--- a/testing/test_package_docs/ex/genericFunction.html
+++ b/testing/test_package_docs/ex/genericFunction.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">genericFunction&lt;T&gt; function</li>
+    <li class="self-crumb">genericFunction&lt;<wbr><span class="type-parameter">T</span>&gt; function</li>
   </ol>
   <div class="self-name">genericFunction</div>
   <form class="search navbar-right" role="search">
@@ -107,12 +107,12 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>genericFunction&lt;T&gt; function</h1>
+    <h1>genericFunction&lt;<wbr><span class="type-parameter">T</span>&gt; function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">T</span>
         <span class="name ">genericFunction</span>
-&lt;T&gt;(<wbr><span class="parameter" id="genericFunction-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
+&lt;<wbr><span class="type-parameter">T</span>&gt;(<wbr><span class="parameter" id="genericFunction-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/ex/processMessage.html b/testing/test_package_docs/ex/processMessage.html
index b034c8f726..ec1a2fe0aa 100644
--- a/testing/test_package_docs/ex/processMessage.html
+++ b/testing/test_package_docs/ex/processMessage.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li class="self-crumb">processMessage&lt;T&gt; typedef</li>
+    <li class="self-crumb">processMessage&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</li>
   </ol>
   <div class="self-name">processMessage</div>
   <form class="search navbar-right" role="search">
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>processMessage&lt;T&gt; typedef</h1>
+    <h1>processMessage&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass-class.html b/testing/test_package_docs/fake/ATypeTakingClass-class.html
index b9dfdb1f34..af8ef7ba34 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass-class.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">ATypeTakingClass<span class="signature">&lt;T&gt;</span> class</li>
+    <li class="self-crumb">ATypeTakingClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">ATypeTakingClass</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ATypeTakingClass&lt;T&gt; class</h1>
+    <h1>ATypeTakingClass&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
 
     <section class="desc markdown">
       <p>This class takes a type, and it might be void.</p>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass/ATypeTakingClass.html b/testing/test_package_docs/fake/ATypeTakingClass/ATypeTakingClass.html
index f18b1b8c36..a6973d299e 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass/ATypeTakingClass.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass/ATypeTakingClass.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">ATypeTakingClass constructor</li>
   </ol>
   <div class="self-name">ATypeTakingClass</div>
@@ -62,11 +62,11 @@ <h5>ATypeTakingClass class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ATypeTakingClass&lt;T&gt; constructor</h1>
+    <h1>ATypeTakingClass&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">ATypeTakingClass&lt;T&gt;</span>(<wbr>)
+      <span class="name ">ATypeTakingClass&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/ATypeTakingClass/aMethodMaybeReturningVoid.html b/testing/test_package_docs/fake/ATypeTakingClass/aMethodMaybeReturningVoid.html
index b6fb10a807..78967fb7a7 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass/aMethodMaybeReturningVoid.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass/aMethodMaybeReturningVoid.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">aMethodMaybeReturningVoid method</li>
   </ol>
   <div class="self-name">aMethodMaybeReturningVoid</div>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass/hashCode.html b/testing/test_package_docs/fake/ATypeTakingClass/hashCode.html
index dfc64d5082..85a72ac7f9 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass/hashCode.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass/noSuchMethod.html b/testing/test_package_docs/fake/ATypeTakingClass/noSuchMethod.html
index 8aaeee5c7c..02395544b4 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass/noSuchMethod.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass/operator_equals.html b/testing/test_package_docs/fake/ATypeTakingClass/operator_equals.html
index af92cc3b4f..1b09522a1b 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass/operator_equals.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass/runtimeType.html b/testing/test_package_docs/fake/ATypeTakingClass/runtimeType.html
index 6e7510b364..9a70063cae 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass/runtimeType.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass/toString.html b/testing/test_package_docs/fake/ATypeTakingClass/toString.html
index 57ae725a64..e2e9c17503 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass/toString.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html b/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
index dccae38c4f..22df7bcbcb 100644
--- a/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
+++ b/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
@@ -169,7 +169,7 @@ <h1>ATypeTakingClassMixedIn class</h1>
 
         <dt>Mixes-in</dt>
         <dd><ul class="comma-separated clazz-relationships">
-          <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;void&gt;</span></li>
+          <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></li>
         </ul></dd>
 
 
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
index d90e552f23..1e45ac62dc 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
@@ -212,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetterImplicitSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;int&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>
         </dt>
         <dd>
           Getter doc for explicitGetterImplicitSetter
@@ -236,7 +236,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitSetter.html">explicitSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;int&gt;</span></span></span>)</span></span>
+          <span class="signature">&#8592; <span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span></span>)</span></span>
         </dt>
         <dd>
           Set to <code>f</code>, and don't warn about <code>bar</code> or <code>baz</code>.
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
index 2b8edd4d74..79b6880b9f 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
@@ -80,7 +80,7 @@ <h1>explicitGetterImplicitSetter property</h1>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype">List<span class="signature">&lt;int&gt;</span></span>
+          <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>
           <span class="name ">explicitGetterImplicitSetter</span>
   
 </section>
@@ -96,7 +96,7 @@ <h1>explicitGetterImplicitSetter property</h1>
         <section class="multi-line-signature">
           <span class="returntype">void</span>
             <span class="name ">explicitGetterImplicitSetter=</span>
-<span class="signature">(<wbr><span class="parameter" id="explicitGetterImplicitSetter=-param-_explicitGetterImplicitSetter"><span class="type-annotation">List<span class="signature">&lt;int&gt;</span></span> <span class="parameter-name">_explicitGetterImplicitSetter</span></span>)</span>
+<span class="signature">(<wbr><span class="parameter" id="explicitGetterImplicitSetter=-param-_explicitGetterImplicitSetter"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span> <span class="parameter-name">_explicitGetterImplicitSetter</span></span>)</span>
           <div class="features">inherited</div>
 </section>
         
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
index 2a0ed300ce..7530b11dcc 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
@@ -83,7 +83,7 @@ <h1>explicitSetter property</h1>
         <section class="multi-line-signature">
           <span class="returntype">void</span>
             <span class="name ">explicitSetter=</span>
-<span class="signature">(<wbr><span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span> <span class="parameter-name">bar</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">baz</span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;int&gt;</span></span> <span class="parameter-name">macTruck</span></span>)</span>)</span>
+<span class="signature">(<wbr><span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span> <span class="parameter-name">bar</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">baz</span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span> <span class="parameter-name">macTruck</span></span>)</span>)</span>
           
 </section>
         
diff --git a/testing/test_package_docs/fake/Color-class.html b/testing/test_package_docs/fake/Color-class.html
index f932585f0b..6f2b12d53d 100644
--- a/testing/test_package_docs/fake/Color-class.html
+++ b/testing/test_package_docs/fake/Color-class.html
@@ -224,13 +224,13 @@ <h2>Constants</h2>
         </dd>
         <dt id="values" class="constant">
           <span class="name ">values</span>
-          <span class="signature">&#8594; const List<span class="signature">&lt;<a href="fake/Color-class.html">Color</a>&gt;</span></span>
+          <span class="signature">&#8594; const List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="fake/Color-class.html">Color</a></span>&gt;</span></span>
         </dt>
         <dd>
           <p>A constant List of the values in this enum, in order of their declaration.</p>
           
   <div>
-            <span class="signature"><code>const List&lt;Color&gt;</code></span>
+            <span class="signature"><code>const List&lt;<wbr><span class="type-parameter">Color</span>&gt;</code></span>
           </div>
         </dd>
         <dt id="VIOLET" class="constant">
diff --git a/testing/test_package_docs/fake/ConstructorTester-class.html b/testing/test_package_docs/fake/ConstructorTester-class.html
index acd3c82fbc..68eebe5356 100644
--- a/testing/test_package_docs/fake/ConstructorTester-class.html
+++ b/testing/test_package_docs/fake/ConstructorTester-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">ConstructorTester<span class="signature">&lt;A, B&gt;</span> class</li>
+    <li class="self-crumb">ConstructorTester<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">ConstructorTester</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ConstructorTester&lt;A, B&gt; class</h1>
+    <h1>ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt; class</h1>
 
     
 
diff --git a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html
index 040bb2e4c0..2dc82402dd 100644
--- a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html
+++ b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">ConstructorTester.fromSomething constructor</li>
   </ol>
   <div class="self-name">ConstructorTester.fromSomething</div>
@@ -62,11 +62,11 @@ <h5>ConstructorTester class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ConstructorTester&lt;A, B&gt;.fromSomething constructor</h1>
+    <h1>ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;.fromSomething constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">ConstructorTester&lt;A, B&gt;.fromSomething</span>(<wbr><span class="parameter" id="fromSomething-param-foo"><span class="type-annotation">A</span> <span class="parameter-name">foo</span></span>)
+      <span class="name ">ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;.fromSomething</span>(<wbr><span class="parameter" id="fromSomething-param-foo"><span class="type-annotation">A</span> <span class="parameter-name">foo</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html
index ce2deb1297..4aa68af6fc 100644
--- a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html
+++ b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">ConstructorTester constructor</li>
   </ol>
   <div class="self-name">ConstructorTester</div>
@@ -62,11 +62,11 @@ <h5>ConstructorTester class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ConstructorTester&lt;A, B&gt; constructor</h1>
+    <h1>ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">ConstructorTester&lt;A, B&gt;</span>(<wbr><span class="parameter" id="-param-param1"><span class="type-annotation">String</span> <span class="parameter-name">param1</span></span>)
+      <span class="name ">ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span>(<wbr><span class="parameter" id="-param-param1"><span class="type-annotation">String</span> <span class="parameter-name">param1</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/ConstructorTester/hashCode.html b/testing/test_package_docs/fake/ConstructorTester/hashCode.html
index 5a53e6da9c..b903835e3a 100644
--- a/testing/test_package_docs/fake/ConstructorTester/hashCode.html
+++ b/testing/test_package_docs/fake/ConstructorTester/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html b/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html
index 962da9f94c..3f9d94d67b 100644
--- a/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html
+++ b/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/ConstructorTester/operator_equals.html b/testing/test_package_docs/fake/ConstructorTester/operator_equals.html
index 1ad1d30f38..a690bf2374 100644
--- a/testing/test_package_docs/fake/ConstructorTester/operator_equals.html
+++ b/testing/test_package_docs/fake/ConstructorTester/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/ConstructorTester/runtimeType.html b/testing/test_package_docs/fake/ConstructorTester/runtimeType.html
index 76929d7ad9..b3d7fed9a5 100644
--- a/testing/test_package_docs/fake/ConstructorTester/runtimeType.html
+++ b/testing/test_package_docs/fake/ConstructorTester/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/ConstructorTester/toString.html b/testing/test_package_docs/fake/ConstructorTester/toString.html
index a552f64c53..499b861623 100644
--- a/testing/test_package_docs/fake/ConstructorTester/toString.html
+++ b/testing/test_package_docs/fake/ConstructorTester/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
index 5e5bc6f3fa..0b92e66008 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
@@ -165,7 +165,7 @@ <h1>ExtendsFutureVoid class</h1>
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li>Future<span class="signature">&lt;void&gt;</span></li>
+          <li>Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></li>
           <li>ExtendsFutureVoid</li>
         </ul></dd>
 
@@ -180,7 +180,7 @@ <h2>Constructors</h2>
 
       <dl class="constructor-summary-list">
         <dt id="ExtendsFutureVoid" class="callable">
-          <span class="name"><a href="fake/ExtendsFutureVoid/ExtendsFutureVoid.html">ExtendsFutureVoid</a></span><span class="signature">(<span class="parameter" id="-param-computation"><span class="type-annotation">FutureOr<span class="signature">&lt;void&gt;</span></span> <span class="parameter-name">computation</span>()</span>)</span>
+          <span class="name"><a href="fake/ExtendsFutureVoid/ExtendsFutureVoid.html">ExtendsFutureVoid</a></span><span class="signature">(<span class="parameter" id="-param-computation"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">computation</span>()</span>)</span>
         </dt>
         <dd>
           
@@ -217,7 +217,7 @@ <h2>Methods</h2>
       <dl class="callables">
         <dt id="asStream" class="callable inherited">
           <span class="name"><a href="fake/ExtendsFutureVoid/asStream.html">asStream</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Stream<span class="signature">&lt;void&gt;</span></span>
+            <span class="returntype parameter">&#8594; Stream<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -226,7 +226,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="catchError" class="callable inherited">
           <span class="name"><a href="fake/ExtendsFutureVoid/catchError.html">catchError</a></span><span class="signature">(<wbr><span class="parameter" id="catchError-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span>, {</span> <span class="parameter" id="catchError-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-error"><span class="type-annotation">Object</span> <span class="parameter-name">error</span></span>)</span> })
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;void&gt;</span></span>
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -243,8 +243,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="then" class="callable inherited">
-          <span class="name"><a href="fake/ExtendsFutureVoid/then.html">then</a></span><span class="signature">&lt;S&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;S&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;S&gt;</span></span>
+          <span class="name"><a href="fake/ExtendsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -252,8 +252,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="timeout" class="callable inherited">
-          <span class="name"><a href="fake/ExtendsFutureVoid/timeout.html">timeout</a></span><span class="signature">(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;void&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;void&gt;</span></span>
+          <span class="name"><a href="fake/ExtendsFutureVoid/timeout.html">timeout</a></span><span class="signature">(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -271,7 +271,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="whenComplete" class="callable inherited">
           <span class="name"><a href="fake/ExtendsFutureVoid/whenComplete.html">whenComplete</a></span><span class="signature">(<wbr><span class="parameter" id="whenComplete-param-action"><span class="type-annotation">FutureOr</span> <span class="parameter-name">action</span>()</span>)
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;void&gt;</span></span>
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid/ExtendsFutureVoid.html b/testing/test_package_docs/fake/ExtendsFutureVoid/ExtendsFutureVoid.html
index 63f08025f4..e01f90e0ad 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid/ExtendsFutureVoid.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid/ExtendsFutureVoid.html
@@ -70,7 +70,7 @@ <h1>ExtendsFutureVoid constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">ExtendsFutureVoid</span>(<wbr><span class="parameter" id="-param-computation"><span class="type-annotation">FutureOr<span class="signature">&lt;void&gt;</span></span> <span class="parameter-name">computation</span>()</span>)
+      <span class="name ">ExtendsFutureVoid</span>(<wbr><span class="parameter" id="-param-computation"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">computation</span>()</span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid/asStream.html b/testing/test_package_docs/fake/ExtendsFutureVoid/asStream.html
index a1de8cdaa5..2a3d433143 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid/asStream.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid/asStream.html
@@ -69,7 +69,7 @@ <h5>ExtendsFutureVoid class</h5>
     <h1>asStream method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Stream<span class="signature">&lt;void&gt;</span></span>
+      <span class="returntype">Stream<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
       <span class="name ">asStream</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid/catchError.html b/testing/test_package_docs/fake/ExtendsFutureVoid/catchError.html
index 3ca3eb9bee..3217c3fc16 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid/catchError.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid/catchError.html
@@ -69,7 +69,7 @@ <h5>ExtendsFutureVoid class</h5>
     <h1>catchError method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;void&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
       <span class="name ">catchError</span>
 (<wbr><span class="parameter" id="catchError-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span>, {</span> <span class="parameter" id="catchError-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-error"><span class="type-annotation">Object</span> <span class="parameter-name">error</span></span>)</span> })
     </section>
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid/then.html b/testing/test_package_docs/fake/ExtendsFutureVoid/then.html
index 6c6646dc87..8c81e1e7be 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid/then.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid/then.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
-    <li class="self-crumb">then&lt;S&gt; abstract method</li>
+    <li class="self-crumb">then&lt;<wbr><span class="type-parameter">S</span>&gt; abstract method</li>
   </ol>
   <div class="self-name">then</div>
   <form class="search navbar-right" role="search">
@@ -66,12 +66,12 @@ <h5>ExtendsFutureVoid class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>then&lt;S&gt; method</h1>
+    <h1>then&lt;<wbr><span class="type-parameter">S</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;S&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
       <span class="name ">then</span>
-&lt;S&gt;(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;S&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
+&lt;<wbr><span class="type-parameter">S</span>&gt;(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
     </section>
     
     
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid/timeout.html b/testing/test_package_docs/fake/ExtendsFutureVoid/timeout.html
index b65ca9f588..1bb496d5eb 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid/timeout.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid/timeout.html
@@ -69,9 +69,9 @@ <h5>ExtendsFutureVoid class</h5>
     <h1>timeout method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;void&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
       <span class="name ">timeout</span>
-(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;void&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
+(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
     </section>
     
     
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid/whenComplete.html b/testing/test_package_docs/fake/ExtendsFutureVoid/whenComplete.html
index 23bc801a02..8946735397 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid/whenComplete.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid/whenComplete.html
@@ -69,7 +69,7 @@ <h5>ExtendsFutureVoid class</h5>
     <h1>whenComplete method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;void&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
       <span class="name ">whenComplete</span>
 (<wbr><span class="parameter" id="whenComplete-param-action"><span class="type-annotation">FutureOr</span> <span class="parameter-name">action</span>()</span>)
     </section>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index 136a565583..155f15e4c5 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">ExtraSpecialList<span class="signature">&lt;E&gt;</span> class</li>
+    <li class="self-crumb">ExtraSpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">ExtraSpecialList</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtraSpecialList&lt;E&gt; class</h1>
+    <h1>ExtraSpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class</h1>
 
     <section class="desc markdown">
       <p>This inherits operators.</p>
@@ -165,7 +165,7 @@ <h1>ExtraSpecialList&lt;E&gt; class</h1>
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li>ListBase<span class="signature">&lt;E&gt;</span></li>
+          <li>ListBase<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></li>
           <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
           <li>ExtraSpecialList</li>
         </ul></dd>
@@ -308,7 +308,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="asMap" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/asMap.html">asMap</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Map<span class="signature">&lt;int, dynamic&gt;</span></span>
+            <span class="returntype parameter">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">dynamic</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -316,8 +316,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="cast" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/cast.html">cast</a></span><span class="signature">&lt;R&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;R&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/cast.html">cast</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -361,8 +361,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="expand" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;T&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;T&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -388,7 +388,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="fold" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+          <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
         </dt>
@@ -496,8 +496,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="map" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;T&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -586,8 +586,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="retype" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/retype.html">retype</a></span><span class="signature">&lt;R&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;R&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/retype.html">retype</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -721,8 +721,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="whereType" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/whereType.html">whereType</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;T&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/whereType.html">whereType</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
diff --git a/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html b/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
index b86323460c..730f34b0c0 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">ExtraSpecialList constructor</li>
   </ol>
   <div class="self-name">ExtraSpecialList</div>
@@ -120,11 +120,11 @@ <h5>ExtraSpecialList class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtraSpecialList&lt;E&gt; constructor</h1>
+    <h1>ExtraSpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">ExtraSpecialList&lt;E&gt;</span>(<wbr>)
+      <span class="name ">ExtraSpecialList&lt;<wbr><span class="type-parameter">E</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/GenericTypedef.html b/testing/test_package_docs/fake/GenericTypedef.html
index 379f500188..4596df4a2e 100644
--- a/testing/test_package_docs/fake/GenericTypedef.html
+++ b/testing/test_package_docs/fake/GenericTypedef.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">GenericTypedef&lt;T&gt; typedef</li>
+    <li class="self-crumb">GenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</li>
   </ol>
   <div class="self-name">GenericTypedef</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>GenericTypedef&lt;T&gt; typedef</h1>
+    <h1>GenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">T</span>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends-class.html b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
index 489b565109..5fa2a704c2 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends-class.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">HasGenericWithExtends<span class="signature">&lt;T extends <a href="fake/Foo2-class.html">Foo2</a>&gt;</span> class</li>
+    <li class="self-crumb">HasGenericWithExtends<span class="signature">&lt;<wbr><span class="type-parameter">T extends <a href="fake/Foo2-class.html">Foo2</a></span>&gt;</span> class</li>
   </ol>
   <div class="self-name">HasGenericWithExtends</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasGenericWithExtends&lt;T extends Foo2&gt; class</h1>
+    <h1>HasGenericWithExtends&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt; class</h1>
 
     <section class="desc markdown">
       <p>I have a generic and it extends <a href="fake/Foo2-class.html">Foo2</a></p>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html b/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
index a248ed07d3..56694b43f9 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt;</span></a></li>
     <li class="self-crumb">HasGenericWithExtends constructor</li>
   </ol>
   <div class="self-name">HasGenericWithExtends</div>
@@ -61,11 +61,11 @@ <h5>HasGenericWithExtends class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasGenericWithExtends&lt;T extends Foo2&gt; constructor</h1>
+    <h1>HasGenericWithExtends&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">HasGenericWithExtends&lt;T extends Foo2&gt;</span>(<wbr>)
+      <span class="name ">HasGenericWithExtends&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html b/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
index 9895c38fe6..0789db8043 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html b/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html
index 9afb859fb8..e75e339006 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html b/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html
index 9319bace68..67364cee17 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html b/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
index 3286d06d5d..e71e7adc30 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/toString.html b/testing/test_package_docs/fake/HasGenericWithExtends/toString.html
index c4334fffd0..0b2e991399 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/toString.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/HasGenerics-class.html b/testing/test_package_docs/fake/HasGenerics-class.html
index a08115d39d..693bbf94f2 100644
--- a/testing/test_package_docs/fake/HasGenerics-class.html
+++ b/testing/test_package_docs/fake/HasGenerics-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span> class</li>
+    <li class="self-crumb">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">HasGenerics</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasGenerics&lt;X, Y, Z&gt; class</h1>
+    <h1>HasGenerics&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt; class</h1>
 
     
 
@@ -199,7 +199,7 @@ <h2>Methods</h2>
       <dl class="callables">
         <dt id="convertToMap" class="callable">
           <span class="name"><a href="fake/HasGenerics/convertToMap.html">convertToMap</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Map<span class="signature">&lt;X, Y&gt;</span></span>
+            <span class="returntype parameter">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>&gt;</span></span>
           </span>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/fake/HasGenerics/HasGenerics.html b/testing/test_package_docs/fake/HasGenerics/HasGenerics.html
index 91481faafb..8edaa7b6d9 100644
--- a/testing/test_package_docs/fake/HasGenerics/HasGenerics.html
+++ b/testing/test_package_docs/fake/HasGenerics/HasGenerics.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">HasGenerics constructor</li>
   </ol>
   <div class="self-name">HasGenerics</div>
@@ -65,11 +65,11 @@ <h5>HasGenerics class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasGenerics&lt;X, Y, Z&gt; constructor</h1>
+    <h1>HasGenerics&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">HasGenerics&lt;X, Y, Z&gt;</span>(<wbr><span class="parameter" id="-param-x"><span class="type-annotation">X</span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="-param-y"><span class="type-annotation">Y</span> <span class="parameter-name">y</span>, </span> <span class="parameter" id="-param-z"><span class="type-annotation">Z</span> <span class="parameter-name">z</span></span>)
+      <span class="name ">HasGenerics&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span>(<wbr><span class="parameter" id="-param-x"><span class="type-annotation">X</span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="-param-y"><span class="type-annotation">Y</span> <span class="parameter-name">y</span>, </span> <span class="parameter" id="-param-z"><span class="type-annotation">Z</span> <span class="parameter-name">z</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/HasGenerics/convertToMap.html b/testing/test_package_docs/fake/HasGenerics/convertToMap.html
index bb9003c482..7f9f261874 100644
--- a/testing/test_package_docs/fake/HasGenerics/convertToMap.html
+++ b/testing/test_package_docs/fake/HasGenerics/convertToMap.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">convertToMap method</li>
   </ol>
   <div class="self-name">convertToMap</div>
@@ -68,7 +68,7 @@ <h5>HasGenerics class</h5>
     <h1>convertToMap method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Map<span class="signature">&lt;X, Y&gt;</span></span>
+      <span class="returntype">Map<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>&gt;</span></span>
       <span class="name ">convertToMap</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/fake/HasGenerics/doStuff.html b/testing/test_package_docs/fake/HasGenerics/doStuff.html
index 7fc720b2b9..4cc12bbd54 100644
--- a/testing/test_package_docs/fake/HasGenerics/doStuff.html
+++ b/testing/test_package_docs/fake/HasGenerics/doStuff.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">doStuff method</li>
   </ol>
   <div class="self-name">doStuff</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/hashCode.html b/testing/test_package_docs/fake/HasGenerics/hashCode.html
index 4390f5d913..5521531cd6 100644
--- a/testing/test_package_docs/fake/HasGenerics/hashCode.html
+++ b/testing/test_package_docs/fake/HasGenerics/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html b/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html
index f1d2c17622..04db911bb8 100644
--- a/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html
+++ b/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/operator_equals.html b/testing/test_package_docs/fake/HasGenerics/operator_equals.html
index 42f17727d8..53139cf182 100644
--- a/testing/test_package_docs/fake/HasGenerics/operator_equals.html
+++ b/testing/test_package_docs/fake/HasGenerics/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/returnX.html b/testing/test_package_docs/fake/HasGenerics/returnX.html
index 78a6f9f146..6298f9db7b 100644
--- a/testing/test_package_docs/fake/HasGenerics/returnX.html
+++ b/testing/test_package_docs/fake/HasGenerics/returnX.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">returnX method</li>
   </ol>
   <div class="self-name">returnX</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/returnZ.html b/testing/test_package_docs/fake/HasGenerics/returnZ.html
index 56b83b57c5..78075163fb 100644
--- a/testing/test_package_docs/fake/HasGenerics/returnZ.html
+++ b/testing/test_package_docs/fake/HasGenerics/returnZ.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">returnZ method</li>
   </ol>
   <div class="self-name">returnZ</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/runtimeType.html b/testing/test_package_docs/fake/HasGenerics/runtimeType.html
index b8e1383db6..b4ffefdf8d 100644
--- a/testing/test_package_docs/fake/HasGenerics/runtimeType.html
+++ b/testing/test_package_docs/fake/HasGenerics/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/toString.html b/testing/test_package_docs/fake/HasGenerics/toString.html
index 91bf106f25..a013872dcb 100644
--- a/testing/test_package_docs/fake/HasGenerics/toString.html
+++ b/testing/test_package_docs/fake/HasGenerics/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
index aa11bff557..2daf6b746b 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
@@ -166,7 +166,7 @@ <h1>ImplementsFutureVoid class</h1>
         <dt>Implements</dt>
         <dd>
           <ul class="comma-separated clazz-relationships">
-            <li>Future<span class="signature">&lt;void&gt;</span></li>
+            <li>Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></li>
           </ul>
         </dd>
 
@@ -216,7 +216,7 @@ <h2>Methods</h2>
       <dl class="callables">
         <dt id="asStream" class="callable inherited">
           <span class="name"><a href="fake/ImplementsFutureVoid/asStream.html">asStream</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Stream<span class="signature">&lt;void&gt;</span></span>
+            <span class="returntype parameter">&#8594; Stream<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -225,7 +225,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="catchError" class="callable inherited">
           <span class="name"><a href="fake/ImplementsFutureVoid/catchError.html">catchError</a></span><span class="signature">(<wbr><span class="parameter" id="catchError-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span>, {</span> <span class="parameter" id="catchError-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-error"><span class="type-annotation">Object</span> <span class="parameter-name">error</span></span>)</span> })
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;void&gt;</span></span>
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -242,8 +242,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="then" class="callable inherited">
-          <span class="name"><a href="fake/ImplementsFutureVoid/then.html">then</a></span><span class="signature">&lt;S&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;S&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;S&gt;</span></span>
+          <span class="name"><a href="fake/ImplementsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -251,8 +251,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="timeout" class="callable inherited">
-          <span class="name"><a href="fake/ImplementsFutureVoid/timeout.html">timeout</a></span><span class="signature">(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;void&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;void&gt;</span></span>
+          <span class="name"><a href="fake/ImplementsFutureVoid/timeout.html">timeout</a></span><span class="signature">(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -270,7 +270,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="whenComplete" class="callable inherited">
           <span class="name"><a href="fake/ImplementsFutureVoid/whenComplete.html">whenComplete</a></span><span class="signature">(<wbr><span class="parameter" id="whenComplete-param-action"><span class="type-annotation">FutureOr</span> <span class="parameter-name">action</span>()</span>)
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;void&gt;</span></span>
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid/asStream.html b/testing/test_package_docs/fake/ImplementsFutureVoid/asStream.html
index 770b07d2c3..f74609b03c 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid/asStream.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid/asStream.html
@@ -69,7 +69,7 @@ <h5>ImplementsFutureVoid class</h5>
     <h1>asStream method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Stream<span class="signature">&lt;void&gt;</span></span>
+      <span class="returntype">Stream<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
       <span class="name ">asStream</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid/catchError.html b/testing/test_package_docs/fake/ImplementsFutureVoid/catchError.html
index aae715018f..7797ff3480 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid/catchError.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid/catchError.html
@@ -69,7 +69,7 @@ <h5>ImplementsFutureVoid class</h5>
     <h1>catchError method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;void&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
       <span class="name ">catchError</span>
 (<wbr><span class="parameter" id="catchError-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span>, {</span> <span class="parameter" id="catchError-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-error"><span class="type-annotation">Object</span> <span class="parameter-name">error</span></span>)</span> })
     </section>
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid/then.html b/testing/test_package_docs/fake/ImplementsFutureVoid/then.html
index 38d7d20d9b..51db5a729e 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid/then.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid/then.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
-    <li class="self-crumb">then&lt;S&gt; abstract method</li>
+    <li class="self-crumb">then&lt;<wbr><span class="type-parameter">S</span>&gt; abstract method</li>
   </ol>
   <div class="self-name">then</div>
   <form class="search navbar-right" role="search">
@@ -66,12 +66,12 @@ <h5>ImplementsFutureVoid class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>then&lt;S&gt; method</h1>
+    <h1>then&lt;<wbr><span class="type-parameter">S</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;S&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
       <span class="name ">then</span>
-&lt;S&gt;(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;S&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
+&lt;<wbr><span class="type-parameter">S</span>&gt;(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
     </section>
     
     
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid/timeout.html b/testing/test_package_docs/fake/ImplementsFutureVoid/timeout.html
index 2bafec77d6..0d800b5a72 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid/timeout.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid/timeout.html
@@ -69,9 +69,9 @@ <h5>ImplementsFutureVoid class</h5>
     <h1>timeout method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;void&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
       <span class="name ">timeout</span>
-(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;void&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
+(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
     </section>
     
     
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid/whenComplete.html b/testing/test_package_docs/fake/ImplementsFutureVoid/whenComplete.html
index d2fc201a03..3647e569f1 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid/whenComplete.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid/whenComplete.html
@@ -69,7 +69,7 @@ <h5>ImplementsFutureVoid class</h5>
     <h1>whenComplete method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;void&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
       <span class="name ">whenComplete</span>
 (<wbr><span class="parameter" id="whenComplete-param-action"><span class="type-annotation">FutureOr</span> <span class="parameter-name">action</span>()</span>)
     </section>
diff --git a/testing/test_package_docs/fake/ImplicitProperties-class.html b/testing/test_package_docs/fake/ImplicitProperties-class.html
index f0d470b427..6929d33929 100644
--- a/testing/test_package_docs/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs/fake/ImplicitProperties-class.html
@@ -193,7 +193,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="explicitGetterImplicitSetter" class="property">
           <span class="name"><a href="fake/ImplicitProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;int&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>
         </dt>
         <dd>
           Docs for explicitGetterImplicitSetter from ImplicitProperties.
diff --git a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
index 49882fd36f..5f2a92b946 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
@@ -69,7 +69,7 @@ <h5>ImplicitProperties class</h5>
     <h1>explicitGetterImplicitSetter property</h1>
 
         <section class="multi-line-signature">
-          <span class="returntype">List<span class="signature">&lt;int&gt;</span></span>
+          <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>
           <span class="name ">explicitGetterImplicitSetter</span>
           <div class="features">read / write</div>
         </section>
diff --git a/testing/test_package_docs/fake/LongFirstLine-class.html b/testing/test_package_docs/fake/LongFirstLine-class.html
index 35b5e04af3..41861d8069 100644
--- a/testing/test_package_docs/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs/fake/LongFirstLine-class.html
@@ -255,7 +255,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="powers" class="property inherited">
           <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;String&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
         </dt>
         <dd class="inherited">
           In the super class.
diff --git a/testing/test_package_docs/fake/MIEEBase-class.html b/testing/test_package_docs/fake/MIEEBase-class.html
index dabb529e7f..5a9883bb3d 100644
--- a/testing/test_package_docs/fake/MIEEBase-class.html
+++ b/testing/test_package_docs/fake/MIEEBase-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">MIEEBase<span class="signature">&lt;K, V&gt;</span> abstract class</li>
+    <li class="self-crumb">MIEEBase<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span> abstract class</li>
   </ol>
   <div class="self-name">MIEEBase</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEBase&lt;K, V&gt; class</h1>
+    <h1>MIEEBase&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
 
     
     <section>
@@ -162,7 +162,7 @@ <h1>MIEEBase&lt;K, V&gt; class</h1>
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;K, V&gt;</span></li>
+          <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></li>
           <li>MIEEBase</li>
         </ul></dd>
 
diff --git a/testing/test_package_docs/fake/MIEEBase/MIEEBase.html b/testing/test_package_docs/fake/MIEEBase/MIEEBase.html
index 1d781a67d3..6b7c4db1ed 100644
--- a/testing/test_package_docs/fake/MIEEBase/MIEEBase.html
+++ b/testing/test_package_docs/fake/MIEEBase/MIEEBase.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEBase-class.html">MIEEBase<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEBase-class.html">MIEEBase<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">MIEEBase constructor</li>
   </ol>
   <div class="self-name">MIEEBase</div>
@@ -62,11 +62,11 @@ <h5>MIEEBase class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEBase&lt;K, V&gt; constructor</h1>
+    <h1>MIEEBase&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">MIEEBase&lt;K, V&gt;</span>(<wbr>)
+      <span class="name ">MIEEBase&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/MIEEMixin-class.html b/testing/test_package_docs/fake/MIEEMixin-class.html
index d1a3c7ed39..a3cfdf5195 100644
--- a/testing/test_package_docs/fake/MIEEMixin-class.html
+++ b/testing/test_package_docs/fake/MIEEMixin-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">MIEEMixin<span class="signature">&lt;K, V&gt;</span> abstract class</li>
+    <li class="self-crumb">MIEEMixin<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span> abstract class</li>
   </ol>
   <div class="self-name">MIEEMixin</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEMixin&lt;K, V&gt; class</h1>
+    <h1>MIEEMixin&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
 
     
     <section>
@@ -163,7 +163,7 @@ <h1>MIEEMixin&lt;K, V&gt; class</h1>
         <dt>Implements</dt>
         <dd>
           <ul class="comma-separated clazz-relationships">
-            <li><a href="fake/MIEEThing-class.html">MIEEThing</a><span class="signature">&lt;K, V&gt;</span></li>
+            <li><a href="fake/MIEEThing-class.html">MIEEThing</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></li>
           </ul>
         </dd>
 
diff --git a/testing/test_package_docs/fake/MIEEMixin/MIEEMixin.html b/testing/test_package_docs/fake/MIEEMixin/MIEEMixin.html
index 8735cb7853..694a580744 100644
--- a/testing/test_package_docs/fake/MIEEMixin/MIEEMixin.html
+++ b/testing/test_package_docs/fake/MIEEMixin/MIEEMixin.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEMixin-class.html">MIEEMixin<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEMixin-class.html">MIEEMixin<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">MIEEMixin constructor</li>
   </ol>
   <div class="self-name">MIEEMixin</div>
@@ -62,11 +62,11 @@ <h5>MIEEMixin class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEMixin&lt;K, V&gt; constructor</h1>
+    <h1>MIEEMixin&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">MIEEMixin&lt;K, V&gt;</span>(<wbr>)
+      <span class="name ">MIEEMixin&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/MIEEMixin/operator_put.html b/testing/test_package_docs/fake/MIEEMixin/operator_put.html
index c07c525d40..0760d0cbbe 100644
--- a/testing/test_package_docs/fake/MIEEMixin/operator_put.html
+++ b/testing/test_package_docs/fake/MIEEMixin/operator_put.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEMixin-class.html">MIEEMixin<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEMixin-class.html">MIEEMixin<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">operator []= abstract method</li>
   </ol>
   <div class="self-name">operator []=</div>
diff --git a/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html b/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
index 1aed898e93..cae76187f9 100644
--- a/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
+++ b/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">MIEEMixinWithOverride<span class="signature">&lt;K, V&gt;</span> abstract class</li>
+    <li class="self-crumb">MIEEMixinWithOverride<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span> abstract class</li>
   </ol>
   <div class="self-name">MIEEMixinWithOverride</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEMixinWithOverride&lt;K, V&gt; class</h1>
+    <h1>MIEEMixinWithOverride&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
 
     <section class="desc markdown">
       <p>Test an edge case for cases where inherited ExecutableElements can come
@@ -167,8 +167,8 @@ <h1>MIEEMixinWithOverride&lt;K, V&gt; class</h1>
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;K, V&gt;</span></li>
-          <li><a href="fake/MIEEBase-class.html">MIEEBase</a><span class="signature">&lt;K, V&gt;</span></li>
+          <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></li>
+          <li><a href="fake/MIEEBase-class.html">MIEEBase</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></li>
           <li>MIEEMixinWithOverride</li>
         </ul></dd>
 
diff --git a/testing/test_package_docs/fake/MIEEMixinWithOverride/MIEEMixinWithOverride.html b/testing/test_package_docs/fake/MIEEMixinWithOverride/MIEEMixinWithOverride.html
index b3c58f9348..94b262c456 100644
--- a/testing/test_package_docs/fake/MIEEMixinWithOverride/MIEEMixinWithOverride.html
+++ b/testing/test_package_docs/fake/MIEEMixinWithOverride/MIEEMixinWithOverride.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">MIEEMixinWithOverride constructor</li>
   </ol>
   <div class="self-name">MIEEMixinWithOverride</div>
@@ -62,11 +62,11 @@ <h5>MIEEMixinWithOverride class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEMixinWithOverride&lt;K, V&gt; constructor</h1>
+    <h1>MIEEMixinWithOverride&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">MIEEMixinWithOverride&lt;K, V&gt;</span>(<wbr>)
+      <span class="name ">MIEEMixinWithOverride&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/MIEEMixinWithOverride/operator_put.html b/testing/test_package_docs/fake/MIEEMixinWithOverride/operator_put.html
index b584f6d6c5..f2895c6bc3 100644
--- a/testing/test_package_docs/fake/MIEEMixinWithOverride/operator_put.html
+++ b/testing/test_package_docs/fake/MIEEMixinWithOverride/operator_put.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">operator []= method</li>
   </ol>
   <div class="self-name">operator []=</div>
diff --git a/testing/test_package_docs/fake/MIEEThing-class.html b/testing/test_package_docs/fake/MIEEThing-class.html
index 3178eb1546..4376adf33f 100644
--- a/testing/test_package_docs/fake/MIEEThing-class.html
+++ b/testing/test_package_docs/fake/MIEEThing-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">MIEEThing<span class="signature">&lt;K, V&gt;</span> abstract class</li>
+    <li class="self-crumb">MIEEThing<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span> abstract class</li>
   </ol>
   <div class="self-name">MIEEThing</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEThing&lt;K, V&gt; class</h1>
+    <h1>MIEEThing&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
 
     
     <section>
diff --git a/testing/test_package_docs/fake/MIEEThing/MIEEThing.html b/testing/test_package_docs/fake/MIEEThing/MIEEThing.html
index c3669ef499..6a196b6f07 100644
--- a/testing/test_package_docs/fake/MIEEThing/MIEEThing.html
+++ b/testing/test_package_docs/fake/MIEEThing/MIEEThing.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">MIEEThing constructor</li>
   </ol>
   <div class="self-name">MIEEThing</div>
@@ -62,11 +62,11 @@ <h5>MIEEThing class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEThing&lt;K, V&gt; constructor</h1>
+    <h1>MIEEThing&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">MIEEThing&lt;K, V&gt;</span>(<wbr>)
+      <span class="name ">MIEEThing&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/MIEEThing/hashCode.html b/testing/test_package_docs/fake/MIEEThing/hashCode.html
index 6fe0bde37b..b2522fa380 100644
--- a/testing/test_package_docs/fake/MIEEThing/hashCode.html
+++ b/testing/test_package_docs/fake/MIEEThing/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/MIEEThing/noSuchMethod.html b/testing/test_package_docs/fake/MIEEThing/noSuchMethod.html
index d8dd5f31e9..94e0dbcd8e 100644
--- a/testing/test_package_docs/fake/MIEEThing/noSuchMethod.html
+++ b/testing/test_package_docs/fake/MIEEThing/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/MIEEThing/operator_equals.html b/testing/test_package_docs/fake/MIEEThing/operator_equals.html
index 36fe354618..107d6b27ac 100644
--- a/testing/test_package_docs/fake/MIEEThing/operator_equals.html
+++ b/testing/test_package_docs/fake/MIEEThing/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/MIEEThing/operator_put.html b/testing/test_package_docs/fake/MIEEThing/operator_put.html
index ecf6530886..5be4b57acd 100644
--- a/testing/test_package_docs/fake/MIEEThing/operator_put.html
+++ b/testing/test_package_docs/fake/MIEEThing/operator_put.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">operator []= abstract method</li>
   </ol>
   <div class="self-name">operator []=</div>
diff --git a/testing/test_package_docs/fake/MIEEThing/runtimeType.html b/testing/test_package_docs/fake/MIEEThing/runtimeType.html
index 5b630bb90e..464e9af4f2 100644
--- a/testing/test_package_docs/fake/MIEEThing/runtimeType.html
+++ b/testing/test_package_docs/fake/MIEEThing/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/MIEEThing/toString.html b/testing/test_package_docs/fake/MIEEThing/toString.html
index dda14fcfa3..f5dc83d8dd 100644
--- a/testing/test_package_docs/fake/MIEEThing/toString.html
+++ b/testing/test_package_docs/fake/MIEEThing/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;K, V&gt;</span></a></li>
+    <li><a href="fake/MIEEThing-class.html">MIEEThing<span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/NewGenericTypedef.html b/testing/test_package_docs/fake/NewGenericTypedef.html
index b2b04fc647..7d0a177474 100644
--- a/testing/test_package_docs/fake/NewGenericTypedef.html
+++ b/testing/test_package_docs/fake/NewGenericTypedef.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">NewGenericTypedef&lt;T&gt; typedef</li>
+    <li class="self-crumb">NewGenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</li>
   </ol>
   <div class="self-name">NewGenericTypedef</div>
   <form class="search navbar-right" role="search">
@@ -154,12 +154,12 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>NewGenericTypedef&lt;T&gt; typedef</h1>
+    <h1>NewGenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
 
     <section class="multi-line-signature">
-        <span class="returntype">List<span class="signature">&lt;S&gt;</span></span>
+        <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
         <span class="name ">NewGenericTypedef</span>
-&lt;S&gt;(<wbr><span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">int</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">bool</span></span>)
+&lt;<wbr><span class="type-parameter">S</span>&gt;(<wbr><span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">int</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">bool</span></span>)
     </section>
 
     <section class="desc markdown">
diff --git a/testing/test_package_docs/fake/OtherGenericsThing-class.html b/testing/test_package_docs/fake/OtherGenericsThing-class.html
index 11516a67ef..185af64b30 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing-class.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">OtherGenericsThing<span class="signature">&lt;A&gt;</span> class</li>
+    <li class="self-crumb">OtherGenericsThing<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">OtherGenericsThing</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>OtherGenericsThing&lt;A&gt; class</h1>
+    <h1>OtherGenericsThing&lt;<wbr><span class="type-parameter">A</span>&gt; class</h1>
 
     
 
@@ -199,7 +199,7 @@ <h2>Methods</h2>
       <dl class="callables">
         <dt id="convert" class="callable">
           <span class="name"><a href="fake/OtherGenericsThing/convert.html">convert</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; <a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;A, <a href="fake/Cool-class.html">Cool</a>, String&gt;</span></span>
+            <span class="returntype parameter">&#8594; <a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter"><a href="fake/Cool-class.html">Cool</a></span>, <span class="type-parameter">String</span>&gt;</span></span>
           </span>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html b/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
index aa2d5c4b74..186d9d37b0 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">OtherGenericsThing constructor</li>
   </ol>
   <div class="self-name">OtherGenericsThing</div>
@@ -62,11 +62,11 @@ <h5>OtherGenericsThing class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>OtherGenericsThing&lt;A&gt; constructor</h1>
+    <h1>OtherGenericsThing&lt;<wbr><span class="type-parameter">A</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">OtherGenericsThing&lt;A&gt;</span>(<wbr>)
+      <span class="name ">OtherGenericsThing&lt;<wbr><span class="type-parameter">A</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/convert.html b/testing/test_package_docs/fake/OtherGenericsThing/convert.html
index 15159a9f5f..6cc7412278 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/convert.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/convert.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">convert method</li>
   </ol>
   <div class="self-name">convert</div>
@@ -65,7 +65,7 @@ <h5>OtherGenericsThing class</h5>
     <h1>convert method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype"><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;A, <a href="fake/Cool-class.html">Cool</a>, String&gt;</span></span>
+      <span class="returntype"><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter"><a href="fake/Cool-class.html">Cool</a></span>, <span class="type-parameter">String</span>&gt;</span></span>
       <span class="name ">convert</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html b/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
index eb27496b98..fe8de73782 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html b/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html
index dba3478d15..89b153526d 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html b/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html
index 680d60fc5e..a7e13328b2 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html b/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
index 9e7de59efd..0ee9520bcb 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/toString.html b/testing/test_package_docs/fake/OtherGenericsThing/toString.html
index 90333f3709..ab600fcc66 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/toString.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/SpecialList-class.html b/testing/test_package_docs/fake/SpecialList-class.html
index 5906f72c9f..3e9fbf32dc 100644
--- a/testing/test_package_docs/fake/SpecialList-class.html
+++ b/testing/test_package_docs/fake/SpecialList-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">SpecialList<span class="signature">&lt;E&gt;</span> class</li>
+    <li class="self-crumb">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">SpecialList</div>
   <form class="search navbar-right" role="search">
@@ -154,7 +154,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SpecialList&lt;E&gt; class</h1>
+    <h1>SpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class</h1>
 
     <section class="desc markdown">
       <p>Extends <code>ListBase</code></p>
@@ -165,7 +165,7 @@ <h1>SpecialList&lt;E&gt; class</h1>
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li>ListBase<span class="signature">&lt;E&gt;</span></li>
+          <li>ListBase<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></li>
           <li>SpecialList</li>
         </ul></dd>
 
@@ -238,7 +238,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="iterator" class="property inherited">
           <span class="name"><a href="fake/SpecialList/iterator.html">iterator</a></span>
-          <span class="signature">&#8594; Iterator<span class="signature">&lt;E&gt;</span></span>
+          <span class="signature">&#8594; Iterator<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
         </dt>
         <dd class="inherited">
           
@@ -254,7 +254,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="reversed" class="property inherited">
           <span class="name"><a href="fake/SpecialList/reversed.html">reversed</a></span>
-          <span class="signature">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
+          <span class="signature">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
         </dt>
         <dd class="inherited">
           
@@ -292,7 +292,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="addAll" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/addAll.html">addAll</a></span><span class="signature">(<wbr><span class="parameter" id="addAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
+          <span class="name"><a href="fake/SpecialList/addAll.html">addAll</a></span><span class="signature">(<wbr><span class="parameter" id="addAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -311,7 +311,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="asMap" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/asMap.html">asMap</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Map<span class="signature">&lt;int, E&gt;</span></span>
+            <span class="returntype parameter">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -319,8 +319,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="cast" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/cast.html">cast</a></span><span class="signature">&lt;R&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;R&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/cast.html">cast</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -364,8 +364,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="expand" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;T&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;T&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -391,7 +391,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="fold" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+          <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
         </dt>
@@ -400,8 +400,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="followedBy" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/followedBy.html">followedBy</a></span><span class="signature">(<wbr><span class="parameter" id="followedBy-param-other"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">other</span></span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/followedBy.html">followedBy</a></span><span class="signature">(<wbr><span class="parameter" id="followedBy-param-other"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -419,7 +419,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="getRange" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/getRange.html">getRange</a></span><span class="signature">(<wbr><span class="parameter" id="getRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="getRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -454,7 +454,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="insertAll" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/insertAll.html">insertAll</a></span><span class="signature">(<wbr><span class="parameter" id="insertAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insertAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
+          <span class="name"><a href="fake/SpecialList/insertAll.html">insertAll</a></span><span class="signature">(<wbr><span class="parameter" id="insertAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insertAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -499,8 +499,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="map" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;T&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -571,7 +571,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="replaceRange" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></span><span class="signature">(<wbr><span class="parameter" id="replaceRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="replaceRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="replaceRange-param-newContents"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">newContents</span></span>)
+          <span class="name"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></span><span class="signature">(<wbr><span class="parameter" id="replaceRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="replaceRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="replaceRange-param-newContents"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">newContents</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -589,8 +589,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="retype" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/retype.html">retype</a></span><span class="signature">&lt;R&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;R&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/retype.html">retype</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -598,7 +598,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="setAll" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/setAll.html">setAll</a></span><span class="signature">(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
+          <span class="name"><a href="fake/SpecialList/setAll.html">setAll</a></span><span class="signature">(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -607,7 +607,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="setRange" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/setRange.html">setRange</a></span><span class="signature">(<wbr><span class="parameter" id="setRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="setRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="setRange-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span>, [</span> <span class="parameter" id="setRange-param-skipCount"><span class="type-annotation">int</span> <span class="parameter-name">skipCount</span> = <span class="default-value">0</span></span> ])
+          <span class="name"><a href="fake/SpecialList/setRange.html">setRange</a></span><span class="signature">(<wbr><span class="parameter" id="setRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="setRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="setRange-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span>, [</span> <span class="parameter" id="setRange-param-skipCount"><span class="type-annotation">int</span> <span class="parameter-name">skipCount</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -635,7 +635,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="skip" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/skip.html">skip</a></span><span class="signature">(<wbr><span class="parameter" id="skip-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -644,7 +644,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="skipWhile" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/skipWhile.html">skipWhile</a></span><span class="signature">(<wbr><span class="parameter" id="skipWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -662,7 +662,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="sublist" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/sublist.html">sublist</a></span><span class="signature">(<wbr><span class="parameter" id="sublist-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, [</span> <span class="parameter" id="sublist-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span> ])
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;E&gt;</span></span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -671,7 +671,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="take" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/take.html">take</a></span><span class="signature">(<wbr><span class="parameter" id="take-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -680,7 +680,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="takeWhile" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/takeWhile.html">takeWhile</a></span><span class="signature">(<wbr><span class="parameter" id="takeWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -689,7 +689,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="toList" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/toList.html">toList</a></span><span class="signature">(<wbr>{<span class="parameter" id="toList-param-growable"><span class="type-annotation">bool</span> <span class="parameter-name">growable</span>: <span class="default-value">true</span></span> })
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;E&gt;</span></span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -698,7 +698,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="toSet" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/toSet.html">toSet</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Set<span class="signature">&lt;E&gt;</span></span>
+            <span class="returntype parameter">&#8594; Set<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -716,7 +716,7 @@ <h2>Methods</h2>
 </dd>
         <dt id="where" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/where.html">where</a></span><span class="signature">(<wbr><span class="parameter" id="where-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -724,8 +724,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="whereType" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/whereType.html">whereType</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;T&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/whereType.html">whereType</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -757,8 +757,8 @@ <h2>Operators</h2>
           
 </dd>
         <dt id="operator +" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">List<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">other</span></span>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;E&gt;</span></span>
+          <span class="name"><a href="fake/SpecialList/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
diff --git a/testing/test_package_docs/fake/SpecialList/SpecialList.html b/testing/test_package_docs/fake/SpecialList/SpecialList.html
index 96c61249b5..ae96de2297 100644
--- a/testing/test_package_docs/fake/SpecialList/SpecialList.html
+++ b/testing/test_package_docs/fake/SpecialList/SpecialList.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">SpecialList constructor</li>
   </ol>
   <div class="self-name">SpecialList</div>
@@ -120,11 +120,11 @@ <h5>SpecialList class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SpecialList&lt;E&gt; constructor</h1>
+    <h1>SpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">SpecialList&lt;E&gt;</span>(<wbr>)
+      <span class="name ">SpecialList&lt;<wbr><span class="type-parameter">E</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/SpecialList/add.html b/testing/test_package_docs/fake/SpecialList/add.html
index d01384f7bf..936f6a697f 100644
--- a/testing/test_package_docs/fake/SpecialList/add.html
+++ b/testing/test_package_docs/fake/SpecialList/add.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">add method</li>
   </ol>
   <div class="self-name">add</div>
diff --git a/testing/test_package_docs/fake/SpecialList/addAll.html b/testing/test_package_docs/fake/SpecialList/addAll.html
index 8191f1d008..5072bee857 100644
--- a/testing/test_package_docs/fake/SpecialList/addAll.html
+++ b/testing/test_package_docs/fake/SpecialList/addAll.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">addAll method</li>
   </ol>
   <div class="self-name">addAll</div>
@@ -125,7 +125,7 @@ <h1>addAll method</h1>
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">addAll</span>
-(<wbr><span class="parameter" id="addAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
+(<wbr><span class="parameter" id="addAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/any.html b/testing/test_package_docs/fake/SpecialList/any.html
index 797d95aec2..9bc211c908 100644
--- a/testing/test_package_docs/fake/SpecialList/any.html
+++ b/testing/test_package_docs/fake/SpecialList/any.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">any method</li>
   </ol>
   <div class="self-name">any</div>
diff --git a/testing/test_package_docs/fake/SpecialList/asMap.html b/testing/test_package_docs/fake/SpecialList/asMap.html
index 571fb5f4d7..1642235cd4 100644
--- a/testing/test_package_docs/fake/SpecialList/asMap.html
+++ b/testing/test_package_docs/fake/SpecialList/asMap.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">asMap method</li>
   </ol>
   <div class="self-name">asMap</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>asMap method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Map<span class="signature">&lt;int, E&gt;</span></span>
+      <span class="returntype">Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">asMap</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/cast.html b/testing/test_package_docs/fake/SpecialList/cast.html
index 80a445fb5e..88297d1922 100644
--- a/testing/test_package_docs/fake/SpecialList/cast.html
+++ b/testing/test_package_docs/fake/SpecialList/cast.html
@@ -25,8 +25,8 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">cast&lt;R&gt; method</li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
+    <li class="self-crumb">cast&lt;<wbr><span class="type-parameter">R</span>&gt; method</li>
   </ol>
   <div class="self-name">cast</div>
   <form class="search navbar-right" role="search">
@@ -120,12 +120,12 @@ <h5>SpecialList class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>cast&lt;R&gt; method</h1>
+    <h1>cast&lt;<wbr><span class="type-parameter">R</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">List<span class="signature">&lt;R&gt;</span></span>
+      <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
       <span class="name ">cast</span>
-&lt;R&gt;(<wbr>)
+&lt;<wbr><span class="type-parameter">R</span>&gt;(<wbr>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/clear.html b/testing/test_package_docs/fake/SpecialList/clear.html
index c3fea34fa5..5c32375bd2 100644
--- a/testing/test_package_docs/fake/SpecialList/clear.html
+++ b/testing/test_package_docs/fake/SpecialList/clear.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">clear method</li>
   </ol>
   <div class="self-name">clear</div>
diff --git a/testing/test_package_docs/fake/SpecialList/contains.html b/testing/test_package_docs/fake/SpecialList/contains.html
index bf0028b1bc..55fa4099f2 100644
--- a/testing/test_package_docs/fake/SpecialList/contains.html
+++ b/testing/test_package_docs/fake/SpecialList/contains.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">contains method</li>
   </ol>
   <div class="self-name">contains</div>
diff --git a/testing/test_package_docs/fake/SpecialList/elementAt.html b/testing/test_package_docs/fake/SpecialList/elementAt.html
index aa2d76b47d..9d623173a5 100644
--- a/testing/test_package_docs/fake/SpecialList/elementAt.html
+++ b/testing/test_package_docs/fake/SpecialList/elementAt.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">elementAt method</li>
   </ol>
   <div class="self-name">elementAt</div>
diff --git a/testing/test_package_docs/fake/SpecialList/every.html b/testing/test_package_docs/fake/SpecialList/every.html
index a1ec27e150..96349fd272 100644
--- a/testing/test_package_docs/fake/SpecialList/every.html
+++ b/testing/test_package_docs/fake/SpecialList/every.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">every method</li>
   </ol>
   <div class="self-name">every</div>
diff --git a/testing/test_package_docs/fake/SpecialList/expand.html b/testing/test_package_docs/fake/SpecialList/expand.html
index 6f2cc236ee..6db49914f3 100644
--- a/testing/test_package_docs/fake/SpecialList/expand.html
+++ b/testing/test_package_docs/fake/SpecialList/expand.html
@@ -25,8 +25,8 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">expand&lt;T&gt; method</li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
+    <li class="self-crumb">expand&lt;<wbr><span class="type-parameter">T</span>&gt; method</li>
   </ol>
   <div class="self-name">expand</div>
   <form class="search navbar-right" role="search">
@@ -120,12 +120,12 @@ <h5>SpecialList class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>expand&lt;T&gt; method</h1>
+    <h1>expand&lt;<wbr><span class="type-parameter">T</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;T&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
       <span class="name ">expand</span>
-&lt;T&gt;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;T&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+&lt;<wbr><span class="type-parameter">T</span>&gt;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/fillRange.html b/testing/test_package_docs/fake/SpecialList/fillRange.html
index 17a06ec437..1fca375907 100644
--- a/testing/test_package_docs/fake/SpecialList/fillRange.html
+++ b/testing/test_package_docs/fake/SpecialList/fillRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">fillRange method</li>
   </ol>
   <div class="self-name">fillRange</div>
diff --git a/testing/test_package_docs/fake/SpecialList/first.html b/testing/test_package_docs/fake/SpecialList/first.html
index afbeccd9f6..98818f06e6 100644
--- a/testing/test_package_docs/fake/SpecialList/first.html
+++ b/testing/test_package_docs/fake/SpecialList/first.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">first property</li>
   </ol>
   <div class="self-name">first</div>
diff --git a/testing/test_package_docs/fake/SpecialList/firstWhere.html b/testing/test_package_docs/fake/SpecialList/firstWhere.html
index 79a1ed55e0..a080aa6b5e 100644
--- a/testing/test_package_docs/fake/SpecialList/firstWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/firstWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">firstWhere method</li>
   </ol>
   <div class="self-name">firstWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/fold.html b/testing/test_package_docs/fake/SpecialList/fold.html
index 3d7aa2bd54..56eecce239 100644
--- a/testing/test_package_docs/fake/SpecialList/fold.html
+++ b/testing/test_package_docs/fake/SpecialList/fold.html
@@ -25,8 +25,8 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">fold&lt;T&gt; method</li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
+    <li class="self-crumb">fold&lt;<wbr><span class="type-parameter">T</span>&gt; method</li>
   </ol>
   <div class="self-name">fold</div>
   <form class="search navbar-right" role="search">
@@ -120,12 +120,12 @@ <h5>SpecialList class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>fold&lt;T&gt; method</h1>
+    <h1>fold&lt;<wbr><span class="type-parameter">T</span>&gt; method</h1>
 
     <section class="multi-line-signature">
       <span class="returntype">T</span>
       <span class="name ">fold</span>
-&lt;T&gt;(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+&lt;<wbr><span class="type-parameter">T</span>&gt;(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/followedBy.html b/testing/test_package_docs/fake/SpecialList/followedBy.html
index 89e0b95c7f..d1235c3aeb 100644
--- a/testing/test_package_docs/fake/SpecialList/followedBy.html
+++ b/testing/test_package_docs/fake/SpecialList/followedBy.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">followedBy method</li>
   </ol>
   <div class="self-name">followedBy</div>
@@ -123,9 +123,9 @@ <h5>SpecialList class</h5>
     <h1>followedBy method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">followedBy</span>
-(<wbr><span class="parameter" id="followedBy-param-other"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">other</span></span>)
+(<wbr><span class="parameter" id="followedBy-param-other"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/forEach.html b/testing/test_package_docs/fake/SpecialList/forEach.html
index c6e4de1a11..c5fa3859eb 100644
--- a/testing/test_package_docs/fake/SpecialList/forEach.html
+++ b/testing/test_package_docs/fake/SpecialList/forEach.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">forEach method</li>
   </ol>
   <div class="self-name">forEach</div>
diff --git a/testing/test_package_docs/fake/SpecialList/getRange.html b/testing/test_package_docs/fake/SpecialList/getRange.html
index c5c8a26489..cd89b24108 100644
--- a/testing/test_package_docs/fake/SpecialList/getRange.html
+++ b/testing/test_package_docs/fake/SpecialList/getRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">getRange method</li>
   </ol>
   <div class="self-name">getRange</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>getRange method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">getRange</span>
 (<wbr><span class="parameter" id="getRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="getRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/hashCode.html b/testing/test_package_docs/fake/SpecialList/hashCode.html
index dacbdb1bdb..47128aeca5 100644
--- a/testing/test_package_docs/fake/SpecialList/hashCode.html
+++ b/testing/test_package_docs/fake/SpecialList/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/SpecialList/indexOf.html b/testing/test_package_docs/fake/SpecialList/indexOf.html
index 6a709d1031..24e36b416c 100644
--- a/testing/test_package_docs/fake/SpecialList/indexOf.html
+++ b/testing/test_package_docs/fake/SpecialList/indexOf.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">indexOf method</li>
   </ol>
   <div class="self-name">indexOf</div>
diff --git a/testing/test_package_docs/fake/SpecialList/indexWhere.html b/testing/test_package_docs/fake/SpecialList/indexWhere.html
index 64d81756ef..7f56a18332 100644
--- a/testing/test_package_docs/fake/SpecialList/indexWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/indexWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">indexWhere method</li>
   </ol>
   <div class="self-name">indexWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/insert.html b/testing/test_package_docs/fake/SpecialList/insert.html
index d8692e177c..2dd0b69abf 100644
--- a/testing/test_package_docs/fake/SpecialList/insert.html
+++ b/testing/test_package_docs/fake/SpecialList/insert.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">insert method</li>
   </ol>
   <div class="self-name">insert</div>
diff --git a/testing/test_package_docs/fake/SpecialList/insertAll.html b/testing/test_package_docs/fake/SpecialList/insertAll.html
index 9c5e705cc3..e4508ea2f0 100644
--- a/testing/test_package_docs/fake/SpecialList/insertAll.html
+++ b/testing/test_package_docs/fake/SpecialList/insertAll.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">insertAll method</li>
   </ol>
   <div class="self-name">insertAll</div>
@@ -125,7 +125,7 @@ <h1>insertAll method</h1>
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">insertAll</span>
-(<wbr><span class="parameter" id="insertAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insertAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
+(<wbr><span class="parameter" id="insertAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insertAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/isEmpty.html b/testing/test_package_docs/fake/SpecialList/isEmpty.html
index cf1166e91c..70819848ab 100644
--- a/testing/test_package_docs/fake/SpecialList/isEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isEmpty.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">isEmpty property</li>
   </ol>
   <div class="self-name">isEmpty</div>
diff --git a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
index 7da2139e1b..a472bf4e1c 100644
--- a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">isNotEmpty property</li>
   </ol>
   <div class="self-name">isNotEmpty</div>
diff --git a/testing/test_package_docs/fake/SpecialList/iterator.html b/testing/test_package_docs/fake/SpecialList/iterator.html
index 880b3206dc..70d3f88ca4 100644
--- a/testing/test_package_docs/fake/SpecialList/iterator.html
+++ b/testing/test_package_docs/fake/SpecialList/iterator.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">iterator property</li>
   </ol>
   <div class="self-name">iterator</div>
@@ -126,7 +126,7 @@ <h1>iterator property</h1>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype">Iterator<span class="signature">&lt;E&gt;</span></span>
+          <span class="returntype">Iterator<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           <span class="name ">iterator</span>
   <div class="features">inherited</div>
 </section>
diff --git a/testing/test_package_docs/fake/SpecialList/join.html b/testing/test_package_docs/fake/SpecialList/join.html
index b18a8b9ddc..5d98c4f87b 100644
--- a/testing/test_package_docs/fake/SpecialList/join.html
+++ b/testing/test_package_docs/fake/SpecialList/join.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">join method</li>
   </ol>
   <div class="self-name">join</div>
diff --git a/testing/test_package_docs/fake/SpecialList/last.html b/testing/test_package_docs/fake/SpecialList/last.html
index a1fa059e1a..34e08091fc 100644
--- a/testing/test_package_docs/fake/SpecialList/last.html
+++ b/testing/test_package_docs/fake/SpecialList/last.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">last property</li>
   </ol>
   <div class="self-name">last</div>
diff --git a/testing/test_package_docs/fake/SpecialList/lastIndexOf.html b/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
index 0c76189cc0..20f3b511e8 100644
--- a/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
+++ b/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">lastIndexOf method</li>
   </ol>
   <div class="self-name">lastIndexOf</div>
diff --git a/testing/test_package_docs/fake/SpecialList/lastIndexWhere.html b/testing/test_package_docs/fake/SpecialList/lastIndexWhere.html
index 3039c4772a..4fd08b5458 100644
--- a/testing/test_package_docs/fake/SpecialList/lastIndexWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/lastIndexWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">lastIndexWhere method</li>
   </ol>
   <div class="self-name">lastIndexWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/lastWhere.html b/testing/test_package_docs/fake/SpecialList/lastWhere.html
index c1e89df2b2..ed33ff4618 100644
--- a/testing/test_package_docs/fake/SpecialList/lastWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/lastWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">lastWhere method</li>
   </ol>
   <div class="self-name">lastWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/length.html b/testing/test_package_docs/fake/SpecialList/length.html
index 873a9545c3..71a1c4810e 100644
--- a/testing/test_package_docs/fake/SpecialList/length.html
+++ b/testing/test_package_docs/fake/SpecialList/length.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">length property</li>
   </ol>
   <div class="self-name">length</div>
diff --git a/testing/test_package_docs/fake/SpecialList/map.html b/testing/test_package_docs/fake/SpecialList/map.html
index b4589ec7a0..82aa805865 100644
--- a/testing/test_package_docs/fake/SpecialList/map.html
+++ b/testing/test_package_docs/fake/SpecialList/map.html
@@ -25,8 +25,8 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">map&lt;T&gt; method</li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
+    <li class="self-crumb">map&lt;<wbr><span class="type-parameter">T</span>&gt; method</li>
   </ol>
   <div class="self-name">map</div>
   <form class="search navbar-right" role="search">
@@ -120,12 +120,12 @@ <h5>SpecialList class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>map&lt;T&gt; method</h1>
+    <h1>map&lt;<wbr><span class="type-parameter">T</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;T&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
       <span class="name ">map</span>
-&lt;T&gt;(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+&lt;<wbr><span class="type-parameter">T</span>&gt;(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/noSuchMethod.html b/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
index 2beadb9c18..dbcefba949 100644
--- a/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
+++ b/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_equals.html b/testing/test_package_docs/fake/SpecialList/operator_equals.html
index c4b8f75dd8..a106db3788 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_equals.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_get.html b/testing/test_package_docs/fake/SpecialList/operator_get.html
index 5213e62df0..e61842f3e1 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_get.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_get.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">operator [] method</li>
   </ol>
   <div class="self-name">operator []</div>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_plus.html b/testing/test_package_docs/fake/SpecialList/operator_plus.html
index 400101674c..f07d43adb1 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_plus.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_plus.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">operator + method</li>
   </ol>
   <div class="self-name">operator +</div>
@@ -123,9 +123,9 @@ <h5>SpecialList class</h5>
     <h1>operator + method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">List<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">operator +</span>
-(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">List<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">other</span></span>)
+(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/operator_put.html b/testing/test_package_docs/fake/SpecialList/operator_put.html
index 8930c7b9f0..c00d3c0c65 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_put.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_put.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">operator []= method</li>
   </ol>
   <div class="self-name">operator []=</div>
diff --git a/testing/test_package_docs/fake/SpecialList/reduce.html b/testing/test_package_docs/fake/SpecialList/reduce.html
index c17629d8d9..36fbe0364e 100644
--- a/testing/test_package_docs/fake/SpecialList/reduce.html
+++ b/testing/test_package_docs/fake/SpecialList/reduce.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">reduce method</li>
   </ol>
   <div class="self-name">reduce</div>
diff --git a/testing/test_package_docs/fake/SpecialList/remove.html b/testing/test_package_docs/fake/SpecialList/remove.html
index a594262bf8..da3472dd91 100644
--- a/testing/test_package_docs/fake/SpecialList/remove.html
+++ b/testing/test_package_docs/fake/SpecialList/remove.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">remove method</li>
   </ol>
   <div class="self-name">remove</div>
diff --git a/testing/test_package_docs/fake/SpecialList/removeAt.html b/testing/test_package_docs/fake/SpecialList/removeAt.html
index 65e6c03bcc..9a9a18fd84 100644
--- a/testing/test_package_docs/fake/SpecialList/removeAt.html
+++ b/testing/test_package_docs/fake/SpecialList/removeAt.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">removeAt method</li>
   </ol>
   <div class="self-name">removeAt</div>
diff --git a/testing/test_package_docs/fake/SpecialList/removeLast.html b/testing/test_package_docs/fake/SpecialList/removeLast.html
index 28405f21ff..8dca0ea3cc 100644
--- a/testing/test_package_docs/fake/SpecialList/removeLast.html
+++ b/testing/test_package_docs/fake/SpecialList/removeLast.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">removeLast method</li>
   </ol>
   <div class="self-name">removeLast</div>
diff --git a/testing/test_package_docs/fake/SpecialList/removeRange.html b/testing/test_package_docs/fake/SpecialList/removeRange.html
index 7da04239ec..e65f65c924 100644
--- a/testing/test_package_docs/fake/SpecialList/removeRange.html
+++ b/testing/test_package_docs/fake/SpecialList/removeRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">removeRange method</li>
   </ol>
   <div class="self-name">removeRange</div>
diff --git a/testing/test_package_docs/fake/SpecialList/removeWhere.html b/testing/test_package_docs/fake/SpecialList/removeWhere.html
index 376c4140e6..c39f9712aa 100644
--- a/testing/test_package_docs/fake/SpecialList/removeWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/removeWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">removeWhere method</li>
   </ol>
   <div class="self-name">removeWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/replaceRange.html b/testing/test_package_docs/fake/SpecialList/replaceRange.html
index 6a247bc1b5..1fdcdcb15d 100644
--- a/testing/test_package_docs/fake/SpecialList/replaceRange.html
+++ b/testing/test_package_docs/fake/SpecialList/replaceRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">replaceRange method</li>
   </ol>
   <div class="self-name">replaceRange</div>
@@ -125,7 +125,7 @@ <h1>replaceRange method</h1>
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">replaceRange</span>
-(<wbr><span class="parameter" id="replaceRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="replaceRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="replaceRange-param-newContents"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">newContents</span></span>)
+(<wbr><span class="parameter" id="replaceRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="replaceRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="replaceRange-param-newContents"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">newContents</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/retainWhere.html b/testing/test_package_docs/fake/SpecialList/retainWhere.html
index 7b5dce0339..0f48407bc1 100644
--- a/testing/test_package_docs/fake/SpecialList/retainWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/retainWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">retainWhere method</li>
   </ol>
   <div class="self-name">retainWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/retype.html b/testing/test_package_docs/fake/SpecialList/retype.html
index 2474f8cbac..7c9618bae8 100644
--- a/testing/test_package_docs/fake/SpecialList/retype.html
+++ b/testing/test_package_docs/fake/SpecialList/retype.html
@@ -25,8 +25,8 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">retype&lt;R&gt; method</li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
+    <li class="self-crumb">retype&lt;<wbr><span class="type-parameter">R</span>&gt; method</li>
   </ol>
   <div class="self-name">retype</div>
   <form class="search navbar-right" role="search">
@@ -120,12 +120,12 @@ <h5>SpecialList class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>retype&lt;R&gt; method</h1>
+    <h1>retype&lt;<wbr><span class="type-parameter">R</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">List<span class="signature">&lt;R&gt;</span></span>
+      <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
       <span class="name ">retype</span>
-&lt;R&gt;(<wbr>)
+&lt;<wbr><span class="type-parameter">R</span>&gt;(<wbr>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/reversed.html b/testing/test_package_docs/fake/SpecialList/reversed.html
index 5c7f32428a..d94765148f 100644
--- a/testing/test_package_docs/fake/SpecialList/reversed.html
+++ b/testing/test_package_docs/fake/SpecialList/reversed.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">reversed property</li>
   </ol>
   <div class="self-name">reversed</div>
@@ -126,7 +126,7 @@ <h1>reversed property</h1>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
+          <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           <span class="name ">reversed</span>
   <div class="features">inherited</div>
 </section>
diff --git a/testing/test_package_docs/fake/SpecialList/runtimeType.html b/testing/test_package_docs/fake/SpecialList/runtimeType.html
index 0898ee4ee3..9435cd82e5 100644
--- a/testing/test_package_docs/fake/SpecialList/runtimeType.html
+++ b/testing/test_package_docs/fake/SpecialList/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/SpecialList/setAll.html b/testing/test_package_docs/fake/SpecialList/setAll.html
index 26157319a0..0e731d3e67 100644
--- a/testing/test_package_docs/fake/SpecialList/setAll.html
+++ b/testing/test_package_docs/fake/SpecialList/setAll.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">setAll method</li>
   </ol>
   <div class="self-name">setAll</div>
@@ -125,7 +125,7 @@ <h1>setAll method</h1>
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">setAll</span>
-(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
+(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/setRange.html b/testing/test_package_docs/fake/SpecialList/setRange.html
index 98580eebd1..bc7af74fae 100644
--- a/testing/test_package_docs/fake/SpecialList/setRange.html
+++ b/testing/test_package_docs/fake/SpecialList/setRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">setRange method</li>
   </ol>
   <div class="self-name">setRange</div>
@@ -125,7 +125,7 @@ <h1>setRange method</h1>
     <section class="multi-line-signature">
       <span class="returntype">void</span>
       <span class="name ">setRange</span>
-(<wbr><span class="parameter" id="setRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="setRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="setRange-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;E&gt;</span></span> <span class="parameter-name">iterable</span>, [</span> <span class="parameter" id="setRange-param-skipCount"><span class="type-annotation">int</span> <span class="parameter-name">skipCount</span> = <span class="default-value">0</span></span> ])
+(<wbr><span class="parameter" id="setRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="setRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="setRange-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span>, [</span> <span class="parameter" id="setRange-param-skipCount"><span class="type-annotation">int</span> <span class="parameter-name">skipCount</span> = <span class="default-value">0</span></span> ])
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/shuffle.html b/testing/test_package_docs/fake/SpecialList/shuffle.html
index a7ebd5227f..fde47c6f55 100644
--- a/testing/test_package_docs/fake/SpecialList/shuffle.html
+++ b/testing/test_package_docs/fake/SpecialList/shuffle.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">shuffle method</li>
   </ol>
   <div class="self-name">shuffle</div>
diff --git a/testing/test_package_docs/fake/SpecialList/single.html b/testing/test_package_docs/fake/SpecialList/single.html
index 825017a9d8..f0061a23a9 100644
--- a/testing/test_package_docs/fake/SpecialList/single.html
+++ b/testing/test_package_docs/fake/SpecialList/single.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">single property</li>
   </ol>
   <div class="self-name">single</div>
diff --git a/testing/test_package_docs/fake/SpecialList/singleWhere.html b/testing/test_package_docs/fake/SpecialList/singleWhere.html
index e80e4dda75..3f02c593d4 100644
--- a/testing/test_package_docs/fake/SpecialList/singleWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/singleWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">singleWhere method</li>
   </ol>
   <div class="self-name">singleWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/skip.html b/testing/test_package_docs/fake/SpecialList/skip.html
index f18978a73e..3d98c76819 100644
--- a/testing/test_package_docs/fake/SpecialList/skip.html
+++ b/testing/test_package_docs/fake/SpecialList/skip.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">skip method</li>
   </ol>
   <div class="self-name">skip</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>skip method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">skip</span>
 (<wbr><span class="parameter" id="skip-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/skipWhile.html b/testing/test_package_docs/fake/SpecialList/skipWhile.html
index f549f33f60..e3905c174f 100644
--- a/testing/test_package_docs/fake/SpecialList/skipWhile.html
+++ b/testing/test_package_docs/fake/SpecialList/skipWhile.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">skipWhile method</li>
   </ol>
   <div class="self-name">skipWhile</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>skipWhile method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">skipWhile</span>
 (<wbr><span class="parameter" id="skipWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/sort.html b/testing/test_package_docs/fake/SpecialList/sort.html
index b92d6cbe55..55ac73022e 100644
--- a/testing/test_package_docs/fake/SpecialList/sort.html
+++ b/testing/test_package_docs/fake/SpecialList/sort.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">sort method</li>
   </ol>
   <div class="self-name">sort</div>
diff --git a/testing/test_package_docs/fake/SpecialList/sublist.html b/testing/test_package_docs/fake/SpecialList/sublist.html
index 8a1e140d13..c18bdd105b 100644
--- a/testing/test_package_docs/fake/SpecialList/sublist.html
+++ b/testing/test_package_docs/fake/SpecialList/sublist.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">sublist method</li>
   </ol>
   <div class="self-name">sublist</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>sublist method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">List<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">sublist</span>
 (<wbr><span class="parameter" id="sublist-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, [</span> <span class="parameter" id="sublist-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span> ])
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/take.html b/testing/test_package_docs/fake/SpecialList/take.html
index 20e633a388..d3279db005 100644
--- a/testing/test_package_docs/fake/SpecialList/take.html
+++ b/testing/test_package_docs/fake/SpecialList/take.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">take method</li>
   </ol>
   <div class="self-name">take</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>take method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">take</span>
 (<wbr><span class="parameter" id="take-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/takeWhile.html b/testing/test_package_docs/fake/SpecialList/takeWhile.html
index 48c55a2038..6d1a3d4694 100644
--- a/testing/test_package_docs/fake/SpecialList/takeWhile.html
+++ b/testing/test_package_docs/fake/SpecialList/takeWhile.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">takeWhile method</li>
   </ol>
   <div class="self-name">takeWhile</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>takeWhile method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">takeWhile</span>
 (<wbr><span class="parameter" id="takeWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/toList.html b/testing/test_package_docs/fake/SpecialList/toList.html
index 850abd66c0..2155f8c13e 100644
--- a/testing/test_package_docs/fake/SpecialList/toList.html
+++ b/testing/test_package_docs/fake/SpecialList/toList.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">toList method</li>
   </ol>
   <div class="self-name">toList</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>toList method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">List<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">toList</span>
 (<wbr>{<span class="parameter" id="toList-param-growable"><span class="type-annotation">bool</span> <span class="parameter-name">growable</span>: <span class="default-value">true</span></span> })
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/toSet.html b/testing/test_package_docs/fake/SpecialList/toSet.html
index efae0e897f..5b39814c2f 100644
--- a/testing/test_package_docs/fake/SpecialList/toSet.html
+++ b/testing/test_package_docs/fake/SpecialList/toSet.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">toSet method</li>
   </ol>
   <div class="self-name">toSet</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>toSet method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Set<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">Set<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">toSet</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/toString.html b/testing/test_package_docs/fake/SpecialList/toString.html
index 0e3b7aaeea..7077daa0a6 100644
--- a/testing/test_package_docs/fake/SpecialList/toString.html
+++ b/testing/test_package_docs/fake/SpecialList/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/SpecialList/where.html b/testing/test_package_docs/fake/SpecialList/where.html
index d03eb7d365..1f6037deeb 100644
--- a/testing/test_package_docs/fake/SpecialList/where.html
+++ b/testing/test_package_docs/fake/SpecialList/where.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
     <li class="self-crumb">where method</li>
   </ol>
   <div class="self-name">where</div>
@@ -123,7 +123,7 @@ <h5>SpecialList class</h5>
     <h1>where method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;E&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
       <span class="name ">where</span>
 (<wbr><span class="parameter" id="where-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
diff --git a/testing/test_package_docs/fake/SpecialList/whereType.html b/testing/test_package_docs/fake/SpecialList/whereType.html
index 46f866a2f1..988bc0e20d 100644
--- a/testing/test_package_docs/fake/SpecialList/whereType.html
+++ b/testing/test_package_docs/fake/SpecialList/whereType.html
@@ -25,8 +25,8 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
-    <li class="self-crumb">whereType&lt;T&gt; method</li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
+    <li class="self-crumb">whereType&lt;<wbr><span class="type-parameter">T</span>&gt; method</li>
   </ol>
   <div class="self-name">whereType</div>
   <form class="search navbar-right" role="search">
@@ -120,12 +120,12 @@ <h5>SpecialList class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>whereType&lt;T&gt; method</h1>
+    <h1>whereType&lt;<wbr><span class="type-parameter">T</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Iterable<span class="signature">&lt;T&gt;</span></span>
+      <span class="returntype">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
       <span class="name ">whereType</span>
-&lt;T&gt;(<wbr>)
+&lt;<wbr><span class="type-parameter">T</span>&gt;(<wbr>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass-class.html b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
index 7f57c95e19..ee7d0793e9 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
@@ -196,7 +196,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="powers" class="property">
           <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;String&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
         </dt>
         <dd>
           In the super class.
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/powers.html b/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
index 709ebcc635..6922855466 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
@@ -67,7 +67,7 @@ <h5>SuperAwesomeClass class</h5>
     <h1>powers property</h1>
 
         <section class="multi-line-signature">
-          <span class="returntype">List<span class="signature">&lt;String&gt;</span></span>
+          <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
           <span class="name ">powers</span>
           <div class="features">read / write</div>
         </section>
diff --git a/testing/test_package_docs/fake/TypedefUsingClass-class.html b/testing/test_package_docs/fake/TypedefUsingClass-class.html
index 10647741e3..84b40d5f43 100644
--- a/testing/test_package_docs/fake/TypedefUsingClass-class.html
+++ b/testing/test_package_docs/fake/TypedefUsingClass-class.html
@@ -163,7 +163,7 @@ <h2>Constructors</h2>
 
       <dl class="constructor-summary-list">
         <dt id="TypedefUsingClass" class="callable">
-          <span class="name"><a href="fake/TypedefUsingClass/TypedefUsingClass.html">TypedefUsingClass</a></span><span class="signature">(<span class="parameter" id="-param-x"><span class="type-annotation"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;double&gt;</span></span> <span class="parameter-name">x</span></span>)</span>
+          <span class="name"><a href="fake/TypedefUsingClass/TypedefUsingClass.html">TypedefUsingClass</a></span><span class="signature">(<span class="parameter" id="-param-x"><span class="type-annotation"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">double</span>&gt;</span></span> <span class="parameter-name">x</span></span>)</span>
         </dt>
         <dd>
           
@@ -177,7 +177,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="x" class="property">
           <span class="name"><a href="fake/TypedefUsingClass/x.html">x</a></span>
-          <span class="signature">&#8596; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;double&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">double</span>&gt;</span></span>
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/fake/TypedefUsingClass/TypedefUsingClass.html b/testing/test_package_docs/fake/TypedefUsingClass/TypedefUsingClass.html
index 441d72b0f8..f8b9c85c4a 100644
--- a/testing/test_package_docs/fake/TypedefUsingClass/TypedefUsingClass.html
+++ b/testing/test_package_docs/fake/TypedefUsingClass/TypedefUsingClass.html
@@ -66,7 +66,7 @@ <h1>TypedefUsingClass constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">TypedefUsingClass</span>(<wbr><span class="parameter" id="-param-x"><span class="type-annotation"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;double&gt;</span></span> <span class="parameter-name">x</span></span>)
+      <span class="name ">TypedefUsingClass</span>(<wbr><span class="parameter" id="-param-x"><span class="type-annotation"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">double</span>&gt;</span></span> <span class="parameter-name">x</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/TypedefUsingClass/x.html b/testing/test_package_docs/fake/TypedefUsingClass/x.html
index fb383704df..949780930c 100644
--- a/testing/test_package_docs/fake/TypedefUsingClass/x.html
+++ b/testing/test_package_docs/fake/TypedefUsingClass/x.html
@@ -65,7 +65,7 @@ <h5>TypedefUsingClass class</h5>
     <h1>x property</h1>
 
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;double&gt;</span></span>
+          <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">double</span>&gt;</span></span>
           <span class="name ">x</span>
           <div class="features">read / write</div>
         </section>
diff --git a/testing/test_package_docs/fake/aVoidParameter.html b/testing/test_package_docs/fake/aVoidParameter.html
index 2862c9edca..8ba4b2ffa2 100644
--- a/testing/test_package_docs/fake/aVoidParameter.html
+++ b/testing/test_package_docs/fake/aVoidParameter.html
@@ -159,7 +159,7 @@ <h1>aVoidParameter function</h1>
     <section class="multi-line-signature">
         <span class="returntype">void</span>
         <span class="name ">aVoidParameter</span>
-(<wbr><span class="parameter" id="aVoidParameter-param-p1"><span class="type-annotation">Future<span class="signature">&lt;void&gt;</span></span> <span class="parameter-name">p1</span></span>)
+(<wbr><span class="parameter" id="aVoidParameter-param-p1"><span class="type-annotation">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">p1</span></span>)
     </section>
     <section class="desc markdown">
       <p>This function requires a Future<void> as a parameter</void></p>
diff --git a/testing/test_package_docs/fake/complicatedReturn.html b/testing/test_package_docs/fake/complicatedReturn.html
index d624c84235..a2c5176491 100644
--- a/testing/test_package_docs/fake/complicatedReturn.html
+++ b/testing/test_package_docs/fake/complicatedReturn.html
@@ -160,7 +160,7 @@ <h1>complicatedReturn top-level property</h1>
     <section id="getter">
     
     <section class="multi-line-signature">
-      <span class="returntype"><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span>&gt;</span></span>
+      <span class="returntype"><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span></span>&gt;</span></span>
       <span class="name ">complicatedReturn</span>
   
 </section>
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index d8d18daac3..99f6fe698f 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -124,7 +124,7 @@ <h2>Classes</h2>
           Yet another interface that can be implemented.
         </dd>
         <dt id="ATypeTakingClass">
-          <span class="name "><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;T&gt;</span></span>
+          <span class="name "><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
         </dt>
         <dd>
           This class takes a type, and it might be void.
@@ -166,7 +166,7 @@ <h2>Classes</h2>
           For make-better testing of constants. <a href="fake/ConstantClass-class.html">[...]</a>
         </dd>
         <dt id="ConstructorTester">
-          <span class="name "><a href="fake/ConstructorTester-class.html">ConstructorTester</a><span class="signature">&lt;A, B&gt;</span></span>
+          <span class="name "><a href="fake/ConstructorTester-class.html">ConstructorTester</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -190,7 +190,7 @@ <h2>Classes</h2>
           This class extends Future<void></void>
         </dd>
         <dt id="ExtraSpecialList">
-          <span class="name "><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a><span class="signature">&lt;E&gt;</span></span>
+          <span class="name "><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
         </dt>
         <dd>
           This inherits operators.
@@ -202,13 +202,13 @@ <h2>Classes</h2>
           link to method from class <a href="ex/Apple/m.html">Apple.m</a>
         </dd>
         <dt id="HasGenerics">
-          <span class="name "><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;X, Y, Z&gt;</span></span>
+          <span class="name "><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></span>
         </dt>
         <dd>
           
         </dd>
         <dt id="HasGenericWithExtends">
-          <span class="name "><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a><span class="signature">&lt;T extends <a href="fake/Foo2-class.html">Foo2</a>&gt;</span></span>
+          <span class="name "><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends <a href="fake/Foo2-class.html">Foo2</a></span>&gt;</span></span>
         </dt>
         <dd>
           I have a generic and it extends <a href="fake/Foo2-class.html">Foo2</a>
@@ -264,19 +264,19 @@ <h2>Classes</h2>
 across... wait for it... two physical lines. <a href="fake/LongFirstLine-class.html">[...]</a>
         </dd>
         <dt id="MIEEBase">
-          <span class="name "><a href="fake/MIEEBase-class.html">MIEEBase</a><span class="signature">&lt;K, V&gt;</span></span>
+          <span class="name "><a href="fake/MIEEBase-class.html">MIEEBase</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
         </dt>
         <dd>
           
         </dd>
         <dt id="MIEEMixin">
-          <span class="name "><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;K, V&gt;</span></span>
+          <span class="name "><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
         </dt>
         <dd>
           
         </dd>
         <dt id="MIEEMixinWithOverride">
-          <span class="name "><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a><span class="signature">&lt;K, V&gt;</span></span>
+          <span class="name "><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
         </dt>
         <dd>
           Test an edge case for cases where inherited ExecutableElements can come
@@ -284,7 +284,7 @@ <h2>Classes</h2>
 class still takes precedence (#1561).
         </dd>
         <dt id="MIEEThing">
-          <span class="name "><a href="fake/MIEEThing-class.html">MIEEThing</a><span class="signature">&lt;K, V&gt;</span></span>
+          <span class="name "><a href="fake/MIEEThing-class.html">MIEEThing</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -308,7 +308,7 @@ <h2>Classes</h2>
           Test operator references: <a href="fake/OperatorReferenceClass/operator_equals.html">OperatorReferenceClass.==</a>.
         </dd>
         <dt id="OtherGenericsThing">
-          <span class="name "><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a><span class="signature">&lt;A&gt;</span></span>
+          <span class="name "><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -320,7 +320,7 @@ <h2>Classes</h2>
           
         </dd>
         <dt id="SpecialList">
-          <span class="name "><a href="fake/SpecialList-class.html">SpecialList</a><span class="signature">&lt;E&gt;</span></span>
+          <span class="name "><a href="fake/SpecialList-class.html">SpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
         </dt>
         <dd>
           Extends <code>ListBase</code>
@@ -424,7 +424,7 @@ <h2>Constants</h2>
         </dd>
         <dt id="myMap" class="constant">
           <span class="name "><a href="fake/myMap-constant.html">myMap</a></span>
-          <span class="signature">&#8594; const Map<span class="signature">&lt;int, String&gt;</span></span>
+          <span class="signature">&#8594; const Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">String</span>&gt;</span></span>
         </dt>
         <dd>
           A map initialization making use of optional const.
@@ -528,7 +528,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="complicatedReturn" class="property">
           <span class="name"><a href="fake/complicatedReturn.html">complicatedReturn</a></span>
-          <span class="signature">&#8594; <a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span></span>&gt;</span></span>
         </dt>
         <dd>
           A complicated type parameter to ATypeTakingClass.
@@ -560,7 +560,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="importantComputations" class="property">
           <span class="name"><a href="fake/importantComputations.html">importantComputations</a></span>
-          <span class="signature">&#8594; Map<span class="signature">&lt;int, &gt;</span></span>
+          <span class="signature">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic</span>&gt;</span></span>
         </dt>
         <dd>
           Type inference mixing with anonymous functions.
@@ -584,7 +584,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="mapWithDynamicKeys" class="property">
           <span class="name"><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></span>
-          <span class="signature">&#8596; Map<span class="signature">&lt;dynamic, String&gt;</span></span>
+          <span class="signature">&#8596; Map<span class="signature">&lt;<wbr><span class="type-parameter">dynamic</span>, <span class="type-parameter">String</span>&gt;</span></span>
         </dt>
         <dd>
           
@@ -640,7 +640,7 @@ <h2>Functions</h2>
           
 </dd>
         <dt id="aVoidParameter" class="callable">
-          <span class="name"><a href="fake/aVoidParameter.html">aVoidParameter</a></span><span class="signature">(<wbr><span class="parameter" id="aVoidParameter-param-p1"><span class="type-annotation">Future<span class="signature">&lt;void&gt;</span></span> <span class="parameter-name">p1</span></span>)
+          <span class="name"><a href="fake/aVoidParameter.html">aVoidParameter</a></span><span class="signature">(<wbr><span class="parameter" id="aVoidParameter-param-p1"><span class="type-annotation">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">p1</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -658,7 +658,7 @@ <h2>Functions</h2>
           
 </dd>
         <dt id="myGenericFunction" class="callable">
-          <span class="name"><a href="fake/myGenericFunction.html">myGenericFunction</a></span><span class="signature">&lt;S&gt;</span><span class="signature">(<wbr><span class="parameter" id="myGenericFunction-param-a"><span class="type-annotation">int</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="myGenericFunction-param-b"><span class="type-annotation">bool</span> <span class="parameter-name">b</span>, </span> <span class="parameter" id="myGenericFunction-param-c"><span class="type-annotation">S</span> <span class="parameter-name">c</span></span>)
+          <span class="name"><a href="fake/myGenericFunction.html">myGenericFunction</a></span><span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="myGenericFunction-param-a"><span class="type-annotation">int</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="myGenericFunction-param-b"><span class="type-annotation">bool</span> <span class="parameter-name">b</span>, </span> <span class="parameter" id="myGenericFunction-param-c"><span class="type-annotation">S</span> <span class="parameter-name">c</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -703,7 +703,7 @@ <h2>Functions</h2>
           
 </dd>
         <dt id="paramOfFutureOrNull" class="callable">
-          <span class="name"><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></span><span class="signature">(<wbr><span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;Null&gt;</span></span> <span class="parameter-name">future</span></span>)
+          <span class="name"><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></span><span class="signature">(<wbr><span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span> <span class="parameter-name">future</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -713,7 +713,7 @@ <h2>Functions</h2>
 </dd>
         <dt id="returningFutureVoid" class="callable">
           <span class="name"><a href="fake/returningFutureVoid.html">returningFutureVoid</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;void&gt;</span></span>
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -768,7 +768,7 @@ <h2>Functions</h2>
 </dd>
         <dt id="thisIsFutureOrNull" class="callable">
           <span class="name"><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; FutureOr<span class="signature">&lt;Null&gt;</span></span>
+            <span class="returntype parameter">&#8594; FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -776,8 +776,8 @@ <h2>Functions</h2>
           
 </dd>
         <dt id="thisIsFutureOrT" class="callable">
-          <span class="name"><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; FutureOr<span class="signature">&lt;T&gt;</span></span>
+          <span class="name"><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -794,7 +794,7 @@ <h2>Functions</h2>
           
 </dd>
         <dt id="typeParamOfFutureOr" class="callable">
-          <span class="name"><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></span><span class="signature">&lt;T extends FutureOr<span class="signature">&lt;List&gt;</span>&gt;</span><span class="signature">(<wbr>)
+          <span class="name"><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T extends FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">List</span>&gt;</span></span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -841,7 +841,7 @@ <h2>Typedefs</h2>
           
 </dd>
         <dt id="GenericTypedef" class="callable">
-          <span class="name"><a href="fake/GenericTypedef.html">GenericTypedef</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="GenericTypedef-param-input"><span class="type-annotation">T</span> <span class="parameter-name">input</span></span>)
+          <span class="name"><a href="fake/GenericTypedef.html">GenericTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="GenericTypedef-param-input"><span class="type-annotation">T</span> <span class="parameter-name">input</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
         </dt>
@@ -868,8 +868,8 @@ <h2>Typedefs</h2>
           
 </dd>
         <dt id="NewGenericTypedef" class="callable">
-          <span class="name"><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></span><span class="signature">&lt;T&gt;</span><span class="signature">(<wbr><span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">int</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">bool</span></span>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;S&gt;</span></span>
+          <span class="name"><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">int</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">bool</span></span>)
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
           </span>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/fake/importantComputations.html b/testing/test_package_docs/fake/importantComputations.html
index 5d571b0d0d..0a97dd55d3 100644
--- a/testing/test_package_docs/fake/importantComputations.html
+++ b/testing/test_package_docs/fake/importantComputations.html
@@ -157,7 +157,7 @@ <h5>fake library</h5>
     <h1>importantComputations top-level property</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Map<span class="signature">&lt;int, &gt;</span></span>
+      <span class="returntype">Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic</span>&gt;</span></span>
       <span class="name ">importantComputations</span>
       <div class="features">final</div>
     </section>
diff --git a/testing/test_package_docs/fake/mapWithDynamicKeys.html b/testing/test_package_docs/fake/mapWithDynamicKeys.html
index 6089c0ba2f..74f1a6a5c5 100644
--- a/testing/test_package_docs/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs/fake/mapWithDynamicKeys.html
@@ -157,7 +157,7 @@ <h5>fake library</h5>
     <h1>mapWithDynamicKeys top-level property</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Map<span class="signature">&lt;dynamic, String&gt;</span></span>
+      <span class="returntype">Map<span class="signature">&lt;<wbr><span class="type-parameter">dynamic</span>, <span class="type-parameter">String</span>&gt;</span></span>
       <span class="name ">mapWithDynamicKeys</span>
       <div class="features">read / write</div>
     </section>
diff --git a/testing/test_package_docs/fake/myGenericFunction.html b/testing/test_package_docs/fake/myGenericFunction.html
index 781124cb89..6e38c21ed9 100644
--- a/testing/test_package_docs/fake/myGenericFunction.html
+++ b/testing/test_package_docs/fake/myGenericFunction.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">myGenericFunction&lt;S&gt; function</li>
+    <li class="self-crumb">myGenericFunction&lt;<wbr><span class="type-parameter">S</span>&gt; function</li>
   </ol>
   <div class="self-name">myGenericFunction</div>
   <form class="search navbar-right" role="search">
@@ -154,12 +154,12 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>myGenericFunction&lt;S&gt; function</h1>
+    <h1>myGenericFunction&lt;<wbr><span class="type-parameter">S</span>&gt; function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
         <span class="name ">myGenericFunction</span>
-&lt;S&gt;(<wbr><span class="parameter" id="myGenericFunction-param-a"><span class="type-annotation">int</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="myGenericFunction-param-b"><span class="type-annotation">bool</span> <span class="parameter-name">b</span>, </span> <span class="parameter" id="myGenericFunction-param-c"><span class="type-annotation">S</span> <span class="parameter-name">c</span></span>)
+&lt;<wbr><span class="type-parameter">S</span>&gt;(<wbr><span class="parameter" id="myGenericFunction-param-a"><span class="type-annotation">int</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="myGenericFunction-param-b"><span class="type-annotation">bool</span> <span class="parameter-name">b</span>, </span> <span class="parameter" id="myGenericFunction-param-c"><span class="type-annotation">S</span> <span class="parameter-name">c</span></span>)
     </section>
     <section class="desc markdown">
       <p>A generic function with a type parameter.</p>
diff --git a/testing/test_package_docs/fake/paramOfFutureOrNull.html b/testing/test_package_docs/fake/paramOfFutureOrNull.html
index 8cfadfe1b2..e94e76755c 100644
--- a/testing/test_package_docs/fake/paramOfFutureOrNull.html
+++ b/testing/test_package_docs/fake/paramOfFutureOrNull.html
@@ -159,7 +159,7 @@ <h1>paramOfFutureOrNull function</h1>
     <section class="multi-line-signature">
         <span class="returntype">void</span>
         <span class="name ">paramOfFutureOrNull</span>
-(<wbr><span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;Null&gt;</span></span> <span class="parameter-name">future</span></span>)
+(<wbr><span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span> <span class="parameter-name">future</span></span>)
     </section>
     <section class="desc markdown">
       <p>Has a parameter explicitly typed <code>FutureOr&lt;Null&gt;</code>.</p>
diff --git a/testing/test_package_docs/fake/returningFutureVoid.html b/testing/test_package_docs/fake/returningFutureVoid.html
index 1f1269b9ad..ff6efd6d88 100644
--- a/testing/test_package_docs/fake/returningFutureVoid.html
+++ b/testing/test_package_docs/fake/returningFutureVoid.html
@@ -157,7 +157,7 @@ <h5>fake library</h5>
     <h1>returningFutureVoid function</h1>
 
     <section class="multi-line-signature">
-        <span class="returntype">Future<span class="signature">&lt;void&gt;</span></span>
+        <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
         <span class="name ">returningFutureVoid</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/fake/thisIsFutureOrNull.html b/testing/test_package_docs/fake/thisIsFutureOrNull.html
index e8bffff6ed..505cfb603e 100644
--- a/testing/test_package_docs/fake/thisIsFutureOrNull.html
+++ b/testing/test_package_docs/fake/thisIsFutureOrNull.html
@@ -157,7 +157,7 @@ <h5>fake library</h5>
     <h1>thisIsFutureOrNull function</h1>
 
     <section class="multi-line-signature">
-        <span class="returntype">FutureOr<span class="signature">&lt;Null&gt;</span></span>
+        <span class="returntype">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span>
         <span class="name ">thisIsFutureOrNull</span>
 (<wbr>)
     </section>
diff --git a/testing/test_package_docs/fake/thisIsFutureOrT.html b/testing/test_package_docs/fake/thisIsFutureOrT.html
index a2bcb5bd6f..f0f618f8f6 100644
--- a/testing/test_package_docs/fake/thisIsFutureOrT.html
+++ b/testing/test_package_docs/fake/thisIsFutureOrT.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">thisIsFutureOrT&lt;T&gt; function</li>
+    <li class="self-crumb">thisIsFutureOrT&lt;<wbr><span class="type-parameter">T</span>&gt; function</li>
   </ol>
   <div class="self-name">thisIsFutureOrT</div>
   <form class="search navbar-right" role="search">
@@ -154,12 +154,12 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsFutureOrT&lt;T&gt; function</h1>
+    <h1>thisIsFutureOrT&lt;<wbr><span class="type-parameter">T</span>&gt; function</h1>
 
     <section class="multi-line-signature">
-        <span class="returntype">FutureOr<span class="signature">&lt;T&gt;</span></span>
+        <span class="returntype">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
         <span class="name ">thisIsFutureOrT</span>
-&lt;T&gt;(<wbr>)
+&lt;<wbr><span class="type-parameter">T</span>&gt;(<wbr>)
     </section>
     <section class="desc markdown">
       <p>Explicitly return a <code>FutureOr&lt;T&gt;</code>.</p>
diff --git a/testing/test_package_docs/fake/typeParamOfFutureOr.html b/testing/test_package_docs/fake/typeParamOfFutureOr.html
index 0bc970797e..39858ebcaf 100644
--- a/testing/test_package_docs/fake/typeParamOfFutureOr.html
+++ b/testing/test_package_docs/fake/typeParamOfFutureOr.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li class="self-crumb">typeParamOfFutureOr&lt;T extends FutureOr&lt;List&gt;&gt; function</li>
+    <li class="self-crumb">typeParamOfFutureOr&lt;<wbr><span class="type-parameter">T extends FutureOr&lt;<wbr><span class="type-parameter">List</span>&gt;</span>&gt; function</li>
   </ol>
   <div class="self-name">typeParamOfFutureOr</div>
   <form class="search navbar-right" role="search">
@@ -154,12 +154,12 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>typeParamOfFutureOr&lt;T extends FutureOr&lt;List&gt;&gt; function</h1>
+    <h1>typeParamOfFutureOr&lt;<wbr><span class="type-parameter">T extends FutureOr&lt;<wbr><span class="type-parameter">List</span>&gt;</span>&gt; function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
         <span class="name ">typeParamOfFutureOr</span>
-&lt;T extends FutureOr&lt;List&gt;&gt;(<wbr>)
+&lt;<wbr><span class="type-parameter">T extends FutureOr&lt;<wbr><span class="type-parameter">List</span>&gt;</span>&gt;(<wbr>)
     </section>
     <section class="desc markdown">
       <p>Has a type parameter bound to <code>FutureOr&lt;List&gt;</code>.</p>
diff --git a/testing/test_package_docs/static-assets/styles.css b/testing/test_package_docs/static-assets/styles.css
index ade56f4653..4aab435232 100644
--- a/testing/test_package_docs/static-assets/styles.css
+++ b/testing/test_package_docs/static-assets/styles.css
@@ -359,6 +359,18 @@ dl dt.callable .name {
   white-space: nowrap;
 }
 
+.type-parameter {
+  white-space: nowrap;
+}
+
+.multi-line-signature .type-parameter {
+  display: -webkit-inline-box;
+}
+
+.multi-line-signature .type-parameter .parameter {
+  margin-left: 0px;
+}
+
 .signature {
   color: #727272;
 }
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass-class.html b/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
index 1910f7f506..376eabc9f4 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li class="self-crumb">Whataclass<span class="signature">&lt;T&gt;</span> class</li>
+    <li class="self-crumb">Whataclass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> class</li>
   </ol>
   <div class="self-name">Whataclass</div>
   <form class="search navbar-right" role="search">
@@ -51,7 +51,7 @@ <h5>test_package_imported.main library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Whataclass&lt;T&gt; class</h1>
+    <h1>Whataclass&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
 
     <section class="desc markdown">
       <p>Some docs for whataclass</p>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html b/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html
index d574bb0b13..4e5d3c1b5d 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">Whataclass constructor</li>
   </ol>
   <div class="self-name">Whataclass</div>
@@ -61,11 +61,11 @@ <h5>Whataclass class</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Whataclass&lt;T&gt; constructor</h1>
+    <h1>Whataclass&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
 
     <section class="multi-line-signature">
       
-      <span class="name ">Whataclass&lt;T&gt;</span>(<wbr>)
+      <span class="name ">Whataclass&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html b/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
index f015412839..9d5ac579ee 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">hashCode property</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html b/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html
index 96f77fa44a..e26ddd0e2e 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">noSuchMethod method</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html b/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html
index 9b863eb68a..336e9097fe 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">operator == method</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html b/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
index 5ebac74e09..1a66a5bf11 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">runtimeType property</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html b/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html
index c94e83964f..2172963d6e 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
     <li class="self-crumb">toString method</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
index f83b769685..de4d5e4b2f 100644
--- a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
+++ b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
@@ -66,7 +66,7 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="Whataclass">
-          <span class="name "><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;T&gt;</span></span>
+          <span class="name "><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
         </dt>
         <dd>
           Some docs for whataclass

From e38a6959f59405e0a3738006597fc41a39a9dd56 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 28 Mar 2018 11:22:55 -0700
Subject: [PATCH 6/7] tweak style slightly for complicatedReturn

---
 lib/resources/styles.css                           | 5 +----
 testing/test_package_docs/static-assets/styles.css | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/resources/styles.css b/lib/resources/styles.css
index 4aab435232..bd1d7a18b6 100644
--- a/lib/resources/styles.css
+++ b/lib/resources/styles.css
@@ -363,12 +363,9 @@ dl dt.callable .name {
   white-space: nowrap;
 }
 
-.multi-line-signature .type-parameter {
-  display: -webkit-inline-box;
-}
-
 .multi-line-signature .type-parameter .parameter {
   margin-left: 0px;
+  display: unset;
 }
 
 .signature {
diff --git a/testing/test_package_docs/static-assets/styles.css b/testing/test_package_docs/static-assets/styles.css
index 4aab435232..bd1d7a18b6 100644
--- a/testing/test_package_docs/static-assets/styles.css
+++ b/testing/test_package_docs/static-assets/styles.css
@@ -363,12 +363,9 @@ dl dt.callable .name {
   white-space: nowrap;
 }
 
-.multi-line-signature .type-parameter {
-  display: -webkit-inline-box;
-}
-
 .multi-line-signature .type-parameter .parameter {
   margin-left: 0px;
+  display: unset;
 }
 
 .signature {

From 8e2138f35f201d75f6ab51f3a5b85ee0acdf4747 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 28 Mar 2018 11:51:55 -0700
Subject: [PATCH 7/7] fix crash

---
 lib/src/markdown_processor.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/markdown_processor.dart b/lib/src/markdown_processor.dart
index 6f0f67ef2c..12dda17563 100644
--- a/lib/src/markdown_processor.dart
+++ b/lib/src/markdown_processor.dart
@@ -565,8 +565,8 @@ ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
   }
 
   if (results.length > 1) {
-    if (results.any((r) => r.library.packageName == library.packageName)) {
-      results.removeWhere((r) => r.library.packageName != library.packageName);
+    if (results.any((r) => r.library?.packageName == library.packageName)) {
+      results.removeWhere((r) => r.library?.packageName != library.packageName);
     }
   }