From 9f9f0b9ff5158bcf3de5097d6e2815090e51c1ef Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 5 Dec 2017 07:59:09 -0800
Subject: [PATCH] Cosmetic cleanups for generic types

---
 lib/src/element_type.dart                     | 29 +++++++++++
 lib/src/html/html_generator_instance.dart     |  1 -
 lib/src/html/template_data.dart               |  4 +-
 lib/src/model.dart                            | 37 ++++++++++++--
 lib/templates/_callable.html                  |  2 +-
 lib/templates/_head.html                      |  2 +-
 lib/templates/library.html                    |  2 +-
 test/model_test.dart                          | 38 +++++++--------
 .../test_package_docs/ex/Animal-class.html    |  2 +-
 .../ex/AnotherParameterizedClass-class.html   |  2 +-
 .../AnotherParameterizedClass.html            |  2 +-
 .../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 +-
 testing/test_package_docs/ex/F-class.html     | 12 ++---
 testing/test_package_docs/ex/F/F.html         |  2 +-
 .../ex/F/methodWithGenericParam.html          |  4 +-
 testing/test_package_docs/ex/F/test.html      |  2 +-
 .../ex/ParameterizedClass-class.html          | 16 +++----
 .../ParameterizedClass.html                   |  2 +-
 .../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/TemplatedClass-class.html              |  2 +-
 .../ex/TemplatedClass/TemplatedClass.html     |  2 +-
 .../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          | 28 +++++------
 .../TemplatedInterface.html                   |  2 +-
 .../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  | 10 ++--
 .../getAFunctionReturningBool.html            |  2 +-
 .../getAFunctionReturningVoid.html            |  2 +-
 .../ex/WithGeneric-class.html                 |  2 +-
 .../ex/WithGeneric/WithGeneric.html           |  2 +-
 .../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 |  2 +-
 testing/test_package_docs/ex/ex-library.html  | 24 +++++-----
 .../ClassWithUnusualProperties-class.html     |  4 +-
 .../explicitGetterImplicitSetter.html         |  4 +-
 .../explicitSetter.html                       |  2 +-
 .../test_package_docs/fake/Color-class.html   |  2 +-
 .../fake/ConstructorTester-class.html         |  2 +-
 .../ConstructorTester.fromSomething.html      |  2 +-
 .../ConstructorTester/ConstructorTester.html  |  2 +-
 .../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/ExtraSpecialList-class.html          | 16 +++----
 .../ExtraSpecialList/ExtraSpecialList.html    |  2 +-
 .../fake/HasGenericWithExtends-class.html     |  2 +-
 .../HasGenericWithExtends.html                |  2 +-
 .../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               |  4 +-
 .../fake/HasGenerics/HasGenerics.html         |  2 +-
 .../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/ImplicitProperties-class.html        |  2 +-
 .../explicitGetterImplicitSetter.html         |  2 +-
 .../fake/LongFirstLine-class.html             |  2 +-
 .../fake/NewGenericTypedef.html               |  2 +-
 .../fake/OtherGenericsThing-class.html        |  4 +-
 .../OtherGenericsThing.html                   |  2 +-
 .../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               | 48 +++++++++----------
 .../fake/SpecialList/SpecialList.html         |  2 +-
 .../fake/SpecialList/add.html                 |  2 +-
 .../fake/SpecialList/addAll.html              |  4 +-
 .../fake/SpecialList/any.html                 |  2 +-
 .../fake/SpecialList/asMap.html               |  4 +-
 .../fake/SpecialList/clear.html               |  2 +-
 .../fake/SpecialList/contains.html            |  2 +-
 .../fake/SpecialList/elementAt.html           |  2 +-
 .../fake/SpecialList/every.html               |  2 +-
 .../fake/SpecialList/expand.html              |  6 +--
 .../fake/SpecialList/fillRange.html           |  2 +-
 .../fake/SpecialList/first.html               |  2 +-
 .../fake/SpecialList/firstWhere.html          |  2 +-
 .../fake/SpecialList/fold.html                |  2 +-
 .../fake/SpecialList/forEach.html             |  2 +-
 .../fake/SpecialList/getRange.html            |  4 +-
 .../fake/SpecialList/hashCode.html            |  2 +-
 .../fake/SpecialList/indexOf.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/lastWhere.html           |  2 +-
 .../fake/SpecialList/length.html              |  2 +-
 .../fake/SpecialList/map.html                 |  4 +-
 .../fake/SpecialList/noSuchMethod.html        |  2 +-
 .../fake/SpecialList/operator_equals.html     |  2 +-
 .../fake/SpecialList/operator_get.html        |  2 +-
 .../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/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/SuperAwesomeClass-class.html         |  2 +-
 .../fake/SuperAwesomeClass/powers.html        |  2 +-
 .../test_package_docs/fake/fake-library.html  | 22 ++++-----
 .../fake/mapWithDynamicKeys.html              |  2 +-
 .../Whataclass-class.html                     |  2 +-
 .../Whataclass/Whataclass.html                |  2 +-
 .../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 +-
 186 files changed, 388 insertions(+), 333 deletions(-)

diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
index 08169dacd0..1c8c51590b 100644
--- a/lib/src/element_type.dart
+++ b/lib/src/element_type.dart
@@ -54,16 +54,20 @@ class ElementType extends Privacy {
       if (isParameterizedType) {
         if (!typeArguments.every((t) => t.linkedName == 'dynamic') &&
             typeArguments.isNotEmpty) {
+          buf.write('<span class="signature">');
           buf.write('&lt;');
           buf.writeAll(typeArguments.map((t) => t.linkedName), ', ');
           buf.write('&gt;');
+          buf.write('</span>');
         }
         // Hide parameters if there's a an explicit typedef behind this
         // element, but if there is no typedef, be explicit.
         if (element is ModelFunctionAnonymous) {
+          buf.write('<span class="signature">');
           buf.write('(');
           buf.write(element.linkedParams());
           buf.write(')');
+          buf.write('</span>');
         }
       }
       _linkedName = buf.toString();
@@ -71,6 +75,31 @@ class ElementType extends Privacy {
     return _linkedName;
   }
 
+  String _nameWithGenerics;
+  String get nameWithGenerics {
+    if (_nameWithGenerics == null) {
+      StringBuffer buf = new StringBuffer();
+
+      if (isParameterType) {
+        buf.write(name);
+      } else {
+        buf.write(element.name);
+      }
+
+      // not TypeParameterType or Void or Union type
+      if (isParameterizedType) {
+        if (!typeArguments.every((t) => t.linkedName == 'dynamic') &&
+            typeArguments.isNotEmpty) {
+          buf.write('&lt;');
+          buf.writeAll(typeArguments.map((t) => t.nameWithGenerics), ', ');
+          buf.write('&gt;');
+        }
+      }
+      _nameWithGenerics = buf.toString();
+    }
+    return _nameWithGenerics;
+  }
+
   String get name => _type.name ?? _type.element.name;
 
   ModelElement get returnElement {
diff --git a/lib/src/html/html_generator_instance.dart b/lib/src/html/html_generator_instance.dart
index ad17d9d815..2b956f9011 100644
--- a/lib/src/html/html_generator_instance.dart
+++ b/lib/src/html/html_generator_instance.dart
@@ -104,7 +104,6 @@ class HtmlGeneratorInstance implements HtmlOptions {
     generatePackage();
 
     for (var lib in filterNonDocumented(_package.libraries)) {
-      // if (lib.name != 'extract_messages') continue;
       generateLibrary(_package, lib);
 
       for (var clazz in filterNonDocumented(lib.allClasses)) {
diff --git a/lib/src/html/template_data.dart b/lib/src/html/template_data.dart
index a6047c3853..b6a5d96a55 100644
--- a/lib/src/html/template_data.dart
+++ b/lib/src/html/template_data.dart
@@ -187,8 +187,8 @@ class ClassTemplateData extends TemplateData<Class> {
       '${library.name} library, for the Dart programming language.';
 
   @override
-  String get layoutTitle =>
-      _layoutTitle(clazz.nameWithGenerics, clazz.fullkind, clazz.isDeprecated);
+  String get layoutTitle => _layoutTitle(
+      clazz.nameWithLinkedGenerics, clazz.fullkind, clazz.isDeprecated);
   @override
   List get navLinks => [package, library];
   @override
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 31720e458d..0e9734b124 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -497,7 +497,6 @@ class Class extends ModelElement
       ..addAll([]
         ..addAll(inheritedProperties)
         ..sort(byName));
-
     return _allInstanceProperties;
   }
 
@@ -1133,7 +1132,8 @@ class Constructor extends ModelElement
 
   @override
   // TODO(jcollins-g): Revisit this when dart-lang/sdk#31517 is implemented.
-  List<TypeParameter> get typeParameters => (enclosingElement as Class).typeParameters;
+  List<TypeParameter> get typeParameters =>
+      (enclosingElement as Class).typeParameters;
 
   @override
   ModelElement get enclosingElement =>
@@ -1184,7 +1184,8 @@ class Constructor extends ModelElement
       if (constructorName.isEmpty) {
         _nameWithGenerics = '${enclosingElement.name}${genericParameters}';
       } else {
-        _nameWithGenerics = '${enclosingElement.name}${genericParameters}.$constructorName';
+        _nameWithGenerics =
+            '${enclosingElement.name}${genericParameters}.$constructorName';
       }
     }
     return _nameWithGenerics;
@@ -4709,11 +4710,20 @@ abstract class SourceCodeMixin {
 abstract class TypeParameters implements Nameable {
   String get nameWithGenerics => '$name$genericParameters';
 
+  String get nameWithLinkedGenerics => '$name$linkedGenericParameters';
+
+  bool get hasGenericParameters => typeParameters.isNotEmpty;
+
   String get genericParameters {
     if (typeParameters.isEmpty) return '';
     return '&lt;${typeParameters.map((t) => t.name).join(', ')}&gt;';
   }
 
+  String get linkedGenericParameters {
+    if (typeParameters.isEmpty) return '';
+    return '<span class="signature">&lt;${typeParameters.map((t) => t.linkedName).join(', ')}&gt;</span>';
+  }
+
   List<TypeParameter> get typeParameters;
 }
 
@@ -4860,11 +4870,28 @@ class TypeParameter extends ModelElement {
   @override
   String get kind => 'type parameter';
 
+  ElementType get boundType {
+    var bound = _typeParameter.bound;
+    if (bound != null) {
+      ModelElement boundClass =
+          new ModelElement.fromElement(bound.element, package);
+      return new ElementType(bound, boundClass);
+    }
+    return null;
+  }
+
   @override
   String get name {
     var bound = _typeParameter.bound;
-    return bound != null
-        ? '${_typeParameter.name} extends ${bound.name}'
+    return _typeParameter.bound != null
+        ? '${_typeParameter.name} extends ${boundType.nameWithGenerics}'
+        : _typeParameter.name;
+  }
+
+  @override
+  String get linkedName {
+    return _typeParameter.bound != null
+        ? '${_typeParameter.name} extends ${boundType.linkedName}'
         : _typeParameter.name;
   }
 
diff --git a/lib/templates/_callable.html b/lib/templates/_callable.html
index 054068ad3c..08ebd5f2a0 100644
--- a/lib/templates/_callable.html
+++ b/lib/templates/_callable.html
@@ -1,5 +1,5 @@
 <dt id="{{htmlId}}" class="callable{{ #isInherited }} inherited{{ /isInherited}}">
-  <span class="name{{#isDeprecated}} deprecated{{/isDeprecated}}">{{{linkedName}}}</span><span class="signature">{{{genericParameters}}}(<wbr>{{{ linkedParamsNoMetadata }}})
+  <span class="name{{#isDeprecated}} deprecated{{/isDeprecated}}">{{{linkedName}}}</span>{{{linkedGenericParameters}}}<span class="signature">(<wbr>{{{ linkedParamsNoMetadata }}})
     <span class="returntype parameter">&#8594; {{{ linkedReturnType }}}</span>
   </span>
 </dt>
diff --git a/lib/templates/_head.html b/lib/templates/_head.html
index 9f7496c7b8..7c4882eb96 100644
--- a/lib/templates/_head.html
+++ b/lib/templates/_head.html
@@ -38,7 +38,7 @@
     <li><a href="{{href}}">{{name}}</a></li>
     {{/navLinks}}
     {{#navLinksWithGenerics}}
-    <li><a href="{{href}}">{{name}}{{{genericParameters}}}</a></li>
+    <li><a href="{{href}}">{{name}}{{#hasGenericParameters}}<span class="signature">{{{genericParameters}}}</span>{{/hasGenericParameters}}</a></li>
     {{/navLinksWithGenerics}}
     {{^hasHomepage}}
     <li class="self-crumb">{{{ layoutTitle }}}</li>
diff --git a/lib/templates/library.html b/lib/templates/library.html
index 12c37e4a42..fdf7b34ddb 100644
--- a/lib/templates/library.html
+++ b/lib/templates/library.html
@@ -36,7 +36,7 @@ <h2>Classes</h2>
       <dl>
         {{#library.publicClasses}}
         <dt id="{{htmlId}}">
-          <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}</span>
+          <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}{{{linkedGenericParameters}}}</span>
         </dt>
         <dd>
           {{{ oneLineDoc }}}
diff --git a/test/model_test.dart b/test/model_test.dart
index 13fb1cef45..873b433792 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -1086,21 +1086,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&lt;int&gt;</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;int&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>&lt;Stream&lt;List&lt;int&gt;&gt;&gt;');
+          '<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>');
     });
 
     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>&lt;List&lt;int&gt;&gt;');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
     });
 
     test(
@@ -1110,7 +1110,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>&lt;Map&lt;A, List&lt;String&gt;&gt;&gt;');
+          '<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>');
     });
 
     test(
@@ -1120,7 +1120,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>&lt;List&lt;int&gt;&gt;');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
     });
 
     test(
@@ -1130,11 +1130,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>&lt;List&lt;int&gt;&gt;');
+          '<a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</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>&lt;List&lt;int&gt;&gt;</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;List<span class="signature">&lt;int&gt;</span>&gt;</span></span></span>');
     });
 
     test(
@@ -1143,7 +1143,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>&lt;List&lt;int&gt;&gt;');
+          '<a href=\"ex/AnotherParameterizedClass-class.html\">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
     });
 
     test(
@@ -1152,7 +1152,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>&lt;List&lt;int&gt;&gt;');
+          '<a href=\"ex/AnotherParameterizedClass-class.html\">AnotherParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
     });
 
     test(
@@ -1162,7 +1162,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>&lt;List&lt;String&gt;&gt;');
+          '<a href=\"ex/ParameterizedTypedef.html\">ParameterizedTypedef</a><span class="signature">&lt;List<span class="signature">&lt;String&gt;</span>&gt;</span>');
     });
 
     test(
@@ -1172,7 +1172,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>&lt;List&lt;int&gt;&gt;');
+          '<a href=\"ex/ParameterizedTypedef.html\">ParameterizedTypedef</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
     });
 
     test('parameterized types for inherited operator is correctly displayed',
@@ -1181,9 +1181,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>&lt;List&lt;int&gt;&gt;');
+          '<a href=\"ex/ParameterizedClass-class.html\">ParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span>');
       expect(aInheritedAdditionOperator.linkedParams(),
-          '<span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a>&lt;List&lt;int&gt;&gt;</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;List<span class="signature">&lt;int&gt;</span>&gt;</span></span> <span class="parameter-name">other</span></span>');
     });
 
     test('', () {});
@@ -1249,7 +1249,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           getAFunctionReturningVoid.linkedReturnType,
           equals(
-              'Function(<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>)'));
+              '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(
@@ -1258,7 +1258,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           getAFunctionReturningBool.linkedReturnType,
           equals(
-              'Function&lt;T4&gt;(<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>)'));
+              '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', () {
@@ -1332,7 +1332,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('parameter has generics in signature', () {
       expect(testGeneric.parameters[0].modelType.linkedName,
-          'Map&lt;String, dynamic&gt;');
+          'Map<span class="signature">&lt;String, dynamic&gt;</span>');
     });
 
     test('parameter is a function', () {
@@ -1738,7 +1738,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           fieldWithTypedef.linkedReturnType,
           equals(
-              '<a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a>&lt;bool&gt;'));
+              '<a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;bool&gt;</span>'));
     });
   });
 
@@ -2009,7 +2009,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           aComplexTypedef.linkedReturnType,
           equals(
-              'Function(<span class="parameter" id="-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A3</span></span>)'));
+              'Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A3</span></span>)</span>'));
       expect(
           aComplexTypedef.linkedParamsLines,
           equals(
@@ -2034,7 +2034,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('linked return type', () {
       expect(t.linkedReturnType, equals('String'));
-      expect(generic.linkedReturnType, equals('List&lt;S&gt;'));
+      expect(generic.linkedReturnType, equals('List<span class="signature">&lt;S&gt;</span>'));
     });
 
     test("name with generics", () {
diff --git a/testing/test_package_docs/ex/Animal-class.html b/testing/test_package_docs/ex/Animal-class.html
index 355810ce8d..298206ea62 100644
--- a/testing/test_package_docs/ex/Animal-class.html
+++ b/testing/test_package_docs/ex/Animal-class.html
@@ -154,7 +154,7 @@ <h2>Constants</h2>
         </dd>
         <dt id="values" class="constant">
           <span class="name ">values</span>
-          <span class="signature">&#8594; List&lt;<a href="ex/Animal-class.html">Animal</a>&gt;</span>
+          <span class="signature">&#8594; List<span class="signature">&lt;<a href="ex/Animal-class.html">Animal</a>&gt;</span></span>
         </dt>
         <dd>
           <p>A constant List of the values in this enum, in order of their declaration.</p>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass-class.html b/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
index 336e490c4e..cb5faee1f5 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">class AnotherParameterizedClass&lt;B&gt;</li>
+    <li class="self-crumb">class AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></li>
   </ol>
   <div class="self-name">AnotherParameterizedClass</div>
   <form class="search navbar-right" role="search">
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html b/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
index 7409469278..7cf367104e 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&lt;B&gt;</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
     <li class="self-crumb">constructor AnotherParameterizedClass</li>
   </ol>
   <div class="self-name">AnotherParameterizedClass</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html b/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
index fada71fe23..e22795b767 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&lt;B&gt;</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 92e7671b05..574ea88b2d 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&lt;B&gt;</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 092ac6dc8b..7e63c520d3 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&lt;B&gt;</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 4357ebf61d..b99c520767 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&lt;B&gt;</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 fabac39de6..d0c7651240 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&lt;B&gt;</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass<span class="signature">&lt;B&gt;</span></a></li>
     <li class="self-crumb">method toString</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 16743a275c..219b0bcf6f 100644
--- a/testing/test_package_docs/ex/Apple-class.html
+++ b/testing/test_package_docs/ex/Apple-class.html
@@ -153,7 +153,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>&lt;bool&gt;</span>
+          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;bool&gt;</span></span>
         </dt>
         <dd>
           fieldWithTypedef docs here
@@ -243,7 +243,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&lt;<a href="test_package_imported.main/Whataclass-class.html">Whataclass</a>&lt;bool&gt;&gt;</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;<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="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 a91d0df1a9..1645743235 100644
--- a/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
+++ b/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
@@ -77,7 +77,7 @@ <h5>class Apple</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a>&lt;bool&gt;</span>
+          <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;bool&gt;</span></span>
           <span class="name ">fieldWithTypedef</span>          <div class="features">final</div>
         </section>
         <section class="desc markdown">
diff --git a/testing/test_package_docs/ex/Apple/whataclass.html b/testing/test_package_docs/ex/Apple/whataclass.html
index 53be6ceb1f..0716b8d322 100644
--- a/testing/test_package_docs/ex/Apple/whataclass.html
+++ b/testing/test_package_docs/ex/Apple/whataclass.html
@@ -78,7 +78,7 @@ <h5>class Apple</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <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&lt;<a href="test_package_imported.main/Whataclass-class.html">Whataclass</a>&lt;bool&gt;&gt;</span> <span class="parameter-name">list</span></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>)
     </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 346e8e5c0b..a864a7ebed 100644
--- a/testing/test_package_docs/ex/B-class.html
+++ b/testing/test_package_docs/ex/B-class.html
@@ -169,7 +169,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&lt;String&gt;</span>
+          <span class="signature">&#8596; List<span class="signature">&lt;String&gt;</span></span>
         </dt>
         <dd>
           A list of Strings
@@ -185,7 +185,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>&lt;bool&gt;</span>
+          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;bool&gt;</span></span>
         </dt>
         <dd class="inherited">
           fieldWithTypedef docs here
@@ -312,7 +312,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&lt;<a href="test_package_imported.main/Whataclass-class.html">Whataclass</a>&lt;bool&gt;&gt;</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;<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="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 f7b6c6b637..7441f56c30 100644
--- a/testing/test_package_docs/ex/B/list.html
+++ b/testing/test_package_docs/ex/B/list.html
@@ -78,7 +78,7 @@ <h5>class B</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
         <section class="multi-line-signature">
-          <span class="returntype">List&lt;String&gt;</span>
+          <span class="returntype">List<span class="signature">&lt;String&gt;</span></span>
           <span class="name ">list</span>          <div class="features">read / write</div>
         </section>
         <section class="desc markdown">
diff --git a/testing/test_package_docs/ex/Dog-class.html b/testing/test_package_docs/ex/Dog-class.html
index edd49a7f5f..c003251a8c 100644
--- a/testing/test_package_docs/ex/Dog-class.html
+++ b/testing/test_package_docs/ex/Dog-class.html
@@ -269,7 +269,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&lt;<a href="ex/Dog-class.html">Dog</a>&gt;</span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<a href="ex/Dog-class.html">Dog</a>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -278,7 +278,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&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -286,7 +286,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&lt;String, dynamic&gt;</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;String, dynamic&gt;</span></span> <span class="parameter-name">args</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -295,7 +295,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;(<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;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="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 a325da8cd5..f97cc6e3e7 100644
--- a/testing/test_package_docs/ex/Dog/getAnotherClassD.html
+++ b/testing/test_package_docs/ex/Dog/getAnotherClassD.html
@@ -93,7 +93,7 @@ <h5>class Dog</h5>
           <li>@<a href="ex/Deprecated-class.html">Deprecated</a>(&#39;before v27.3&#39;)</li>
         </ol>
       </div>
-      <span class="returntype">List&lt;<a href="ex/Dog-class.html">Dog</a>&gt;</span>
+      <span class="returntype">List<span class="signature">&lt;<a href="ex/Dog-class.html">Dog</a>&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 d5060a52ac..79b12e3589 100644
--- a/testing/test_package_docs/ex/Dog/getClassA.html
+++ b/testing/test_package_docs/ex/Dog/getClassA.html
@@ -93,7 +93,7 @@ <h5>class Dog</h5>
           <li>@deprecated</li>
         </ol>
       </div>
-      <span class="returntype">List&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span>
+      <span class="returntype">List<span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&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 1ab9bfc2ec..de1cac47da 100644
--- a/testing/test_package_docs/ex/Dog/testGeneric.html
+++ b/testing/test_package_docs/ex/Dog/testGeneric.html
@@ -89,7 +89,7 @@ <h5>class Dog</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <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&lt;String, dynamic&gt;</span> <span class="parameter-name">args</span></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>)
     </section>
     
     
diff --git a/testing/test_package_docs/ex/F-class.html b/testing/test_package_docs/ex/F-class.html
index e42b7795f4..9f8d30ad9c 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">class F&lt;T extends String&gt;</li>
+    <li class="self-crumb">class F<span class="signature">&lt;T extends String&gt;</span></li>
   </ol>
   <div class="self-name">F</div>
   <form class="search navbar-right" role="search">
@@ -228,7 +228,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&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</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;<a href="ex/Apple-class.html">Apple</a>&gt;</span></span> <span class="parameter-name">msgs</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -256,7 +256,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&lt;<a href="ex/Dog-class.html">Dog</a>&gt;</span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<a href="ex/Dog-class.html">Dog</a>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -265,7 +265,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&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -291,7 +291,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&lt;String, dynamic&gt;</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;String, dynamic&gt;</span></span> <span class="parameter-name">args</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -300,7 +300,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;(<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;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="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 76a4e59451..9657cd34f8 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&lt;T extends String&gt;</a></li>
+    <li><a href="ex/F-class.html">F<span class="signature">&lt;T extends String&gt;</span></a></li>
     <li class="self-crumb">constructor F</li>
   </ol>
   <div class="self-name">F</div>
diff --git a/testing/test_package_docs/ex/F/methodWithGenericParam.html b/testing/test_package_docs/ex/F/methodWithGenericParam.html
index abbea8037a..2b061637e4 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&lt;T extends String&gt;</a></li>
+    <li><a href="ex/F-class.html">F<span class="signature">&lt;T extends String&gt;</span></a></li>
     <li class="self-crumb">method methodWithGenericParam</li>
   </ol>
   <div class="self-name">methodWithGenericParam</div>
@@ -82,7 +82,7 @@ <h5>class F</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <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&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</span> <span class="parameter-name">msgs</span></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> ])
     </section>
     
     
diff --git a/testing/test_package_docs/ex/F/test.html b/testing/test_package_docs/ex/F/test.html
index c27bc877d5..8cd35daa01 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&lt;T extends String&gt;</a></li>
+    <li><a href="ex/F-class.html">F<span class="signature">&lt;T extends String&gt;</span></a></li>
     <li class="self-crumb">method test</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 f93796ef2f..79cf676e44 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">abstract class ParameterizedClass&lt;T&gt;</li>
+    <li class="self-crumb">abstract class ParameterizedClass<span class="signature">&lt;T&gt;</span></li>
   </ol>
   <div class="self-name">ParameterizedClass</div>
   <form class="search navbar-right" role="search">
@@ -144,7 +144,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>&lt;T&gt;</span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
         </dt>
         <dd>
           
@@ -152,7 +152,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>&lt;T&gt;</span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
         </dt>
         <dd>
           
@@ -160,7 +160,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>&lt;T&gt;</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;T&gt;</span></span></span></span>
         </dt>
         <dd>
           
@@ -190,7 +190,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>&lt;T&gt;</span>
+            <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -199,7 +199,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>&lt;T&gt;</span>
+            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;T&gt;</span></span>
           </span>
         </dt>
         <dd>
@@ -231,8 +231,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>&lt;T&gt;</span> <span class="parameter-name">other</span></span>)
-            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a>&lt;T&gt;</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;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>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html b/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
index 1ee62f1c8b..9c26759132 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">constructor ParameterizedClass</li>
   </ol>
   <div class="self-name">ParameterizedClass</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
index 7185d3a1a6..89b84357b2 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property aInheritedField</li>
   </ol>
   <div class="self-name">aInheritedField</div>
@@ -68,7 +68,7 @@ <h5>class ParameterizedClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a>&lt;T&gt;</span>
+          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&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 8fbe0925ec..22a45877fe 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property aInheritedGetter</li>
   </ol>
   <div class="self-name">aInheritedGetter</div>
@@ -71,7 +71,7 @@ <h5>class ParameterizedClass</h5>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a>&lt;T&gt;</span>
+          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&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 41a37ae950..aced2d07ef 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">abstract method aInheritedMethod</li>
   </ol>
   <div class="self-name">aInheritedMethod</div>
@@ -68,7 +68,7 @@ <h5>class ParameterizedClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a>&lt;T&gt;</span>
+      <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;T&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 51d1400648..c0a9396c22 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property aInheritedSetter</li>
   </ol>
   <div class="self-name">aInheritedSetter</div>
@@ -73,7 +73,7 @@ <h5>class ParameterizedClass</h5>
         
         <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>&lt;T&gt;</span> <span class="parameter-name">thingToSet</span></span>)</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>
           
 </section>
         
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
index 05db9d17c9..d506f620be 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">abstract method aInheritedTypedefReturningMethod</li>
   </ol>
   <div class="self-name">aInheritedTypedefReturningMethod</div>
@@ -68,7 +68,7 @@ <h5>class ParameterizedClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a>&lt;T&gt;</span>
+      <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;T&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 a1c3a5265c..c1d1df5649 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 71e755d551..b20d4bb063 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 0095a22376..ed049378eb 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 8978fda8b1..0d4a1c8f0c 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">abstract method operator +</li>
   </ol>
   <div class="self-name">operator +</div>
@@ -68,8 +68,8 @@ <h5>class ParameterizedClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a>&lt;T&gt;</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>&lt;T&gt;</span> <span class="parameter-name">other</span></span>)
+      <span class="returntype"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;T&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>)
     </section>
     
     
diff --git a/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html b/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
index d9b84f5cd2..41d83ee14c 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 b9b6342bd9..610dc0c8fa 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&lt;T&gt;</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass-class.html b/testing/test_package_docs/ex/TemplatedClass-class.html
index a488bc76a9..818bc69288 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">class TemplatedClass&lt;X&gt;</li>
+    <li class="self-crumb">class TemplatedClass<span class="signature">&lt;X&gt;</span></li>
   </ol>
   <div class="self-name">TemplatedClass</div>
   <form class="search navbar-right" role="search">
diff --git a/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html b/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
index 01980384d5..1765d68427 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&lt;X&gt;</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
     <li class="self-crumb">constructor TemplatedClass</li>
   </ol>
   <div class="self-name">TemplatedClass</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/aMethod.html b/testing/test_package_docs/ex/TemplatedClass/aMethod.html
index 75c13db711..8be67840a7 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&lt;X&gt;</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
     <li class="self-crumb">method aMethod</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 f4d63769a5..5e934d8878 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&lt;X&gt;</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 24c54121ff..c52f1e4c3c 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&lt;X&gt;</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 71962e1975..d3133b0d11 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&lt;X&gt;</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 263da3905c..9cbf08b1aa 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&lt;X&gt;</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 b7dfb3ba18..505589d97b 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&lt;X&gt;</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass<span class="signature">&lt;X&gt;</span></a></li>
     <li class="self-crumb">method toString</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 9833ac3879..3e4da70870 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">abstract class TemplatedInterface&lt;A&gt;</li>
+    <li class="self-crumb">abstract class TemplatedInterface<span class="signature">&lt;A&gt;</span></li>
   </ol>
   <div class="self-name">TemplatedInterface</div>
   <form class="search navbar-right" role="search">
@@ -118,7 +118,7 @@ <h5>library ex</h5>
         <dt>Implements</dt>
         <dd>
           <ul class="comma-separated clazz-relationships">
-            <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a>&lt;List&lt;int&gt;&gt;</li>
+            <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;List<span class="signature">&lt;int&gt;</span>&gt;</span></li>
           </ul>
         </dd>
 
@@ -146,7 +146,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>&lt;Stream&lt;List&lt;int&gt;&gt;&gt;</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>
         </dt>
         <dd>
           
@@ -154,7 +154,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>&lt;Map&lt;A, List&lt;String&gt;&gt;&gt;</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>
         </dt>
         <dd>
           
@@ -162,7 +162,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>&lt;List&lt;bool&gt;&gt;</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;List<span class="signature">&lt;bool&gt;</span>&gt;</span></span></span></span>
         </dt>
         <dd>
           
@@ -170,7 +170,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>&lt;List&lt;int&gt;&gt;</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>
         </dt>
         <dd class="inherited">
           
@@ -178,7 +178,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>&lt;List&lt;int&gt;&gt;</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>
         </dt>
         <dd class="inherited">
           
@@ -186,7 +186,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>&lt;List&lt;int&gt;&gt;</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;List<span class="signature">&lt;int&gt;</span>&gt;</span></span></span></span>
         </dt>
         <dd class="inherited">
           
@@ -216,7 +216,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>&lt;List&lt;int&gt;&gt;</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>
         </dt>
         <dd>
@@ -225,7 +225,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>&lt;List&lt;String&gt;&gt;</span>
+            <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>
         </dt>
         <dd>
@@ -234,7 +234,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>&lt;List&lt;int&gt;&gt;</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>
         </dt>
         <dd class="inherited">
@@ -243,7 +243,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>&lt;List&lt;int&gt;&gt;</span>
+            <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>
         </dt>
         <dd class="inherited">
@@ -275,8 +275,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>&lt;List&lt;int&gt;&gt;</span> <span class="parameter-name">other</span></span>)
-            <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a>&lt;List&lt;int&gt;&gt;</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;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>
         </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 96929013fa..5b5de7db9d 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&lt;A&gt;</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">constructor TemplatedInterface</li>
   </ol>
   <div class="self-name">TemplatedInterface</div>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aField.html b/testing/test_package_docs/ex/TemplatedInterface/aField.html
index d3ac180de3..a9027ac3e3 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&lt;A&gt;</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">property aField</li>
   </ol>
   <div class="self-name">aField</div>
@@ -73,7 +73,7 @@ <h5>class TemplatedInterface</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a>&lt;Stream&lt;List&lt;int&gt;&gt;&gt;</span>
+          <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="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 53f36a45b9..e249ca4216 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&lt;A&gt;</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">property aGetter</li>
   </ol>
   <div class="self-name">aGetter</div>
@@ -76,7 +76,7 @@ <h5>class TemplatedInterface</h5>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a>&lt;Map&lt;A, List&lt;String&gt;&gt;&gt;</span>
+          <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="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 699db3d46b..927925a49a 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&lt;A&gt;</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">abstract method aMethodInterface</li>
   </ol>
   <div class="self-name">aMethodInterface</div>
@@ -73,7 +73,7 @@ <h5>class TemplatedInterface</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a>&lt;List&lt;int&gt;&gt;</span>
+      <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="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 bdda8219ee..76cb7e83cf 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&lt;A&gt;</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">property aSetter</li>
   </ol>
   <div class="self-name">aSetter</div>
@@ -78,7 +78,7 @@ <h5>class TemplatedInterface</h5>
         
         <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>&lt;List&lt;bool&gt;&gt;</span> <span class="parameter-name">thingToSet</span></span>)</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>
           
 </section>
         
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html b/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
index fd0a23a6db..0c003eefe4 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&lt;A&gt;</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">abstract method aTypedefReturningMethodInterface</li>
   </ol>
   <div class="self-name">aTypedefReturningMethodInterface</div>
@@ -73,7 +73,7 @@ <h5>class TemplatedInterface</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a>&lt;List&lt;String&gt;&gt;</span>
+      <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="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 50ede10e98..00e5049ed3 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
@@ -153,7 +153,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;(<wbr>)
+          <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="returntype parameter">&#8594; <a href="ex/aComplexTypedef.html">aComplexTypedef</a></span>
           </span>
         </dt>
@@ -162,8 +162,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;(<wbr>)
-            <span class="returntype parameter">&#8594; Function&lt;T4&gt;(<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 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>
         </dt>
         <dd>
@@ -172,8 +172,8 @@ <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;(<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="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 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>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
index 80daee63a7..9481cec858 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html
@@ -65,7 +65,7 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Function&lt;T4&gt;(<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 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="name ">getAFunctionReturningBool</span>&lt;T1, T2, T3&gt;(<wbr>)
     </section>
     <section class="desc markdown">
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
index 001d6e12f5..245e39e26d 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html
@@ -65,7 +65,7 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Function(<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 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="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>
     <section class="desc markdown">
diff --git a/testing/test_package_docs/ex/WithGeneric-class.html b/testing/test_package_docs/ex/WithGeneric-class.html
index e522063ab4..a832a10053 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">class WithGeneric&lt;T&gt;</li>
+    <li class="self-crumb">class WithGeneric<span class="signature">&lt;T&gt;</span></li>
   </ol>
   <div class="self-name">WithGeneric</div>
   <form class="search navbar-right" role="search">
diff --git a/testing/test_package_docs/ex/WithGeneric/WithGeneric.html b/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
index 0cfa1e0f32..a3ad3fd4b9 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&lt;T&gt;</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">constructor WithGeneric</li>
   </ol>
   <div class="self-name">WithGeneric</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/hashCode.html b/testing/test_package_docs/ex/WithGeneric/hashCode.html
index 38f7cee29c..311154f642 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&lt;T&gt;</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 ffa56655e8..8abc9166ba 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&lt;T&gt;</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 a437900952..59a268ffa0 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&lt;T&gt;</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 a3db777ca5..1ee4f047d3 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&lt;T&gt;</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property prop</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 5eed01c037..767bc5d238 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&lt;T&gt;</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 955f7ae64c..4ced662115 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&lt;T&gt;</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">method toString</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 f1adb5c6c7..434f04ab2c 100644
--- a/testing/test_package_docs/ex/WithGenericSub-class.html
+++ b/testing/test_package_docs/ex/WithGenericSub-class.html
@@ -114,7 +114,7 @@ <h5>library ex</h5>
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li><a href="ex/WithGeneric-class.html">WithGeneric</a>&lt;<a href="ex/Apple-class.html">Apple</a>&gt;</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>WithGenericSub</li>
         </ul></dd>
 
diff --git a/testing/test_package_docs/ex/aComplexTypedef.html b/testing/test_package_docs/ex/aComplexTypedef.html
index b231f6bea0..aa76d50fa6 100644
--- a/testing/test_package_docs/ex/aComplexTypedef.html
+++ b/testing/test_package_docs/ex/aComplexTypedef.html
@@ -109,7 +109,7 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="returntype">Function(<span class="parameter" id="-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A3</span></span>)</span>
+        <span class="returntype">Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="-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 605c8ce9ab..1eb0c5875f 100644
--- a/testing/test_package_docs/ex/ex-library.html
+++ b/testing/test_package_docs/ex/ex-library.html
@@ -64,7 +64,7 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="AnotherParameterizedClass">
-          <span class="name "><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></span>
+          <span class="name "><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;B&gt;</span></span>
         </dt>
         <dd>
           
@@ -136,7 +136,7 @@ <h2>Classes</h2>
           
         </dd>
         <dt id="F">
-          <span class="name "><a href="ex/F-class.html">F</a></span>
+          <span class="name "><a href="ex/F-class.html">F</a><span class="signature">&lt;T extends String&gt;</span></span>
         </dt>
         <dd>
           
@@ -168,7 +168,7 @@ <h2>Classes</h2>
           A class
         </dd>
         <dt id="ParameterizedClass">
-          <span class="name "><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></span>
+          <span class="name "><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;T&gt;</span></span>
         </dt>
         <dd>
           Support class to test inheritance + type expansion from implements clause.
@@ -205,13 +205,13 @@ <h2>Classes</h2>
 that has some operators
         </dd>
         <dt id="TemplatedClass">
-          <span class="name "><a href="ex/TemplatedClass-class.html">TemplatedClass</a></span>
+          <span class="name "><a href="ex/TemplatedClass-class.html">TemplatedClass</a><span class="signature">&lt;X&gt;</span></span>
         </dt>
         <dd>
           
         </dd>
         <dt id="TemplatedInterface">
-          <span class="name "><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a></span>
+          <span class="name "><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a><span class="signature">&lt;A&gt;</span></span>
         </dt>
         <dd>
           Class for testing expansion of type from implements clause.
@@ -223,7 +223,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>
+          <span class="name "><a href="ex/WithGeneric-class.html">WithGeneric</a><span class="signature">&lt;T&gt;</span></span>
         </dt>
         <dd>
           
@@ -331,7 +331,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; List&lt;String&gt;</span>
+          <span class="signature">&#8594; List<span class="signature">&lt;String&gt;</span></span>
         </dt>
         <dd>
           
@@ -404,7 +404,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;(<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;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="returntype parameter">&#8594; T</span>
           </span>
         </dt>
@@ -434,8 +434,8 @@ <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">(<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="parameter" id="-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A3</span></span>)</span>
+          <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="-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="-param-"><span class="type-annotation">A3</span></span>)</span></span>
           </span>
         </dt>
         <dd>
@@ -443,7 +443,7 @@ <h2>Typedefs</h2>
           
 </dd>
         <dt id="ParameterizedTypedef" class="callable">
-          <span class="name"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a></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;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="returntype parameter">&#8594; String</span>
           </span>
         </dt>
@@ -452,7 +452,7 @@ <h2>Typedefs</h2>
           
 </dd>
         <dt id="processMessage" class="callable">
-          <span class="name"><a href="ex/processMessage.html">processMessage</a></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;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="returntype parameter">&#8594; String</span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
index 72de83aa1a..f2e8b27478 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
@@ -184,7 +184,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&lt;int&gt;</span>
+          <span class="signature">&#8596; List<span class="signature">&lt;int&gt;</span></span>
         </dt>
         <dd>
           Getter doc for explicitGetterImplicitSetter
@@ -208,7 +208,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&lt;int&gt;</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;int&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 523123238f..a7837b05b9 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
@@ -78,7 +78,7 @@ <h5>class ClassWithUnusualProperties</h5>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype">List&lt;int&gt;</span>
+          <span class="returntype">List<span class="signature">&lt;int&gt;</span></span>
           <span class="name ">explicitGetterImplicitSetter</span>  
 </section>
         
@@ -92,7 +92,7 @@ <h5>class ClassWithUnusualProperties</h5>
         
         <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&lt;int&gt;</span> <span class="parameter-name">_explicitGetterImplicitSetter</span></span>)</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>
           <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 f389b9db94..4ed3c7e2c1 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
@@ -80,7 +80,7 @@ <h5>class ClassWithUnusualProperties</h5>
         
         <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&lt;int&gt;</span> <span class="parameter-name">macTruck</span></span>)</span>)</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>
           
 </section>
         
diff --git a/testing/test_package_docs/fake/Color-class.html b/testing/test_package_docs/fake/Color-class.html
index 2749819d28..09a9f31f6e 100644
--- a/testing/test_package_docs/fake/Color-class.html
+++ b/testing/test_package_docs/fake/Color-class.html
@@ -196,7 +196,7 @@ <h2>Constants</h2>
         </dd>
         <dt id="values" class="constant">
           <span class="name ">values</span>
-          <span class="signature">&#8594; List&lt;<a href="fake/Color-class.html">Color</a>&gt;</span>
+          <span class="signature">&#8594; List<span class="signature">&lt;<a href="fake/Color-class.html">Color</a>&gt;</span></span>
         </dt>
         <dd>
           <p>A constant List of the values in this enum, in order of their declaration.</p>
diff --git a/testing/test_package_docs/fake/ConstructorTester-class.html b/testing/test_package_docs/fake/ConstructorTester-class.html
index 3a46ab69d7..fa366f6b29 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">class ConstructorTester&lt;A, B&gt;</li>
+    <li class="self-crumb">class ConstructorTester<span class="signature">&lt;A, B&gt;</span></li>
   </ol>
   <div class="self-name">ConstructorTester</div>
   <form class="search navbar-right" role="search">
diff --git a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html
index 49a53c81e6..6f48e2afe2 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&lt;A, B&gt;</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
     <li class="self-crumb">constructor ConstructorTester.fromSomething</li>
   </ol>
   <div class="self-name">ConstructorTester.fromSomething</div>
diff --git a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html
index deddd64e3c..60b78882de 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&lt;A, B&gt;</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
     <li class="self-crumb">constructor ConstructorTester</li>
   </ol>
   <div class="self-name">ConstructorTester</div>
diff --git a/testing/test_package_docs/fake/ConstructorTester/hashCode.html b/testing/test_package_docs/fake/ConstructorTester/hashCode.html
index 765ebb103c..f133a7c3c4 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&lt;A, B&gt;</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 af4ee84ac0..8fc486cdd4 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&lt;A, B&gt;</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 eec0667af0..f93f1f6581 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&lt;A, B&gt;</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 5945b099c8..dfdcd9c526 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&lt;A, B&gt;</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 358d72daa5..ac333d43e5 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&lt;A, B&gt;</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester<span class="signature">&lt;A, B&gt;</span></a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index e74fc88f6f..f859eec336 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">class ExtraSpecialList&lt;E&gt;</li>
+    <li class="self-crumb">class ExtraSpecialList<span class="signature">&lt;E&gt;</span></li>
   </ol>
   <div class="self-name">ExtraSpecialList</div>
   <form class="search navbar-right" role="search">
@@ -137,7 +137,7 @@ <h5>library fake</h5>
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li>ListBase&lt;E&gt;</li>
+          <li>ListBase<span class="signature">&lt;E&gt;</span></li>
           <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
           <li>ExtraSpecialList</li>
         </ul></dd>
@@ -280,7 +280,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&lt;int, dynamic&gt;</span>
+            <span class="returntype parameter">&#8594; Map<span class="signature">&lt;int, dynamic&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -324,8 +324,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;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable&lt;T&gt;</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&lt;T&gt;</span>
+          <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>
         </dt>
         <dd class="inherited">
@@ -351,7 +351,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;(<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;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="returntype parameter">&#8594; T</span>
           </span>
         </dt>
@@ -432,8 +432,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;(<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&lt;T&gt;</span>
+          <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>
         </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 b5af60dba8..13d7be4357 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&lt;E&gt;</a></li>
+    <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">constructor ExtraSpecialList</li>
   </ol>
   <div class="self-name">ExtraSpecialList</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends-class.html b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
index 58dee2c272..f7b9da1d0b 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">class HasGenericWithExtends&lt;T extends Foo2&gt;</li>
+    <li class="self-crumb">class HasGenericWithExtends<span class="signature">&lt;T extends <a href="fake/Foo2-class.html">Foo2</a>&gt;</span></li>
   </ol>
   <div class="self-name">HasGenericWithExtends</div>
   <form class="search navbar-right" role="search">
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html b/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
index 139ab2f836..bbb115d206 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&lt;T extends Foo2&gt;</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
     <li class="self-crumb">constructor HasGenericWithExtends</li>
   </ol>
   <div class="self-name">HasGenericWithExtends</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html b/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
index 4ff739f9ca..1741da0095 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&lt;T extends Foo2&gt;</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 676c420980..a352135a36 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&lt;T extends Foo2&gt;</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 c3caee68f5..e47099012b 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&lt;T extends Foo2&gt;</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 51083750a1..86c0bcf24e 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&lt;T extends Foo2&gt;</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 901c5803b2..f78526776c 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&lt;T extends Foo2&gt;</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends<span class="signature">&lt;T extends Foo2&gt;</span></a></li>
     <li class="self-crumb">method toString</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 4128e01365..e303db46ac 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">class HasGenerics&lt;X, Y, Z&gt;</li>
+    <li class="self-crumb">class HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></li>
   </ol>
   <div class="self-name">HasGenerics</div>
   <form class="search navbar-right" role="search">
@@ -171,7 +171,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&lt;X, Y&gt;</span>
+            <span class="returntype parameter">&#8594; Map<span class="signature">&lt;X, Y&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 7dab3eb5af..4549241d41 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">constructor HasGenerics</li>
   </ol>
   <div class="self-name">HasGenerics</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/convertToMap.html b/testing/test_package_docs/fake/HasGenerics/convertToMap.html
index 5006a132ef..23006a6d63 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">method convertToMap</li>
   </ol>
   <div class="self-name">convertToMap</div>
@@ -66,7 +66,7 @@ <h5>class HasGenerics</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Map&lt;X, Y&gt;</span>
+      <span class="returntype">Map<span class="signature">&lt;X, Y&gt;</span></span>
       <span class="name ">convertToMap</span>(<wbr>)
     </section>
     <section class="desc markdown">
diff --git a/testing/test_package_docs/fake/HasGenerics/doStuff.html b/testing/test_package_docs/fake/HasGenerics/doStuff.html
index 537a74060a..2580176d70 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">method doStuff</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 34e0477fe7..5bd19f5d09 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 1be46e50c3..d7cad9d8da 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 167c081787..93080b146a 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 ae89d28f59..ce7e4f2d16 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">method returnX</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 ed7be6c918..9da094b9b9 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">method returnZ</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 4944b45ecf..631d84e78f 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 e8d541f707..7e7f1bff7a 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&lt;X, Y, Z&gt;</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics<span class="signature">&lt;X, Y, Z&gt;</span></a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/ImplicitProperties-class.html b/testing/test_package_docs/fake/ImplicitProperties-class.html
index f39d52e385..63ad139d0b 100644
--- a/testing/test_package_docs/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs/fake/ImplicitProperties-class.html
@@ -165,7 +165,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&lt;int&gt;</span>
+          <span class="signature">&#8596; List<span class="signature">&lt;int&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 997746e5ea..fba65b8f83 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
@@ -67,7 +67,7 @@ <h5>class ImplicitProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
         <section class="multi-line-signature">
-          <span class="returntype">List&lt;int&gt;</span>
+          <span class="returntype">List<span class="signature">&lt;int&gt;</span></span>
           <span class="name ">explicitGetterImplicitSetter</span>          <div class="features">read / write</div>
         </section>
         <section class="desc markdown">
diff --git a/testing/test_package_docs/fake/LongFirstLine-class.html b/testing/test_package_docs/fake/LongFirstLine-class.html
index 3dd05d3963..8fb251b7d5 100644
--- a/testing/test_package_docs/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs/fake/LongFirstLine-class.html
@@ -227,7 +227,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&lt;String&gt;</span>
+          <span class="signature">&#8596; List<span class="signature">&lt;String&gt;</span></span>
         </dt>
         <dd class="inherited">
           In the super class.
diff --git a/testing/test_package_docs/fake/NewGenericTypedef.html b/testing/test_package_docs/fake/NewGenericTypedef.html
index f40645f3d6..c0262c2977 100644
--- a/testing/test_package_docs/fake/NewGenericTypedef.html
+++ b/testing/test_package_docs/fake/NewGenericTypedef.html
@@ -129,7 +129,7 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="returntype">List&lt;S&gt;</span>
+        <span class="returntype">List<span class="signature">&lt;S&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>)
     </section>
 
diff --git a/testing/test_package_docs/fake/OtherGenericsThing-class.html b/testing/test_package_docs/fake/OtherGenericsThing-class.html
index 016c19c5ee..f9825ff24d 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">class OtherGenericsThing&lt;A&gt;</li>
+    <li class="self-crumb">class OtherGenericsThing<span class="signature">&lt;A&gt;</span></li>
   </ol>
   <div class="self-name">OtherGenericsThing</div>
   <form class="search navbar-right" role="search">
@@ -171,7 +171,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>&lt;A, <a href="fake/Cool-class.html">Cool</a>, String&gt;</span>
+            <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>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html b/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
index 51bb230ee5..8cf7ee461c 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&lt;A&gt;</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">constructor OtherGenericsThing</li>
   </ol>
   <div class="self-name">OtherGenericsThing</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/convert.html b/testing/test_package_docs/fake/OtherGenericsThing/convert.html
index 3cb965253e..88fc38ce29 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&lt;A&gt;</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">method convert</li>
   </ol>
   <div class="self-name">convert</div>
@@ -63,7 +63,7 @@ <h5>class OtherGenericsThing</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype"><a href="fake/HasGenerics-class.html">HasGenerics</a>&lt;A, <a href="fake/Cool-class.html">Cool</a>, String&gt;</span>
+      <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="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 9f50531de1..78cd396d59 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&lt;A&gt;</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 269d087bc2..81eabd0bd6 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&lt;A&gt;</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 69e0fbe90d..1e77bccd34 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&lt;A&gt;</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 483e8eb825..6b28257657 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&lt;A&gt;</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 fb8136da38..b3d5401544 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&lt;A&gt;</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing<span class="signature">&lt;A&gt;</span></a></li>
     <li class="self-crumb">method toString</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 94e6f8da01..56c15246fc 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">class SpecialList&lt;E&gt;</li>
+    <li class="self-crumb">class SpecialList<span class="signature">&lt;E&gt;</span></li>
   </ol>
   <div class="self-name">SpecialList</div>
   <form class="search navbar-right" role="search">
@@ -137,7 +137,7 @@ <h5>library fake</h5>
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li>ListBase&lt;E&gt;</li>
+          <li>ListBase<span class="signature">&lt;E&gt;</span></li>
           <li>SpecialList</li>
         </ul></dd>
 
@@ -210,7 +210,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&lt;E&gt;</span>
+          <span class="signature">&#8594; Iterator<span class="signature">&lt;E&gt;</span></span>
         </dt>
         <dd class="inherited">
           
@@ -226,7 +226,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&lt;E&gt;</span>
+          <span class="signature">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
         </dt>
         <dd class="inherited">
           
@@ -264,7 +264,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&lt;E&gt;</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;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -283,7 +283,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&lt;int, E&gt;</span>
+            <span class="returntype parameter">&#8594; Map<span class="signature">&lt;int, E&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -327,8 +327,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;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable&lt;T&gt;</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&lt;T&gt;</span>
+          <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>
         </dt>
         <dd class="inherited">
@@ -354,7 +354,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;(<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;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="returntype parameter">&#8594; T</span>
           </span>
         </dt>
@@ -373,7 +373,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&lt;E&gt;</span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -399,7 +399,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&lt;E&gt;</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;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -435,8 +435,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;(<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&lt;T&gt;</span>
+          <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>
         </dt>
         <dd class="inherited">
@@ -507,7 +507,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&lt;E&gt;</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;E&gt;</span></span> <span class="parameter-name">newContents</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -525,7 +525,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&lt;E&gt;</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;E&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -534,7 +534,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&lt;E&gt;</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;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="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -562,7 +562,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&lt;E&gt;</span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -571,7 +571,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&lt;E&gt;</span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -589,7 +589,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&lt;E&gt;</span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;E&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -598,7 +598,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&lt;E&gt;</span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -607,7 +607,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&lt;E&gt;</span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -616,7 +616,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&lt;E&gt;</span>
+            <span class="returntype parameter">&#8594; List<span class="signature">&lt;E&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -625,7 +625,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&lt;E&gt;</span>
+            <span class="returntype parameter">&#8594; Set<span class="signature">&lt;E&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
@@ -643,7 +643,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&lt;E&gt;</span>
+            <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;E&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 60cb4c3653..74d20550ce 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">constructor SpecialList</li>
   </ol>
   <div class="self-name">SpecialList</div>
diff --git a/testing/test_package_docs/fake/SpecialList/add.html b/testing/test_package_docs/fake/SpecialList/add.html
index 1244a442d4..d2f804bc1d 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method add</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 98d281ca1b..2a74994633 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method addAll</li>
   </ol>
   <div class="self-name">addAll</div>
@@ -115,7 +115,7 @@ <h5>class SpecialList</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <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&lt;E&gt;</span> <span class="parameter-name">iterable</span></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>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/any.html b/testing/test_package_docs/fake/SpecialList/any.html
index d1bf40a0c3..130484ce2b 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method any</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 61e9676517..a80410bc0c 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method asMap</li>
   </ol>
   <div class="self-name">asMap</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Map&lt;int, E&gt;</span>
+      <span class="returntype">Map<span class="signature">&lt;int, E&gt;</span></span>
       <span class="name ">asMap</span>(<wbr>)
     </section>
     
diff --git a/testing/test_package_docs/fake/SpecialList/clear.html b/testing/test_package_docs/fake/SpecialList/clear.html
index ec3f85cf6d..e29c262727 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method clear</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 850e8999ad..09aa2b09a2 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method contains</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 05daf09ab3..0810b45159 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method elementAt</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 d7dc2f35ea..3e9aa32a5a 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method every</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 88a4f964cd..a1f349c42e 100644
--- a/testing/test_package_docs/fake/SpecialList/expand.html
+++ b/testing/test_package_docs/fake/SpecialList/expand.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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method expand&lt;T&gt;</li>
   </ol>
   <div class="self-name">expand</div>
@@ -114,8 +114,8 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable&lt;T&gt;</span>
-      <span class="name ">expand</span>&lt;T&gt;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable&lt;T&gt;</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">Iterable<span class="signature">&lt;T&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>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/fillRange.html b/testing/test_package_docs/fake/SpecialList/fillRange.html
index 485163f64a..d931e78f67 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method fillRange</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 8a1d11917b..603dc19462 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property first</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 458381d9f3..80eb74068e 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method firstWhere</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 4b4f3425c8..3c38c7d0da 100644
--- a/testing/test_package_docs/fake/SpecialList/fold.html
+++ b/testing/test_package_docs/fake/SpecialList/fold.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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method fold&lt;T&gt;</li>
   </ol>
   <div class="self-name">fold</div>
diff --git a/testing/test_package_docs/fake/SpecialList/forEach.html b/testing/test_package_docs/fake/SpecialList/forEach.html
index 81f7954650..071d262ba0 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method forEach</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 bb9475b911..7fc81bfb3d 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method getRange</li>
   </ol>
   <div class="self-name">getRange</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable&lt;E&gt;</span>
+      <span class="returntype">Iterable<span class="signature">&lt;E&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 909d80bc71..45faaf815f 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 3e66337c7e..b42a8e01ba 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method indexOf</li>
   </ol>
   <div class="self-name">indexOf</div>
diff --git a/testing/test_package_docs/fake/SpecialList/insert.html b/testing/test_package_docs/fake/SpecialList/insert.html
index cf35c08392..614f6d9377 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method insert</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 73cc041880..19fde0c835 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method insertAll</li>
   </ol>
   <div class="self-name">insertAll</div>
@@ -115,7 +115,7 @@ <h5>class SpecialList</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <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&lt;E&gt;</span> <span class="parameter-name">iterable</span></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>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/isEmpty.html b/testing/test_package_docs/fake/SpecialList/isEmpty.html
index d3d6345130..65ea406f8d 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property isEmpty</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 e9a60d66dd..f903511eba 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property isNotEmpty</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 6b054b6f2a..93841510cd 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property iterator</li>
   </ol>
   <div class="self-name">iterator</div>
@@ -117,7 +117,7 @@ <h5>class SpecialList</h5>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype">Iterator&lt;E&gt;</span>
+          <span class="returntype">Iterator<span class="signature">&lt;E&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 702b7aa344..0bc20d4c41 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method join</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 f27e7f3ec3..4ac88d0eb5 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property last</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 c0c32874a0..e4b9b5deea 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method lastIndexOf</li>
   </ol>
   <div class="self-name">lastIndexOf</div>
diff --git a/testing/test_package_docs/fake/SpecialList/lastWhere.html b/testing/test_package_docs/fake/SpecialList/lastWhere.html
index cd259c5e06..781c673937 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method lastWhere</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 c987b4563a..7306990cc8 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property length</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 c91b5c105c..356435a929 100644
--- a/testing/test_package_docs/fake/SpecialList/map.html
+++ b/testing/test_package_docs/fake/SpecialList/map.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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method map&lt;T&gt;</li>
   </ol>
   <div class="self-name">map</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable&lt;T&gt;</span>
+      <span class="returntype">Iterable<span class="signature">&lt;T&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>)
     </section>
     
diff --git a/testing/test_package_docs/fake/SpecialList/noSuchMethod.html b/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
index 4e1f88b2e9..6bf5f485be 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 842003a4c7..a11e58882c 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 0d13c2c0b5..8b8ec63373 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method operator []</li>
   </ol>
   <div class="self-name">operator []</div>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_put.html b/testing/test_package_docs/fake/SpecialList/operator_put.html
index 9e588d16a2..6bb38245af 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method operator []=</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 d1b2b48daa..1e636d4717 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method reduce</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 30e0c2f560..5d1f8292c0 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method remove</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 a057461167..e2211679e3 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method removeAt</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 98931a0c6d..6646d2d89e 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method removeLast</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 25a9e075ed..1b089a2609 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method removeRange</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 4c4831e569..3d5e5d9c19 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method removeWhere</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 635eb5bedb..b950882f34 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method replaceRange</li>
   </ol>
   <div class="self-name">replaceRange</div>
@@ -115,7 +115,7 @@ <h5>class SpecialList</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <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&lt;E&gt;</span> <span class="parameter-name">newContents</span></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>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/retainWhere.html b/testing/test_package_docs/fake/SpecialList/retainWhere.html
index 7b86a2813e..1b6ad130ee 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method retainWhere</li>
   </ol>
   <div class="self-name">retainWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/reversed.html b/testing/test_package_docs/fake/SpecialList/reversed.html
index 8b03c643f0..54686dbe69 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property reversed</li>
   </ol>
   <div class="self-name">reversed</div>
@@ -117,7 +117,7 @@ <h5>class SpecialList</h5>
         <section id="getter">
         
         <section class="multi-line-signature">
-          <span class="returntype">Iterable&lt;E&gt;</span>
+          <span class="returntype">Iterable<span class="signature">&lt;E&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 d29593f558..730ac20d14 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 82fc91eebf..18b442bc75 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method setAll</li>
   </ol>
   <div class="self-name">setAll</div>
@@ -115,7 +115,7 @@ <h5>class SpecialList</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <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&lt;E&gt;</span> <span class="parameter-name">iterable</span></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>)
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/setRange.html b/testing/test_package_docs/fake/SpecialList/setRange.html
index 4b40d289b3..3dddad2f4a 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method setRange</li>
   </ol>
   <div class="self-name">setRange</div>
@@ -115,7 +115,7 @@ <h5>class SpecialList</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <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&lt;E&gt;</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 ">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> ])
     </section>
     
     
diff --git a/testing/test_package_docs/fake/SpecialList/shuffle.html b/testing/test_package_docs/fake/SpecialList/shuffle.html
index 2d459f93db..9e7d1a37b9 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method shuffle</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 5fd3169f49..1145ae9e07 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">property single</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 8a80905cd0..c68fe4cb14 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method singleWhere</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 7833728644..8ea6a8452a 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method skip</li>
   </ol>
   <div class="self-name">skip</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable&lt;E&gt;</span>
+      <span class="returntype">Iterable<span class="signature">&lt;E&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 d67a41905b..7e31aa26fc 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method skipWhile</li>
   </ol>
   <div class="self-name">skipWhile</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable&lt;E&gt;</span>
+      <span class="returntype">Iterable<span class="signature">&lt;E&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 8beab20ee6..9804abff8d 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method sort</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 eeb7fdbdbf..e894238c7e 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method sublist</li>
   </ol>
   <div class="self-name">sublist</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">List&lt;E&gt;</span>
+      <span class="returntype">List<span class="signature">&lt;E&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 db64984d94..db56e341a6 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method take</li>
   </ol>
   <div class="self-name">take</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable&lt;E&gt;</span>
+      <span class="returntype">Iterable<span class="signature">&lt;E&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 73fe82b5d4..39b4eeb2de 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method takeWhile</li>
   </ol>
   <div class="self-name">takeWhile</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable&lt;E&gt;</span>
+      <span class="returntype">Iterable<span class="signature">&lt;E&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 c99a441901..c66719349f 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method toList</li>
   </ol>
   <div class="self-name">toList</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">List&lt;E&gt;</span>
+      <span class="returntype">List<span class="signature">&lt;E&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 24d7c0074e..5ce01ce802 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method toSet</li>
   </ol>
   <div class="self-name">toSet</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Set&lt;E&gt;</span>
+      <span class="returntype">Set<span class="signature">&lt;E&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 49f9e14134..a3690f9862 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method toString</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 4006a969d2..3adab0f170 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&lt;E&gt;</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;E&gt;</span></a></li>
     <li class="self-crumb">method where</li>
   </ol>
   <div class="self-name">where</div>
@@ -114,7 +114,7 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable&lt;E&gt;</span>
+      <span class="returntype">Iterable<span class="signature">&lt;E&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/SuperAwesomeClass-class.html b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
index f69aa393f1..22438a2dd7 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
@@ -168,7 +168,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&lt;String&gt;</span>
+          <span class="signature">&#8596; List<span class="signature">&lt;String&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 f384414362..96229fbe0d 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
@@ -65,7 +65,7 @@ <h5>class SuperAwesomeClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
         <section class="multi-line-signature">
-          <span class="returntype">List&lt;String&gt;</span>
+          <span class="returntype">List<span class="signature">&lt;String&gt;</span></span>
           <span class="name ">powers</span>          <div class="features">read / write</div>
         </section>
         <section class="desc markdown">
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index 2a0934a13b..2551daa14b 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -137,7 +137,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>
+          <span class="name "><a href="fake/ConstructorTester-class.html">ConstructorTester</a><span class="signature">&lt;A, B&gt;</span></span>
         </dt>
         <dd>
           
@@ -149,7 +149,7 @@ <h2>Classes</h2>
           This class is cool!
         </dd>
         <dt id="ExtraSpecialList">
-          <span class="name "><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></span>
+          <span class="name "><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a><span class="signature">&lt;E&gt;</span></span>
         </dt>
         <dd>
           This inherits operators.
@@ -161,13 +161,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>
+          <span class="name "><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;X, Y, Z&gt;</span></span>
         </dt>
         <dd>
           
         </dd>
         <dt id="HasGenericWithExtends">
-          <span class="name "><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></span>
+          <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>
         </dt>
         <dd>
           I have a generic and it extends <a href="fake/Foo2-class.html">Foo2</a>
@@ -223,13 +223,13 @@ <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>
+          <span class="name "><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a><span class="signature">&lt;A&gt;</span></span>
         </dt>
         <dd>
           
         </dd>
         <dt id="SpecialList">
-          <span class="name "><a href="fake/SpecialList-class.html">SpecialList</a></span>
+          <span class="name "><a href="fake/SpecialList-class.html">SpecialList</a><span class="signature">&lt;E&gt;</span></span>
         </dt>
         <dd>
           Extends <code>ListBase</code>
@@ -441,7 +441,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&lt;dynamic, String&gt;</span>
+          <span class="signature">&#8596; Map<span class="signature">&lt;dynamic, String&gt;</span></span>
         </dt>
         <dd>
           
@@ -506,7 +506,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;(<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;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="returntype parameter">&#8594; void</span>
           </span>
         </dt>
@@ -635,7 +635,7 @@ <h2>Typedefs</h2>
           
 </dd>
         <dt id="GenericTypedef" class="callable">
-          <span class="name"><a href="fake/GenericTypedef.html">GenericTypedef</a></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;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="returntype parameter">&#8594; T</span>
           </span>
         </dt>
@@ -662,8 +662,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;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>)
-            <span class="returntype parameter">&#8594; List&lt;S&gt;</span>
+          <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>
         </dt>
         <dd>
diff --git a/testing/test_package_docs/fake/mapWithDynamicKeys.html b/testing/test_package_docs/fake/mapWithDynamicKeys.html
index 33991cf184..ec990d487a 100644
--- a/testing/test_package_docs/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs/fake/mapWithDynamicKeys.html
@@ -128,7 +128,7 @@ <h5>library fake</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Map&lt;dynamic, String&gt;</span>
+      <span class="returntype">Map<span class="signature">&lt;dynamic, String&gt;</span></span>
       <span class="name ">mapWithDynamicKeys</span>      <div class="features">read / write</div>
     </section>
         
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 94c28371f8..cf7239cfb2 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">class Whataclass&lt;T&gt;</li>
+    <li class="self-crumb">class Whataclass<span class="signature">&lt;T&gt;</span></li>
   </ol>
   <div class="self-name">Whataclass</div>
   <form class="search navbar-right" role="search">
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 5e29fd52ca..a8552bf8e2 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&lt;T&gt;</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">constructor Whataclass</li>
   </ol>
   <div class="self-name">Whataclass</div>
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 2815c47ca7..67cda4ed64 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&lt;T&gt;</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property hashCode</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 ade2307c8b..9dafcee428 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&lt;T&gt;</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">method noSuchMethod</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 46cb692c11..18e3fe68f8 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&lt;T&gt;</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">method operator ==</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 621568a202..12aee2f88c 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&lt;T&gt;</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">property runtimeType</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 f17990b731..3cfe8aa09a 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&lt;T&gt;</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass<span class="signature">&lt;T&gt;</span></a></li>
     <li class="self-crumb">method toString</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 7de1accc90..54d7bebf74 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
@@ -61,7 +61,7 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="Whataclass">
-          <span class="name "><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></span>
+          <span class="name "><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;T&gt;</span></span>
         </dt>
         <dd>
           Some docs for whataclass