From 348cbd7204645f99074bf7873af8b6ba6d34ceb0 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Mon, 30 Aug 2021 16:44:08 -0700
Subject: [PATCH 01/19] Basic implementation of typedef member lookups (#2768)

* flatten

* Fix up typedef implementation to handle generic non-class correctly

* oops, forgot a bit
---
 lib/src/model/model_element.dart              |  5 +-
 lib/src/model/typedef.dart                    | 61 ++++++++++++++++---
 test/end2end/model_special_cases_test.dart    | 17 ++++++
 test/end2end/model_test.dart                  | 11 +++-
 .../lib/constructor_tearoffs.dart             |  2 +-
 5 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/lib/src/model/model_element.dart b/lib/src/model/model_element.dart
index f01ce12963..9d834dd151 100644
--- a/lib/src/model/model_element.dart
+++ b/lib/src/model/model_element.dart
@@ -315,7 +315,10 @@ abstract class ModelElement extends Canonicalization
       if (e.aliasedType is FunctionType) {
         return FunctionTypedef(e, library, packageGraph);
       }
-      return Typedef(e, library, packageGraph);
+      if (e.aliasedType.element is ClassElement) {
+        return ClassTypedef(e, library, packageGraph);
+      }
+      return GeneralizedTypedef(e, library, packageGraph);
     }
     if (e is ConstructorElement) {
       return Constructor(e, library, packageGraph);
diff --git a/lib/src/model/typedef.dart b/lib/src/model/typedef.dart
index 93358152d6..d4be7b2433 100644
--- a/lib/src/model/typedef.dart
+++ b/lib/src/model/typedef.dart
@@ -9,7 +9,7 @@ import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/render/typedef_renderer.dart';
 
-class Typedef extends ModelElement
+abstract class Typedef extends ModelElement
     with TypeParameters, Categorization
     implements EnclosedElement {
   Typedef(TypeAliasElement element, Library library, PackageGraph packageGraph)
@@ -40,6 +40,8 @@ class Typedef extends ModelElement
   @override
   String get filePath => '${library.dirName}/$fileName';
 
+  /// Helper for mustache templates, which can't do casting themselves
+  /// without this.
   FunctionTypedef get asCallable => this as FunctionTypedef;
 
   @override
@@ -65,34 +67,73 @@ class Typedef extends ModelElement
 
   TypedefRenderer get _renderer => packageGraph.rendererFactory.typedefRenderer;
 
-  Map<String, CommentReferable> _referenceChildren;
+  @override
+  Iterable<CommentReferable> get referenceParents => [definingLibrary];
 
+  Map<String, CommentReferable> _referenceChildren;
   @override
   Map<String, CommentReferable> get referenceChildren {
     if (_referenceChildren == null) {
       _referenceChildren = {};
-
-      // Only consider parameters if this is a function typedef.
-      if (isCallable) {
-        _referenceChildren
-            .addEntriesIfAbsent(parameters.explicitOnCollisionWith(this));
-      }
       _referenceChildren
           .addEntriesIfAbsent(typeParameters.explicitOnCollisionWith(this));
     }
     return _referenceChildren;
   }
+}
+
+/// A typedef referring to a non-function typedef that is nevertheless not
+/// referring to a defined class.  An example is a typedef alias for `void` or
+/// for `Function` itself.
+class GeneralizedTypedef extends Typedef {
+  GeneralizedTypedef(
+      TypeAliasElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph) {
+    assert(!isCallable);
+  }
+}
+
+/// A typedef referring to a non-function, defined type.
+class ClassTypedef extends Typedef {
+  ClassTypedef(
+      TypeAliasElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph) {
+    assert(!isCallable);
+    assert(modelType.modelElement is Class);
+  }
 
   @override
-  Iterable<CommentReferable> get referenceParents => [definingLibrary];
+  DefinedElementType get modelType => super.modelType;
+
+  @override
+  Map<String, CommentReferable> get referenceChildren {
+    if (_referenceChildren == null) {
+      _referenceChildren = super.referenceChildren;
+      _referenceChildren
+          .addEntriesIfAbsent(modelType.modelElement.referenceChildren.entries);
+    }
+    return _referenceChildren;
+  }
 }
 
 /// A typedef referring to a function type.
 class FunctionTypedef extends Typedef {
   FunctionTypedef(
       TypeAliasElement element, Library library, PackageGraph packageGraph)
-      : super(element, library, packageGraph);
+      : super(element, library, packageGraph) {
+    assert(isCallable);
+  }
 
   @override
   Callable get modelType => super.modelType;
+
+  @override
+  Map<String, CommentReferable> get referenceChildren {
+    if (_referenceChildren == null) {
+      _referenceChildren = super.referenceChildren;
+      _referenceChildren
+          .addEntriesIfAbsent(parameters.explicitOnCollisionWith(this));
+    }
+    return _referenceChildren;
+  }
 }
diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart
index 0e2af4366b..50c4d54978 100644
--- a/test/end2end/model_special_cases_test.dart
+++ b/test/end2end/model_special_cases_test.dart
@@ -186,6 +186,23 @@ void main() {
         expect(referenceLookup(constructorTearoffs, 'F.new'),
             equals(MatchingLinkResult(Fnew)));
       });
+
+      test('.new works on typedefs', () {
+        expect(referenceLookup(constructorTearoffs, 'At.new'),
+            equals(MatchingLinkResult(Anew)));
+        expect(referenceLookup(constructorTearoffs, 'Bt.new'),
+            equals(MatchingLinkResult(Bnew)));
+        expect(referenceLookup(constructorTearoffs, 'Ct.new'),
+            equals(MatchingLinkResult(Cnew)));
+        expect(referenceLookup(constructorTearoffs, 'Dt.new'),
+            equals(MatchingLinkResult(Dnew)));
+        expect(referenceLookup(constructorTearoffs, 'Et.new'),
+            equals(MatchingLinkResult(Enew)));
+        expect(referenceLookup(constructorTearoffs, 'Fstring.new'),
+            equals(MatchingLinkResult(Fnew)));
+        expect(referenceLookup(constructorTearoffs, 'Ft.new'),
+            equals(MatchingLinkResult(Fnew)));
+      });
     }, skip: !_constructorTearoffsAllowed.allows(utils.platformVersion));
   });
 
diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart
index bc153c1398..d4ee8867d4 100644
--- a/test/end2end/model_test.dart
+++ b/test/end2end/model_test.dart
@@ -2236,7 +2236,8 @@ void main() {
     group('Linking for generalized typedef cases works', () {
       Library generalizedTypedefs;
       Typedef T0, T2, T5, T8;
-      Class C2;
+      Class C1, C2;
+      Field C1a;
 
       setUpAll(() {
         generalizedTypedefs = packageGraph.libraries
@@ -2245,7 +2246,9 @@ void main() {
         T2 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T2');
         T5 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T5');
         T8 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T8');
+        C1 = generalizedTypedefs.classes.firstWhere((c) => c.name == 'C1');
         C2 = generalizedTypedefs.classes.firstWhere((c) => c.name == 'C2');
+        C1a = C1.allFields.firstWhere((f) => f.name == 'a');
       });
 
       test('Verify basic ability to link anything', () {
@@ -2266,6 +2269,12 @@ void main() {
         var T5name = T5.parameters.firstWhere((t) => t.name == 'name');
         expect(referenceLookup(T5, 'name'), equals(MatchingLinkResult(T5name)));
       });
+
+      test('Verify ability to link to class members of aliased classes', () {
+        expect(referenceLookup(generalizedTypedefs, 'T8.a'),
+            equals(MatchingLinkResult(C1a)));
+        expect(referenceLookup(T8, 'a'), equals(MatchingLinkResult(C1a)));
+      });
     });
 
     group('Linking for complex inheritance and reexport cases', () {
diff --git a/testing/test_package_experiments/lib/constructor_tearoffs.dart b/testing/test_package_experiments/lib/constructor_tearoffs.dart
index 6c3e87dd34..722f4e4bde 100644
--- a/testing/test_package_experiments/lib/constructor_tearoffs.dart
+++ b/testing/test_package_experiments/lib/constructor_tearoffs.dart
@@ -58,4 +58,4 @@ typedef NotAClass = Function;
 
 /// Mixins don't have constructors either, so disallow `M.new`.
 mixin M<T> on C {
-}
\ No newline at end of file
+}

From 26cd594f53eb3eaa8b829ae6f90b15a82a5ba3d7 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 31 Aug 2021 14:18:44 -0700
Subject: [PATCH 02/19] Extract 'Constructable' from 'Class', creating a new
 class 'InheritingContainer'

---
 lib/src/generator/generator_frontend.dart     |    8 -
 lib/src/generator/template_data.dart          |   33 +-
 .../templates.aot_renderers_for_html.dart     |  207 +-
 .../templates.aot_renderers_for_md.dart       |  176 +-
 lib/src/generator/templates.dart              |    8 +-
 .../templates.runtime_renderers.dart          | 2221 +++++++++--------
 lib/src/model/accessor.dart                   |   12 +-
 lib/src/model/class.dart                      |  544 +---
 lib/src/model/container.dart                  |   15 +-
 lib/src/model/extension.dart                  |    4 +-
 lib/src/model/field.dart                      |   10 +-
 lib/src/model/inheritable.dart                |   30 +-
 lib/src/model/inheriting_container.dart       |  462 ++++
 lib/src/model/mixin.dart                      |   50 +-
 lib/src/model/model.dart                      |    1 +
 lib/src/model/operator.dart                   |    4 +-
 lib/src/model/package_graph.dart              |   43 +-
 lib/src/model_utils.dart                      |    5 +-
 lib/templates/html/mixin.html                 |   46 +-
 lib/templates/md/mixin.md                     |   22 +-
 test/end2end/model_test.dart                  |    2 +-
 21 files changed, 2063 insertions(+), 1840 deletions(-)
 create mode 100644 lib/src/model/inheriting_container.dart

diff --git a/lib/src/generator/generator_frontend.dart b/lib/src/generator/generator_frontend.dart
index 08d9f3caff..6bfcf2c769 100644
--- a/lib/src/generator/generator_frontend.dart
+++ b/lib/src/generator/generator_frontend.dart
@@ -168,14 +168,6 @@ class GeneratorFrontEnd implements Generator {
           indexAccumulator.add(mixin);
           _generatorBackend.generateMixin(writer, packageGraph, lib, mixin);
 
-          for (var constructor in filterNonDocumented(mixin.constructors)) {
-            if (!constructor.isCanonical) continue;
-
-            indexAccumulator.add(constructor);
-            _generatorBackend.generateConstructor(
-                writer, packageGraph, lib, mixin, constructor);
-          }
-
           for (var constant in filterNonDocumented(mixin.constantFields)) {
             if (!constant.isCanonical) continue;
             indexAccumulator.add(constant);
diff --git a/lib/src/generator/template_data.dart b/lib/src/generator/template_data.dart
index 594816fd50..e82681be9a 100644
--- a/lib/src/generator/template_data.dart
+++ b/lib/src/generator/template_data.dart
@@ -173,34 +173,51 @@ class LibraryTemplateData extends TemplateData<Library>
 }
 
 /// Template data for Dart 2.1-style mixin declarations.
-class MixinTemplateData extends ClassTemplateData<Mixin> {
-  final Mixin mixin;
-
+class MixinTemplateData extends InheritingContainerTemplateData<Mixin> {
   MixinTemplateData(
       TemplateOptions htmlOptions,
       PackageGraph packageGraph,
       Library library,
-      this.mixin,
+      Mixin mixin,
       LibrarySidebar _sidebarForLibrary,
       ContainerSidebar _sidebarForContainer)
       : super(htmlOptions, packageGraph, library, mixin, _sidebarForLibrary,
             _sidebarForContainer);
 
+  Mixin get mixin => clazz;
+
   @override
   Mixin get self => mixin;
 }
 
+/// Template data for Dart classes.
+class ClassTemplateData extends InheritingContainerTemplateData<Class> {
+  ClassTemplateData(
+      TemplateOptions htmlOptions,
+      PackageGraph packageGraph,
+      Library library,
+      Class clazz,
+      LibrarySidebar _sidebarForLibrary,
+      ContainerSidebar _sidebarForContainer)
+      : super(htmlOptions, packageGraph, library, clazz, _sidebarForLibrary,
+            _sidebarForContainer);
+
+  @override
+  Class get clazz => super.clazz;
+}
+
 /// Base template data class for [Class], [Enum], and [Mixin].
-class ClassTemplateData<T extends Class> extends TemplateData<T>
+abstract class InheritingContainerTemplateData<T extends InheritingContainer>
+    extends TemplateData<T>
     implements TemplateDataWithLibrary<T>, TemplateDataWithContainer<T> {
-  final Class clazz;
+  final InheritingContainer clazz;
   @override
   final Library library;
   Class _objectType;
   final LibrarySidebar _sidebarForLibrary;
   final ContainerSidebar _sidebarForContainer;
 
-  ClassTemplateData(
+  InheritingContainerTemplateData(
       TemplateOptions htmlOptions,
       PackageGraph packageGraph,
       this.library,
@@ -335,7 +352,7 @@ class ConstructorTemplateData extends TemplateData<Constructor>
       'for the Dart programming language.';
 }
 
-class EnumTemplateData extends ClassTemplateData<Enum> {
+class EnumTemplateData extends InheritingContainerTemplateData<Enum> {
   EnumTemplateData(
       TemplateOptions htmlOptions,
       PackageGraph packageGraph,
diff --git a/lib/src/generator/templates.aot_renderers_for_html.dart b/lib/src/generator/templates.aot_renderers_for_html.dart
index 0ece2698bb..b5e3d9c5ee 100644
--- a/lib/src/generator/templates.aot_renderers_for_html.dart
+++ b/lib/src/generator/templates.aot_renderers_for_html.dart
@@ -1437,7 +1437,7 @@ String _renderCategory_partial_footer_12(_i1.CategoryTemplateData context0) {
   return buffer.toString();
 }
 
-String renderClass<T extends _i4.Class>(_i1.ClassTemplateData<T> context0) {
+String renderClass(_i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write(_renderClass_partial_head_0(context0));
   buffer.writeln();
@@ -1821,8 +1821,7 @@ String renderClass<T extends _i4.Class>(_i1.ClassTemplateData<T> context0) {
   return buffer.toString();
 }
 
-String _renderClass_partial_head_0<T extends _i4.Class>(
-    _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_head_0(_i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<!DOCTYPE html>
 <html lang="en">
@@ -1975,8 +1974,8 @@ String _renderClass_partial_head_0<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_source_link_1<T extends _i4.Class>(
-    _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_source_link_1(
+    _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -1990,8 +1989,8 @@ String _renderClass_partial_source_link_1<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_feature_set_2<T extends _i4.Class>(
-    _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_feature_set_2(
+    _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -2007,8 +2006,8 @@ String _renderClass_partial_feature_set_2<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_categorization_3<T extends _i4.Class>(
-    _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_categorization_3(
+    _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     var context2 = context1.displayedCategories;
@@ -2024,8 +2023,8 @@ String _renderClass_partial_categorization_3<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_documentation_4<T extends _i4.Class>(
-    _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_documentation_4(
+    _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -2042,8 +2041,8 @@ String _renderClass_partial_documentation_4<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_property_5<T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_property_5(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context2.htmlId.toString());
@@ -2085,9 +2084,8 @@ String _renderClass_partial_property_5<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String __renderClass_partial_property_5_partial_categorization_0<
-        T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_property_5_partial_categorization_0(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     var context3 = context2.displayedCategories;
@@ -2103,8 +2101,8 @@ String __renderClass_partial_property_5_partial_categorization_0<
   return buffer.toString();
 }
 
-String __renderClass_partial_property_5_partial_features_1<T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_property_5_partial_features_1(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -2116,10 +2114,8 @@ String __renderClass_partial_property_5_partial_features_1<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_callable_6<T extends _i4.Class>(
-    _i10.Method context2,
-    _i4.Class context1,
-    _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_callable_6(
+    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context2.htmlId.toString());
@@ -2169,9 +2165,8 @@ String _renderClass_partial_callable_6<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String __renderClass_partial_callable_6_partial_categorization_0<
-        T extends _i4.Class>(_i10.Method context2, _i4.Class context1,
-    _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_callable_6_partial_categorization_0(
+    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     var context3 = context2.displayedCategories;
@@ -2187,10 +2182,8 @@ String __renderClass_partial_callable_6_partial_categorization_0<
   return buffer.toString();
 }
 
-String __renderClass_partial_callable_6_partial_features_1<T extends _i4.Class>(
-    _i10.Method context2,
-    _i4.Class context1,
-    _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_callable_6_partial_features_1(
+    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -2202,8 +2195,8 @@ String __renderClass_partial_callable_6_partial_features_1<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_constant_7<T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_constant_7(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context2.htmlId.toString());
@@ -2245,9 +2238,8 @@ String _renderClass_partial_constant_7<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String __renderClass_partial_constant_7_partial_categorization_0<
-        T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_constant_7_partial_categorization_0(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     var context3 = context2.displayedCategories;
@@ -2263,8 +2255,8 @@ String __renderClass_partial_constant_7_partial_categorization_0<
   return buffer.toString();
 }
 
-String __renderClass_partial_constant_7_partial_features_1<T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_constant_7_partial_features_1(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -2276,8 +2268,7 @@ String __renderClass_partial_constant_7_partial_features_1<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_search_sidebar_8<T extends _i4.Class>(
-    _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_search_sidebar_8(_i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<header id="header-search-sidebar" class="hidden-l">
   <form class="search-sidebar" role="search">
@@ -2340,8 +2331,7 @@ String _renderClass_partial_search_sidebar_8<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_footer_9<T extends _i4.Class>(
-    _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_footer_9(_i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''</main>
 
@@ -7831,44 +7821,26 @@ String renderMixin(_i1.MixinTemplateData context0) {
         </dd>''');
       }
       buffer.writeln();
-      if (context2.hasPublicMixedInTypes == true) {
+      if (context2.hasPublicImplementors == true) {
         buffer.writeln();
         buffer.write('''
-        <dt>Mixes-in</dt>
-        <dd><ul class="comma-separated mixin-relationships">''');
-        var context9 = context2.publicMixedInTypes;
+        <dt>Mixin Applications</dt>
+        <dd>
+          <ul class="comma-separated mixin-relationships">''');
+        var context9 = context2.publicImplementorsSorted;
         if (context9 != null) {
           for (var context10 in context9) {
             buffer.writeln();
             buffer.write('''
-          <li>''');
+            <li>''');
             buffer.write(context10.linkedName.toString());
             buffer.write('''</li>''');
           }
         }
         buffer.writeln();
         buffer.write('''
-        </ul></dd>''');
-      }
-      buffer.writeln();
-      if (context2.hasPublicImplementors == true) {
-        buffer.writeln();
-        buffer.write('''
-        <dt>Implemented by</dt>
-        <dd><ul class="comma-separated mixin-relationships">''');
-        var context11 = context2.publicImplementorsSorted;
-        if (context11 != null) {
-          for (var context12 in context11) {
-            buffer.writeln();
-            buffer.write('''
-          <li>''');
-            buffer.write(context12.linkedName.toString());
-            buffer.write('''</li>''');
-          }
-        }
-        buffer.writeln();
-        buffer.write('''
-        </ul></dd>''');
+          </ul>
+        </dd>''');
       }
       buffer.writeln();
       if (context2.hasAnnotations == true) {
@@ -7876,13 +7848,13 @@ String renderMixin(_i1.MixinTemplateData context0) {
         buffer.write('''
         <dt>Annotations</dt>
         <dd><ul class="annotation-list mixin-relationships">''');
-        var context13 = context2.annotations;
-        if (context13 != null) {
-          for (var context14 in context13) {
+        var context11 = context2.annotations;
+        if (context11 != null) {
+          for (var context12 in context11) {
             buffer.writeln();
             buffer.write('''
           <li>''');
-            buffer.write(context14.linkedNameWithParameters.toString());
+            buffer.write(context12.linkedNameWithParameters.toString());
             buffer.write('''</li>''');
           }
         }
@@ -7896,53 +7868,6 @@ String renderMixin(_i1.MixinTemplateData context0) {
     </section>''');
     }
     buffer.writeln();
-    if (context2.hasPublicConstructors == true) {
-      buffer.writeln();
-      buffer.write('''
-    <section class="summary offset-anchor" id="constructors">
-      <h2>Constructors</h2>
-
-      <dl class="constructor-summary-list">''');
-      var context15 = context2.publicConstructorsSorted;
-      if (context15 != null) {
-        for (var context16 in context15) {
-          buffer.writeln();
-          buffer.write('''
-        <dt id="''');
-          buffer.writeEscaped(context16.htmlId.toString());
-          buffer.write('''" class="callable">
-          <span class="name">''');
-          buffer.write(context16.linkedName.toString());
-          buffer.write('''</span><span class="signature">(''');
-          buffer.write(context16.linkedParams.toString());
-          buffer.write(''')</span>
-        </dt>
-        <dd>
-          ''');
-          buffer.write(context16.oneLineDoc.toString());
-          buffer.write(' ');
-          buffer.write(context16.extendedDocLink.toString());
-          if (context16.isConst == true) {
-            buffer.writeln();
-            buffer.write('''
-          <div class="constructor-modifier features">const</div>''');
-          }
-          if (context16.isFactory == true) {
-            buffer.writeln();
-            buffer.write('''
-          <div class="constructor-modifier features">factory</div>''');
-          }
-          buffer.writeln();
-          buffer.write('''
-        </dd>''');
-        }
-      }
-      buffer.writeln();
-      buffer.write('''
-      </dl>
-    </section>''');
-    }
-    buffer.writeln();
     if (context2.hasPublicInstanceFields == true) {
       buffer.writeln();
       buffer.write('''
@@ -7954,12 +7879,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       <h2>Properties</h2>
 
       <dl class="properties">''');
-      var context17 = context2.publicInstanceFields;
-      if (context17 != null) {
-        for (var context18 in context17) {
+      var context13 = context2.publicInstanceFields;
+      if (context13 != null) {
+        for (var context14 in context13) {
           buffer.write('\n        ');
           buffer.write(
-              _renderMixin_partial_property_5(context18, context2, context0));
+              _renderMixin_partial_property_5(context14, context2, context0));
         }
       }
       buffer.writeln();
@@ -7978,12 +7903,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       buffer.write('''" id="instance-methods">
       <h2>Methods</h2>
       <dl class="callables">''');
-      var context19 = context2.publicInstanceMethods;
-      if (context19 != null) {
-        for (var context20 in context19) {
+      var context15 = context2.publicInstanceMethods;
+      if (context15 != null) {
+        for (var context16 in context15) {
           buffer.write('\n        ');
           buffer.write(
-              _renderMixin_partial_callable_6(context20, context2, context0));
+              _renderMixin_partial_callable_6(context16, context2, context0));
         }
       }
       buffer.writeln();
@@ -8002,12 +7927,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       buffer.write('''" id="operators">
       <h2>Operators</h2>
       <dl class="callables">''');
-      var context21 = context2.publicInstanceOperatorsSorted;
-      if (context21 != null) {
-        for (var context22 in context21) {
+      var context17 = context2.publicInstanceOperatorsSorted;
+      if (context17 != null) {
+        for (var context18 in context17) {
           buffer.write('\n        ');
           buffer.write(
-              _renderMixin_partial_callable_6(context22, context2, context0));
+              _renderMixin_partial_callable_6(context18, context2, context0));
         }
       }
       buffer.writeln();
@@ -8023,12 +7948,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       <h2>Static Properties</h2>
 
       <dl class="properties">''');
-      var context23 = context2.publicVariableStaticFieldsSorted;
-      if (context23 != null) {
-        for (var context24 in context23) {
+      var context19 = context2.publicVariableStaticFieldsSorted;
+      if (context19 != null) {
+        for (var context20 in context19) {
           buffer.write('\n        ');
           buffer.write(
-              _renderMixin_partial_property_5(context24, context2, context0));
+              _renderMixin_partial_property_5(context20, context2, context0));
         }
       }
       buffer.writeln();
@@ -8043,12 +7968,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
     <section class="summary offset-anchor" id="static-methods">
       <h2>Static Methods</h2>
       <dl class="callables">''');
-      var context25 = context2.publicStaticMethods;
-      if (context25 != null) {
-        for (var context26 in context25) {
+      var context21 = context2.publicStaticMethods;
+      if (context21 != null) {
+        for (var context22 in context21) {
           buffer.write('\n        ');
           buffer.write(
-              _renderMixin_partial_callable_6(context26, context2, context0));
+              _renderMixin_partial_callable_6(context22, context2, context0));
         }
       }
       buffer.writeln();
@@ -8064,12 +7989,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       <h2>Constants</h2>
 
       <dl class="properties">''');
-      var context27 = context2.publicConstantFieldsSorted;
-      if (context27 != null) {
-        for (var context28 in context27) {
+      var context23 = context2.publicConstantFieldsSorted;
+      if (context23 != null) {
+        for (var context24 in context23) {
           buffer.write('\n        ');
           buffer.write(
-              _renderMixin_partial_constant_7(context28, context2, context0));
+              _renderMixin_partial_constant_7(context24, context2, context0));
         }
       }
       buffer.writeln();
diff --git a/lib/src/generator/templates.aot_renderers_for_md.dart b/lib/src/generator/templates.aot_renderers_for_md.dart
index 32f53245a2..1e36910909 100644
--- a/lib/src/generator/templates.aot_renderers_for_md.dart
+++ b/lib/src/generator/templates.aot_renderers_for_md.dart
@@ -646,7 +646,7 @@ String _renderCategory_partial_footer_9(_i1.CategoryTemplateData context0) {
   return buffer.toString();
 }
 
-String renderClass<T extends _i4.Class>(_i1.ClassTemplateData<T> context0) {
+String renderClass(_i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write(_renderClass_partial_head_0(context0));
   buffer.writeln();
@@ -909,8 +909,7 @@ String renderClass<T extends _i4.Class>(_i1.ClassTemplateData<T> context0) {
   return buffer.toString();
 }
 
-String _renderClass_partial_head_0<T extends _i4.Class>(
-    _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_head_0(_i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write(context0.customHeader.toString());
   buffer.writeln();
@@ -918,8 +917,8 @@ String _renderClass_partial_head_0<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_source_link_1<T extends _i4.Class>(
-    _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_source_link_1(
+    _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -933,8 +932,8 @@ String _renderClass_partial_source_link_1<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_categorization_2<T extends _i4.Class>(
-    _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_categorization_2(
+    _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     buffer.writeln();
@@ -953,8 +952,8 @@ Categories:''');
   return buffer.toString();
 }
 
-String _renderClass_partial_feature_set_3<T extends _i4.Class>(
-    _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_feature_set_3(
+    _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -970,8 +969,8 @@ String _renderClass_partial_feature_set_3<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_documentation_4<T extends _i4.Class>(
-    _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_documentation_4(
+    _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -982,8 +981,8 @@ String _renderClass_partial_documentation_4<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_property_5<T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_property_5(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
@@ -1007,9 +1006,8 @@ String _renderClass_partial_property_5<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String __renderClass_partial_property_5_partial_categorization_0<
-        T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_property_5_partial_categorization_0(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     buffer.writeln();
@@ -1028,8 +1026,8 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderClass_partial_property_5_partial_features_1<T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_property_5_partial_features_1(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''_''');
@@ -1041,10 +1039,8 @@ String __renderClass_partial_property_5_partial_features_1<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_callable_6<T extends _i4.Class>(
-    _i10.Method context2,
-    _i4.Class context1,
-    _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_callable_6(
+    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
@@ -1069,9 +1065,8 @@ String _renderClass_partial_callable_6<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String __renderClass_partial_callable_6_partial_categorization_0<
-        T extends _i4.Class>(_i10.Method context2, _i4.Class context1,
-    _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_callable_6_partial_categorization_0(
+    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     buffer.writeln();
@@ -1090,10 +1085,8 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderClass_partial_callable_6_partial_features_1<T extends _i4.Class>(
-    _i10.Method context2,
-    _i4.Class context1,
-    _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_callable_6_partial_features_1(
+    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''_''');
@@ -1105,8 +1098,8 @@ String __renderClass_partial_callable_6_partial_features_1<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_constant_7<T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_constant_7(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
@@ -1128,9 +1121,8 @@ String _renderClass_partial_constant_7<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String __renderClass_partial_constant_7_partial_categorization_0<
-        T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_constant_7_partial_categorization_0(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     buffer.writeln();
@@ -1149,8 +1141,8 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderClass_partial_constant_7_partial_features_1<T extends _i4.Class>(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData<T> context0) {
+String __renderClass_partial_constant_7_partial_features_1(
+    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''_''');
@@ -1162,8 +1154,7 @@ String __renderClass_partial_constant_7_partial_features_1<T extends _i4.Class>(
   return buffer.toString();
 }
 
-String _renderClass_partial_footer_8<T extends _i4.Class>(
-    _i1.ClassTemplateData<T> context0) {
+String _renderClass_partial_footer_8(_i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.writeln();
   buffer.write(context0.customInnerFooter.toString());
@@ -3575,12 +3566,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
         }
       }
       buffer.writeln();
-      if (context2.hasPublicMixedInTypes == true) {
+      if (context2.hasPublicImplementors == true) {
         buffer.writeln();
         buffer.write('''
-**Mixed in types**
+**Mixin Applications**
 ''');
-        var context9 = context2.publicMixedInTypes;
+        var context9 = context2.publicImplementorsSorted;
         if (context9 != null) {
           for (var context10 in context9) {
             buffer.writeln();
@@ -3591,66 +3582,19 @@ String renderMixin(_i1.MixinTemplateData context0) {
         }
       }
       buffer.writeln();
-      if (context2.hasPublicImplementors == true) {
-        buffer.writeln();
-        buffer.write('''
-**Implementers**
-''');
-        var context11 = context2.publicImplementorsSorted;
-        if (context11 != null) {
-          for (var context12 in context11) {
-            buffer.writeln();
-            buffer.write('''
-- ''');
-            buffer.write(context12.linkedName.toString());
-          }
-        }
-      }
-      buffer.writeln();
       if (context2.hasAnnotations == true) {
         buffer.writeln();
         buffer.write('''
 **Annotations**
 ''');
-        var context13 = context2.annotations;
-        if (context13 != null) {
-          for (var context14 in context13) {
+        var context11 = context2.annotations;
+        if (context11 != null) {
+          for (var context12 in context11) {
             buffer.writeln();
             buffer.write('''
 - ''');
-            buffer.write(context14.linkedNameWithParameters.toString());
-          }
-        }
-      }
-    }
-    buffer.writeln();
-    if (context2.hasPublicConstructors == true) {
-      buffer.writeln();
-      buffer.write('''
-## Constructors
-''');
-      var context15 = context2.publicConstructorsSorted;
-      if (context15 != null) {
-        for (var context16 in context15) {
-          buffer.writeln();
-          buffer.write(context16.linkedName.toString());
-          buffer.write('''(''');
-          buffer.write(context16.linkedParams.toString());
-          buffer.write(''')
-
-''');
-          buffer.write(context16.oneLineDoc.toString());
-          buffer.write(' ');
-          buffer.write(context16.extendedDocLink.toString());
-          buffer.write('  ');
-          if (context16.isConst == true) {
-            buffer.write('''_const_''');
-          }
-          buffer.write(' ');
-          if (context16.isFactory == true) {
-            buffer.write('''_factory_''');
+            buffer.write(context12.linkedNameWithParameters.toString());
           }
-          buffer.writeln();
         }
       }
     }
@@ -3660,12 +3604,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       buffer.write('''
 ## Properties
 ''');
-      var context17 = context2.publicInstanceFieldsSorted;
-      if (context17 != null) {
-        for (var context18 in context17) {
+      var context13 = context2.publicInstanceFieldsSorted;
+      if (context13 != null) {
+        for (var context14 in context13) {
           buffer.writeln();
           buffer.write(
-              _renderMixin_partial_property_5(context18, context2, context0));
+              _renderMixin_partial_property_5(context14, context2, context0));
           buffer.writeln();
         }
       }
@@ -3676,12 +3620,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       buffer.write('''
 ## Methods
 ''');
-      var context19 = context2.publicInstanceMethodsSorted;
-      if (context19 != null) {
-        for (var context20 in context19) {
+      var context15 = context2.publicInstanceMethodsSorted;
+      if (context15 != null) {
+        for (var context16 in context15) {
           buffer.writeln();
           buffer.write(
-              _renderMixin_partial_callable_6(context20, context2, context0));
+              _renderMixin_partial_callable_6(context16, context2, context0));
           buffer.writeln();
         }
       }
@@ -3692,12 +3636,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       buffer.write('''
 ## Operators
 ''');
-      var context21 = context2.publicInstanceOperatorsSorted;
-      if (context21 != null) {
-        for (var context22 in context21) {
+      var context17 = context2.publicInstanceOperatorsSorted;
+      if (context17 != null) {
+        for (var context18 in context17) {
           buffer.writeln();
           buffer.write(
-              _renderMixin_partial_callable_6(context22, context2, context0));
+              _renderMixin_partial_callable_6(context18, context2, context0));
           buffer.writeln();
         }
       }
@@ -3708,12 +3652,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       buffer.write('''
 ## Static Properties
 ''');
-      var context23 = context2.publicVariableStaticFieldsSorted;
-      if (context23 != null) {
-        for (var context24 in context23) {
+      var context19 = context2.publicVariableStaticFieldsSorted;
+      if (context19 != null) {
+        for (var context20 in context19) {
           buffer.writeln();
           buffer.write(
-              _renderMixin_partial_property_5(context24, context2, context0));
+              _renderMixin_partial_property_5(context20, context2, context0));
           buffer.writeln();
         }
       }
@@ -3724,12 +3668,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       buffer.write('''
 ## Static Methods
 ''');
-      var context25 = context2.publicStaticMethodsSorted;
-      if (context25 != null) {
-        for (var context26 in context25) {
+      var context21 = context2.publicStaticMethodsSorted;
+      if (context21 != null) {
+        for (var context22 in context21) {
           buffer.writeln();
           buffer.write(
-              _renderMixin_partial_callable_6(context26, context2, context0));
+              _renderMixin_partial_callable_6(context22, context2, context0));
           buffer.writeln();
         }
       }
@@ -3740,12 +3684,12 @@ String renderMixin(_i1.MixinTemplateData context0) {
       buffer.write('''
 ## Constants
 ''');
-      var context27 = context2.publicConstantFieldsSorted;
-      if (context27 != null) {
-        for (var context28 in context27) {
+      var context23 = context2.publicConstantFieldsSorted;
+      if (context23 != null) {
+        for (var context24 in context23) {
           buffer.writeln();
           buffer.write(
-              _renderMixin_partial_constant_7(context28, context2, context0));
+              _renderMixin_partial_constant_7(context24, context2, context0));
           buffer.writeln();
         }
       }
diff --git a/lib/src/generator/templates.dart b/lib/src/generator/templates.dart
index 7d99dbf768..7c04f098bb 100644
--- a/lib/src/generator/templates.dart
+++ b/lib/src/generator/templates.dart
@@ -72,7 +72,7 @@ const _visibleTypes = {
 /// The collection of [Template] objects
 abstract class Templates {
   String renderCategory(CategoryTemplateData context);
-  String renderClass<T extends Class>(ClassTemplateData<T> context);
+  String renderClass<T extends Class>(ClassTemplateData context);
   String renderConstructor(ConstructorTemplateData context);
   String renderEnum(EnumTemplateData context);
   String renderError(PackageTemplateData context);
@@ -123,7 +123,7 @@ class HtmlAotTemplates implements Templates {
       aot_renderers_for_html.renderCategory(context);
 
   @override
-  String renderClass<T extends Class>(ClassTemplateData<T> context) =>
+  String renderClass<T extends Class>(ClassTemplateData context) =>
       aot_renderers_for_html.renderClass(context);
 
   @override
@@ -191,7 +191,7 @@ class MarkdownAotTemplates implements Templates {
       aot_renderers_for_md.renderCategory(context);
 
   @override
-  String renderClass<T extends Class>(ClassTemplateData<T> context) =>
+  String renderClass<T extends Class>(ClassTemplateData context) =>
       aot_renderers_for_md.renderClass(context);
 
   @override
@@ -260,7 +260,7 @@ class RuntimeTemplates implements Templates {
       runtime_renderers.renderCategory(context, _categoryTemplate);
 
   @override
-  String renderClass<T extends Class>(ClassTemplateData<T> context) =>
+  String renderClass<T extends Class>(ClassTemplateData context) =>
       runtime_renderers.renderClass(context, _classTemplate);
 
   @override
diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
index e70e49223a..10b1cced8b 100644
--- a/lib/src/generator/templates.runtime_renderers.dart
+++ b/lib/src/generator/templates.runtime_renderers.dart
@@ -1575,34 +1575,8 @@ class _Renderer_Class extends RendererBase<Class> {
       _propertyMapCache.putIfAbsent(
           CT_,
           () => {
-                ..._Renderer_Container.propertyMap<CT_>(),
-                ..._Renderer_Categorization.propertyMap<CT_>(),
-                ..._Renderer_ExtensionTarget.propertyMap<CT_>(),
-                'allCanonicalModelElements': Property(
-                  getValue: (CT_ c) => c.allCanonicalModelElements,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'List<ModelElement>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.allCanonicalModelElements.map((e) =>
-                        _render_ModelElement(e, ast, r.template, sink,
-                            parent: r));
-                  },
-                ),
-                'allFields': Property(
-                  getValue: (CT_ c) => c.allFields,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'List<Field>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.allFields.map((e) =>
-                        _render_Field(e, ast, r.template, sink, parent: r));
-                  },
-                ),
+                ..._Renderer_InheritingContainer.propertyMap<CT_>(),
+                ..._Renderer_Constructable.propertyMap<CT_>(),
                 'allModelElements': Property(
                   getValue: (CT_ c) => c.allModelElements,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -1628,97 +1602,6 @@ class _Renderer_Class extends RendererBase<Class> {
                         _render_Field(e, ast, r.template, sink, parent: r));
                   },
                 ),
-                'constructors': Property(
-                  getValue: (CT_ c) => c.constructors,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Constructor>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.constructors.map((e) => _render_Constructor(
-                        e, ast, r.template, sink,
-                        parent: r));
-                  },
-                ),
-                'declaredFields': Property(
-                  getValue: (CT_ c) => c.declaredFields,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Field>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.declaredFields.map((e) =>
-                        _render_Field(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'declaredMethods': Property(
-                  getValue: (CT_ c) => c.declaredMethods,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Method>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.declaredMethods.map((e) =>
-                        _render_Method(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'defaultConstructor': Property(
-                  getValue: (CT_ c) => c.defaultConstructor,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_Constructor.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.defaultConstructor == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_Constructor(
-                        c.defaultConstructor, ast, r.template, sink,
-                        parent: r);
-                  },
-                ),
-                'definingClass': Property(
-                  getValue: (CT_ c) => c.definingClass,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_Class.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.definingClass == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_Class(c.definingClass, ast, r.template, sink,
-                        parent: r);
-                  },
-                ),
-                'element': Property(
-                  getValue: (CT_ c) => c.element,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'ClassElement'),
-                  isNullValue: (CT_ c) => c.element == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.element, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['ClassElement']);
-                  },
-                ),
                 'enclosingElement': Property(
                   getValue: (CT_ c) => c.enclosingElement,
                   renderVariable:
@@ -1813,41 +1696,6 @@ class _Renderer_Class extends RendererBase<Class> {
                         parent: r);
                   },
                 ),
-                'hasModifiers': Property(
-                  getValue: (CT_ c) => c.hasModifiers,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasModifiers == true,
-                ),
-                'hasPublicConstructors': Property(
-                  getValue: (CT_ c) => c.hasPublicConstructors,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasPublicConstructors == true,
-                ),
-                'hasPublicImplementors': Property(
-                  getValue: (CT_ c) => c.hasPublicImplementors,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasPublicImplementors == true,
-                ),
-                'hasPublicInheritedMethods': Property(
-                  getValue: (CT_ c) => c.hasPublicInheritedMethods,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasPublicInheritedMethods == true,
-                ),
-                'hasPublicInterfaces': Property(
-                  getValue: (CT_ c) => c.hasPublicInterfaces,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasPublicInterfaces == true,
-                ),
                 'hasPublicMixedInTypes': Property(
                   getValue: (CT_ c) => c.hasPublicMixedInTypes,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -1855,13 +1703,6 @@ class _Renderer_Class extends RendererBase<Class> {
                       self.renderSimpleVariable(c, remainingNames, 'bool'),
                   getBool: (CT_ c) => c.hasPublicMixedInTypes == true,
                 ),
-                'hasPublicSuperChainReversed': Property(
-                  getValue: (CT_ c) => c.hasPublicSuperChainReversed,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasPublicSuperChainReversed == true,
-                ),
                 'href': Property(
                   getValue: (CT_ c) => c.href,
                   renderVariable:
@@ -1886,47 +1727,12 @@ class _Renderer_Class extends RendererBase<Class> {
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
                       self.renderSimpleVariable(
-                          c, remainingNames, 'List<Class>'),
+                          c, remainingNames, 'List<InheritingContainer>'),
                   renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
                     return c.inheritanceChain.map((e) =>
-                        _render_Class(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'inheritedFields': Property(
-                  getValue: (CT_ c) => c.inheritedFields,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Field>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.inheritedFields.map((e) =>
-                        _render_Field(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'inheritedMethods': Property(
-                  getValue: (CT_ c) => c.inheritedMethods,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Method>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.inheritedMethods.map((e) =>
-                        _render_Method(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'inheritedOperators': Property(
-                  getValue: (CT_ c) => c.inheritedOperators,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Operator>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.inheritedOperators.map((e) =>
-                        _render_Operator(e, ast, r.template, sink, parent: r));
+                        _render_InheritingContainer(e, ast, r.template, sink,
+                            parent: r));
                   },
                 ),
                 'instanceFields': Property(
@@ -1941,30 +1747,6 @@ class _Renderer_Class extends RendererBase<Class> {
                         _render_Field(e, ast, r.template, sink, parent: r));
                   },
                 ),
-                'instanceMethods': Property(
-                  getValue: (CT_ c) => c.instanceMethods,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Method>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.instanceMethods.map((e) =>
-                        _render_Method(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'instanceOperators': Property(
-                  getValue: (CT_ c) => c.instanceOperators,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Operator>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.instanceOperators.map((e) =>
-                        _render_Operator(e, ast, r.template, sink, parent: r));
-                  },
-                ),
                 'interfaces': Property(
                   getValue: (CT_ c) => c.interfaces,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -2031,117 +1813,19 @@ class _Renderer_Class extends RendererBase<Class> {
                         parent: r));
                   },
                 ),
-                'modelType': Property(
-                  getValue: (CT_ c) => c.modelType,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_DefinedElementType.propertyMap()
-                            .getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.modelType == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_DefinedElementType(
-                        c.modelType, ast, r.template, sink,
-                        parent: r);
-                  },
+                'publicInheritedInstanceFields': Property(
+                  getValue: (CT_ c) => c.publicInheritedInstanceFields,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.publicInheritedInstanceFields == true,
                 ),
-                'publicConstructorsSorted': Property(
-                  getValue: (CT_ c) => c.publicConstructorsSorted,
+                'publicInterfaces': Property(
+                  getValue: (CT_ c) => c.publicInterfaces,
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
                       self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Constructor>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicConstructorsSorted.map((e) =>
-                        _render_Constructor(e, ast, r.template, sink,
-                            parent: r));
-                  },
-                ),
-                'publicImplementors': Property(
-                  getValue: (CT_ c) => c.publicImplementors,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Class>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicImplementors.map((e) =>
-                        _render_Class(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'publicImplementorsSorted': Property(
-                  getValue: (CT_ c) => c.publicImplementorsSorted,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Class>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicImplementorsSorted.map((e) =>
-                        _render_Class(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'publicInheritedFields': Property(
-                  getValue: (CT_ c) => c.publicInheritedFields,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Field>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicInheritedFields.map((e) =>
-                        _render_Field(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'publicInheritedInstanceFields': Property(
-                  getValue: (CT_ c) => c.publicInheritedInstanceFields,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.publicInheritedInstanceFields == true,
-                ),
-                'publicInheritedInstanceMethods': Property(
-                  getValue: (CT_ c) => c.publicInheritedInstanceMethods,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.publicInheritedInstanceMethods == true,
-                ),
-                'publicInheritedInstanceOperators': Property(
-                  getValue: (CT_ c) => c.publicInheritedInstanceOperators,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) =>
-                      c.publicInheritedInstanceOperators == true,
-                ),
-                'publicInheritedMethods': Property(
-                  getValue: (CT_ c) => c.publicInheritedMethods,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Method>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicInheritedMethods.map((e) =>
-                        _render_Method(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'publicInterfaces': Property(
-                  getValue: (CT_ c) => c.publicInterfaces,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<DefinedElementType>'),
+                          c, remainingNames, 'Iterable<DefinedElementType>'),
                   renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
                     return c.publicInterfaces.map((e) =>
@@ -2162,101 +1846,6 @@ class _Renderer_Class extends RendererBase<Class> {
                             parent: r));
                   },
                 ),
-                'publicSuperChain': Property(
-                  getValue: (CT_ c) => c.publicSuperChain,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<DefinedElementType>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicSuperChain.map((e) =>
-                        _render_DefinedElementType(e, ast, r.template, sink,
-                            parent: r));
-                  },
-                ),
-                'publicSuperChainReversed': Property(
-                  getValue: (CT_ c) => c.publicSuperChainReversed,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<DefinedElementType>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicSuperChainReversed.map((e) =>
-                        _render_DefinedElementType(e, ast, r.template, sink,
-                            parent: r));
-                  },
-                ),
-                'superChain': Property(
-                  getValue: (CT_ c) => c.superChain,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'List<DefinedElementType>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.superChain.map((e) => _render_DefinedElementType(
-                        e, ast, r.template, sink,
-                        parent: r));
-                  },
-                ),
-                'supertype': Property(
-                  getValue: (CT_ c) => c.supertype,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_DefinedElementType.propertyMap()
-                            .getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.supertype == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_DefinedElementType(
-                        c.supertype, ast, r.template, sink,
-                        parent: r);
-                  },
-                ),
-                'typeParameters': Property(
-                  getValue: (CT_ c) => c.typeParameters,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'List<TypeParameter>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.typeParameters.map((e) => _render_TypeParameter(
-                        e, ast, r.template, sink,
-                        parent: r));
-                  },
-                ),
-                'unnamedConstructor': Property(
-                  getValue: (CT_ c) => c.unnamedConstructor,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_Constructor.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.unnamedConstructor == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_Constructor(
-                        c.unnamedConstructor, ast, r.template, sink,
-                        parent: r);
-                  },
-                ),
               });
 
   _Renderer_Class(Class context, RendererBase<Object> parent, Template template,
@@ -2273,29 +1862,28 @@ class _Renderer_Class extends RendererBase<Class> {
   }
 }
 
-String renderClass<T extends Class>(
-    ClassTemplateData<T> context, Template template) {
+String renderClass(ClassTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_ClassTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
 }
 
-void _render_ClassTemplateData<T extends Class>(ClassTemplateData<T> context,
+void _render_ClassTemplateData(ClassTemplateData context,
     List<MustachioNode> ast, Template template, StringSink sink,
     {RendererBase<Object> parent}) {
   var renderer = _Renderer_ClassTemplateData(context, parent, template, sink);
   renderer.renderBlock(ast);
 }
 
-class _Renderer_ClassTemplateData<T extends Class>
-    extends RendererBase<ClassTemplateData<T>> {
+class _Renderer_ClassTemplateData extends RendererBase<ClassTemplateData> {
   static final Map<Type, Object> _propertyMapCache = {};
-  static Map<String, Property<CT_>> propertyMap<T extends Class,
+  static Map<String, Property<CT_>> propertyMap<
           CT_ extends ClassTemplateData>() =>
       _propertyMapCache.putIfAbsent(
           CT_,
           () => {
-                ..._Renderer_TemplateData.propertyMap<T, CT_>(),
+                ..._Renderer_InheritingContainerTemplateData.propertyMap<Class,
+                    CT_>(),
                 'clazz': Property(
                   getValue: (CT_ c) => c.clazz,
                   renderVariable:
@@ -2315,48 +1903,43 @@ class _Renderer_ClassTemplateData<T extends Class>
                     _render_Class(c.clazz, ast, r.template, sink, parent: r);
                   },
                 ),
-                'container': Property(
-                  getValue: (CT_ c) => c.container,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_Container.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.container == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_Container(c.container, ast, r.template, sink,
-                        parent: r);
-                  },
-                ),
-                'htmlBase': Property(
-                  getValue: (CT_ c) => c.htmlBase,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.htmlBase == null,
+              });
+
+  _Renderer_ClassTemplateData(ClassTemplateData context,
+      RendererBase<Object> parent, Template template, StringSink sink)
+      : super(context, parent, template, sink);
+
+  @override
+  Property<ClassTemplateData> getProperty(String key) {
+    if (propertyMap<ClassTemplateData>().containsKey(key)) {
+      return propertyMap<ClassTemplateData>()[key];
+    } else {
+      return null;
+    }
+  }
+}
+
+class _Renderer_CommentReferable extends RendererBase<CommentReferable> {
+  static final Map<Type, Object> _propertyMapCache = {};
+  static Map<String, Property<CT_>> propertyMap<
+          CT_ extends CommentReferable>() =>
+      _propertyMapCache.putIfAbsent(
+          CT_,
+          () => {
+                'element': Property(
+                  getValue: (CT_ c) => c.element,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'Element'),
+                  isNullValue: (CT_ c) => c.element == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.htmlBase, ast, r.template, sink,
-                        parent: r);
+                    renderSimple(c.element, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['Element']);
                   },
                 ),
-                'layoutTitle': Property(
-                  getValue: (CT_ c) => c.layoutTitle,
+                'href': Property(
+                  getValue: (CT_ c) => c.href,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -2368,11 +1951,10 @@ class _Renderer_ClassTemplateData<T extends Class>
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.layoutTitle == null,
+                  isNullValue: (CT_ c) => c.href == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.layoutTitle, ast, r.template, sink,
-                        parent: r);
+                    _render_String(c.href, ast, r.template, sink, parent: r);
                   },
                 ),
                 'library': Property(
@@ -2395,28 +1977,48 @@ class _Renderer_ClassTemplateData<T extends Class>
                         parent: r);
                   },
                 ),
-                'linkedObjectType': Property(
-                  getValue: (CT_ c) => c.linkedObjectType,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
+                'packageGraph': Property(
+                  getValue: (CT_ c) => c.packageGraph,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'PackageGraph'),
+                  isNullValue: (CT_ c) => c.packageGraph == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(c.packageGraph, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['PackageGraph']);
                   },
-                  isNullValue: (CT_ c) => c.linkedObjectType == null,
+                ),
+                'referenceChildren': Property(
+                  getValue: (CT_ c) => c.referenceChildren,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Map<String, CommentReferable>'),
+                  isNullValue: (CT_ c) => c.referenceChildren == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.linkedObjectType, ast, r.template, sink,
-                        parent: r);
+                    renderSimple(c.referenceChildren, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['Map']);
                   },
                 ),
-                'metaDescription': Property(
-                  getValue: (CT_ c) => c.metaDescription,
+                'referenceGrandparentOverrides': Property(
+                  getValue: (CT_ c) => c.referenceGrandparentOverrides,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<CommentReferable>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.referenceGrandparentOverrides.map((e) =>
+                        renderSimple(e, ast, r.template, sink,
+                            parent: r,
+                            getters: _invisibleGetters['CommentReferable']));
+                  },
+                ),
+                'referenceName': Property(
+                  getValue: (CT_ c) => c.referenceName,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -2428,67 +2030,76 @@ class _Renderer_ClassTemplateData<T extends Class>
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.metaDescription == null,
+                  isNullValue: (CT_ c) => c.referenceName == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.metaDescription, ast, r.template, sink,
+                    _render_String(c.referenceName, ast, r.template, sink,
                         parent: r);
                   },
                 ),
-                'navLinks': Property(
-                  getValue: (CT_ c) => c.navLinks,
+                'referenceParents': Property(
+                  getValue: (CT_ c) => c.referenceParents,
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
                       self.renderSimpleVariable(
-                          c, remainingNames, 'List<Documentable>'),
+                          c, remainingNames, 'Iterable<CommentReferable>'),
                   renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    return c.navLinks.map((e) => _render_Documentable(
+                    return c.referenceParents.map((e) => renderSimple(
                         e, ast, r.template, sink,
-                        parent: r));
+                        parent: r,
+                        getters: _invisibleGetters['CommentReferable']));
                   },
                 ),
-                'objectType': Property(
-                  getValue: (CT_ c) => c.objectType,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_Class.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.objectType == null,
+                'scope': Property(
+                  getValue: (CT_ c) => c.scope,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'Scope'),
+                  isNullValue: (CT_ c) => c.scope == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_Class(c.objectType, ast, r.template, sink,
-                        parent: r);
+                    renderSimple(c.scope, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['Scope']);
                   },
                 ),
-                'self': Property(
-                  getValue: (CT_ c) => c.self,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_Class.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.self == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
+              });
+
+  _Renderer_CommentReferable(CommentReferable context,
+      RendererBase<Object> parent, Template template, StringSink sink)
+      : super(context, parent, template, sink);
+
+  @override
+  Property<CommentReferable> getProperty(String key) {
+    if (propertyMap<CommentReferable>().containsKey(key)) {
+      return propertyMap<CommentReferable>()[key];
+    } else {
+      return null;
+    }
+  }
+}
+
+class _Renderer_Constructable extends RendererBase<Constructable> {
+  static final Map<Type, Object> _propertyMapCache = {};
+  static Map<String, Property<CT_>> propertyMap<CT_ extends Constructable>() =>
+      _propertyMapCache.putIfAbsent(
+          CT_,
+          () => {
+                'constructors': Property(
+                  getValue: (CT_ c) => c.constructors,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Constructor>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_Class(c.self, ast, r.template, sink, parent: r);
+                    return c.constructors.map((e) => _render_Constructor(
+                        e, ast, r.template, sink,
+                        parent: r));
                   },
                 ),
-                'sidebarForContainer': Property(
-                  getValue: (CT_ c) => c.sidebarForContainer,
+                'defaultConstructor': Property(
+                  getValue: (CT_ c) => c.defaultConstructor,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -2496,39 +2107,53 @@ class _Renderer_ClassTemplateData<T extends Class>
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
+                        _Renderer_Constructor.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.sidebarForContainer == null,
+                  isNullValue: (CT_ c) => c.defaultConstructor == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.sidebarForContainer, ast, r.template, sink,
+                    _render_Constructor(
+                        c.defaultConstructor, ast, r.template, sink,
                         parent: r);
                   },
                 ),
-                'sidebarForLibrary': Property(
-                  getValue: (CT_ c) => c.sidebarForLibrary,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
+                'extraReferenceChildren': Property(
+                  getValue: (CT_ c) => c.extraReferenceChildren,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames,
+                          'Iterable<MapEntry<String, CommentReferable>>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.extraReferenceChildren.map((e) => renderSimple(
+                        e, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['MapEntry']));
                   },
-                  isNullValue: (CT_ c) => c.sidebarForLibrary == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
+                ),
+                'hasPublicConstructors': Property(
+                  getValue: (CT_ c) => c.hasPublicConstructors,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasPublicConstructors == true,
+                ),
+                'publicConstructorsSorted': Property(
+                  getValue: (CT_ c) => c.publicConstructorsSorted,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Constructor>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.sidebarForLibrary, ast, r.template, sink,
-                        parent: r);
+                    return c.publicConstructorsSorted.map((e) =>
+                        _render_Constructor(e, ast, r.template, sink,
+                            parent: r));
                   },
                 ),
-                'title': Property(
-                  getValue: (CT_ c) => c.title,
+                'unnamedConstructor': Property(
+                  getValue: (CT_ c) => c.unnamedConstructor,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -2536,53 +2161,80 @@ class _Renderer_ClassTemplateData<T extends Class>
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
+                        _Renderer_Constructor.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.title == null,
+                  isNullValue: (CT_ c) => c.unnamedConstructor == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.title, ast, r.template, sink, parent: r);
+                    _render_Constructor(
+                        c.unnamedConstructor, ast, r.template, sink,
+                        parent: r);
                   },
                 ),
               });
 
-  _Renderer_ClassTemplateData(ClassTemplateData<T> context,
-      RendererBase<Object> parent, Template template, StringSink sink)
+  _Renderer_Constructable(Constructable context, RendererBase<Object> parent,
+      Template template, StringSink sink)
       : super(context, parent, template, sink);
 
   @override
-  Property<ClassTemplateData<T>> getProperty(String key) {
-    if (propertyMap<T, ClassTemplateData>().containsKey(key)) {
-      return propertyMap<T, ClassTemplateData>()[key];
+  Property<Constructable> getProperty(String key) {
+    if (propertyMap<Constructable>().containsKey(key)) {
+      return propertyMap<Constructable>()[key];
     } else {
       return null;
     }
   }
 }
 
-class _Renderer_CommentReferable extends RendererBase<CommentReferable> {
+void _render_Constructor(Constructor context, List<MustachioNode> ast,
+    Template template, StringSink sink,
+    {RendererBase<Object> parent}) {
+  var renderer = _Renderer_Constructor(context, parent, template, sink);
+  renderer.renderBlock(ast);
+}
+
+class _Renderer_Constructor extends RendererBase<Constructor> {
   static final Map<Type, Object> _propertyMapCache = {};
-  static Map<String, Property<CT_>> propertyMap<
-          CT_ extends CommentReferable>() =>
+  static Map<String, Property<CT_>> propertyMap<CT_ extends Constructor>() =>
       _propertyMapCache.putIfAbsent(
           CT_,
           () => {
+                ..._Renderer_ModelElement.propertyMap<CT_>(),
+                ..._Renderer_TypeParameters.propertyMap<CT_>(),
+                ..._Renderer_ContainerMember.propertyMap<CT_>(),
+                'characterLocation': Property(
+                  getValue: (CT_ c) => c.characterLocation,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'CharacterLocation'),
+                  isNullValue: (CT_ c) => c.characterLocation == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(c.characterLocation, ast, r.template, sink,
+                        parent: r,
+                        getters: _invisibleGetters['CharacterLocation']);
+                  },
+                ),
                 'element': Property(
                   getValue: (CT_ c) => c.element,
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'Element'),
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'ConstructorElement'),
                   isNullValue: (CT_ c) => c.element == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
                     renderSimple(c.element, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['Element']);
+                        parent: r,
+                        getters: _invisibleGetters['ConstructorElement']);
                   },
                 ),
-                'href': Property(
-                  getValue: (CT_ c) => c.href,
+                'enclosingElement': Property(
+                  getValue: (CT_ c) => c.enclosingElement,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -2590,18 +2242,20 @@ class _Renderer_CommentReferable extends RendererBase<CommentReferable> {
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
+                        _Renderer_ModelElement.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.href == null,
+                  isNullValue: (CT_ c) => c.enclosingElement == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.href, ast, r.template, sink, parent: r);
+                    _render_ModelElement(
+                        c.enclosingElement, ast, r.template, sink,
+                        parent: r);
                   },
                 ),
-                'library': Property(
-                  getValue: (CT_ c) => c.library,
+                'filePath': Property(
+                  getValue: (CT_ c) => c.filePath,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -2609,198 +2263,11 @@ class _Renderer_CommentReferable extends RendererBase<CommentReferable> {
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_Library.propertyMap().getValue(name);
+                        _Renderer_String.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.library == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_Library(c.library, ast, r.template, sink,
-                        parent: r);
-                  },
-                ),
-                'packageGraph': Property(
-                  getValue: (CT_ c) => c.packageGraph,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'PackageGraph'),
-                  isNullValue: (CT_ c) => c.packageGraph == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.packageGraph, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['PackageGraph']);
-                  },
-                ),
-                'referenceChildren': Property(
-                  getValue: (CT_ c) => c.referenceChildren,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Map<String, CommentReferable>'),
-                  isNullValue: (CT_ c) => c.referenceChildren == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.referenceChildren, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['Map']);
-                  },
-                ),
-                'referenceGrandparentOverrides': Property(
-                  getValue: (CT_ c) => c.referenceGrandparentOverrides,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<CommentReferable>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.referenceGrandparentOverrides.map((e) =>
-                        renderSimple(e, ast, r.template, sink,
-                            parent: r,
-                            getters: _invisibleGetters['CommentReferable']));
-                  },
-                ),
-                'referenceName': Property(
-                  getValue: (CT_ c) => c.referenceName,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.referenceName == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.referenceName, ast, r.template, sink,
-                        parent: r);
-                  },
-                ),
-                'referenceParents': Property(
-                  getValue: (CT_ c) => c.referenceParents,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<CommentReferable>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.referenceParents.map((e) => renderSimple(
-                        e, ast, r.template, sink,
-                        parent: r,
-                        getters: _invisibleGetters['CommentReferable']));
-                  },
-                ),
-                'scope': Property(
-                  getValue: (CT_ c) => c.scope,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'Scope'),
-                  isNullValue: (CT_ c) => c.scope == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.scope, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['Scope']);
-                  },
-                ),
-              });
-
-  _Renderer_CommentReferable(CommentReferable context,
-      RendererBase<Object> parent, Template template, StringSink sink)
-      : super(context, parent, template, sink);
-
-  @override
-  Property<CommentReferable> getProperty(String key) {
-    if (propertyMap<CommentReferable>().containsKey(key)) {
-      return propertyMap<CommentReferable>()[key];
-    } else {
-      return null;
-    }
-  }
-}
-
-void _render_Constructor(Constructor context, List<MustachioNode> ast,
-    Template template, StringSink sink,
-    {RendererBase<Object> parent}) {
-  var renderer = _Renderer_Constructor(context, parent, template, sink);
-  renderer.renderBlock(ast);
-}
-
-class _Renderer_Constructor extends RendererBase<Constructor> {
-  static final Map<Type, Object> _propertyMapCache = {};
-  static Map<String, Property<CT_>> propertyMap<CT_ extends Constructor>() =>
-      _propertyMapCache.putIfAbsent(
-          CT_,
-          () => {
-                ..._Renderer_ModelElement.propertyMap<CT_>(),
-                ..._Renderer_TypeParameters.propertyMap<CT_>(),
-                ..._Renderer_ContainerMember.propertyMap<CT_>(),
-                'characterLocation': Property(
-                  getValue: (CT_ c) => c.characterLocation,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'CharacterLocation'),
-                  isNullValue: (CT_ c) => c.characterLocation == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.characterLocation, ast, r.template, sink,
-                        parent: r,
-                        getters: _invisibleGetters['CharacterLocation']);
-                  },
-                ),
-                'element': Property(
-                  getValue: (CT_ c) => c.element,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'ConstructorElement'),
-                  isNullValue: (CT_ c) => c.element == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.element, ast, r.template, sink,
-                        parent: r,
-                        getters: _invisibleGetters['ConstructorElement']);
-                  },
-                ),
-                'enclosingElement': Property(
-                  getValue: (CT_ c) => c.enclosingElement,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_ModelElement.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.enclosingElement == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_ModelElement(
-                        c.enclosingElement, ast, r.template, sink,
-                        parent: r);
-                  },
-                ),
-                'filePath': Property(
-                  getValue: (CT_ c) => c.filePath,
-                  renderVariable:
-                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                    if (remainingNames.isEmpty) {
-                      return self.getValue(c).toString();
-                    }
-                    var name = remainingNames.first;
-                    var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
-                    return nextProperty.renderVariable(self.getValue(c),
-                        nextProperty, [...remainingNames.skip(1)]);
-                  },
-                  isNullValue: (CT_ c) => c.filePath == null,
+                  isNullValue: (CT_ c) => c.filePath == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
                     _render_String(c.filePath, ast, r.template, sink,
@@ -3330,7 +2797,21 @@ class _Renderer_Container extends RendererBase<Container> {
           CT_,
           () => {
                 ..._Renderer_ModelElement.propertyMap<CT_>(),
+                ..._Renderer_Categorization.propertyMap<CT_>(),
                 ..._Renderer_TypeParameters.propertyMap<CT_>(),
+                'allCanonicalModelElements': Property(
+                  getValue: (CT_ c) => c.allCanonicalModelElements,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<ModelElement>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.allCanonicalModelElements.map((e) =>
+                        _render_ModelElement(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
                 'allElements': Property(
                   getValue: (CT_ c) => c.allElements,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -4859,7 +4340,8 @@ class _Renderer_EnumTemplateData extends RendererBase<EnumTemplateData> {
           _propertyMapCache.putIfAbsent(
               CT_,
               () => {
-                    ..._Renderer_ClassTemplateData.propertyMap<Enum, CT_>(),
+                    ..._Renderer_InheritingContainerTemplateData.propertyMap<
+                        Enum, CT_>(),
                     'eNum': Property(
                       getValue: (CT_ c) => c.eNum,
                       renderVariable: (CT_ c, Property<CT_> self,
@@ -4928,7 +4410,6 @@ class _Renderer_Extension extends RendererBase<Extension> {
           CT_,
           () => {
                 ..._Renderer_Container.propertyMap<CT_>(),
-                ..._Renderer_Categorization.propertyMap<CT_>(),
                 'allModelElements': Property(
                   getValue: (CT_ c) => c.allModelElements,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -6597,20 +6078,962 @@ class _Renderer_GetterSetterCombo extends RendererBase<GetterSetterCombo> {
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
+                        _Renderer_String.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.linkedParamsNoMetadata == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_String(
+                        c.linkedParamsNoMetadata, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'modelType': Property(
+                  getValue: (CT_ c) => c.modelType,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_ElementType.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.modelType == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_ElementType(c.modelType, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'oneLineDoc': Property(
+                  getValue: (CT_ c) => c.oneLineDoc,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_String.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.oneLineDoc == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_String(c.oneLineDoc, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'parameters': Property(
+                  getValue: (CT_ c) => c.parameters,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<Parameter>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.parameters.map((e) =>
+                        _render_Parameter(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'readOnly': Property(
+                  getValue: (CT_ c) => c.readOnly,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.readOnly == true,
+                ),
+                'readWrite': Property(
+                  getValue: (CT_ c) => c.readWrite,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.readWrite == true,
+                ),
+                'referenceChildren': Property(
+                  getValue: (CT_ c) => c.referenceChildren,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Map<String, CommentReferable>'),
+                  isNullValue: (CT_ c) => c.referenceChildren == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(c.referenceChildren, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['Map']);
+                  },
+                ),
+                'setter': Property(
+                  getValue: (CT_ c) => c.setter,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_Accessor.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.setter == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_Accessor(c.setter, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'writeOnly': Property(
+                  getValue: (CT_ c) => c.writeOnly,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.writeOnly == true,
+                ),
+              });
+
+  _Renderer_GetterSetterCombo(GetterSetterCombo context,
+      RendererBase<Object> parent, Template template, StringSink sink)
+      : super(context, parent, template, sink);
+
+  @override
+  Property<GetterSetterCombo> getProperty(String key) {
+    if (propertyMap<GetterSetterCombo>().containsKey(key)) {
+      return propertyMap<GetterSetterCombo>()[key];
+    } else {
+      return null;
+    }
+  }
+}
+
+class _Renderer_Indexable extends RendererBase<Indexable> {
+  static final Map<Type, Object> _propertyMapCache = {};
+  static Map<String, Property<CT_>> propertyMap<CT_ extends Indexable>() =>
+      _propertyMapCache.putIfAbsent(
+          CT_,
+          () => {
+                ..._Renderer_Object.propertyMap<CT_>(),
+                'href': Property(
+                  getValue: (CT_ c) => c.href,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_String.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.href == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_String(c.href, ast, r.template, sink, parent: r);
+                  },
+                ),
+                'kind': Property(
+                  getValue: (CT_ c) => c.kind,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_String.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.kind == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_String(c.kind, ast, r.template, sink, parent: r);
+                  },
+                ),
+                'overriddenDepth': Property(
+                  getValue: (CT_ c) => c.overriddenDepth,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'int'),
+                  isNullValue: (CT_ c) => c.overriddenDepth == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(c.overriddenDepth, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['int']);
+                  },
+                ),
+              });
+
+  _Renderer_Indexable(Indexable context, RendererBase<Object> parent,
+      Template template, StringSink sink)
+      : super(context, parent, template, sink);
+
+  @override
+  Property<Indexable> getProperty(String key) {
+    if (propertyMap<Indexable>().containsKey(key)) {
+      return propertyMap<Indexable>()[key];
+    } else {
+      return null;
+    }
+  }
+}
+
+class _Renderer_Inheritable extends RendererBase<Inheritable> {
+  static final Map<Type, Object> _propertyMapCache = {};
+  static Map<String, Property<CT_>> propertyMap<CT_ extends Inheritable>() =>
+      _propertyMapCache.putIfAbsent(
+          CT_,
+          () => {
+                'canonicalLibrary': Property(
+                  getValue: (CT_ c) => c.canonicalLibrary,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_Library.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.canonicalLibrary == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_Library(c.canonicalLibrary, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'features': Property(
+                  getValue: (CT_ c) => c.features,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Set<Feature>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.features.map((e) => renderSimple(
+                        e, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['Feature']));
+                  },
+                ),
+                'inheritance': Property(
+                  getValue: (CT_ c) => c.inheritance,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<InheritingContainer>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.inheritance.map((e) => _render_InheritingContainer(
+                        e, ast, r.template, sink,
+                        parent: r));
+                  },
+                ),
+                'isCovariant': Property(
+                  getValue: (CT_ c) => c.isCovariant,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.isCovariant == true,
+                ),
+                'isInherited': Property(
+                  getValue: (CT_ c) => c.isInherited,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.isInherited == true,
+                ),
+                'isOverride': Property(
+                  getValue: (CT_ c) => c.isOverride,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.isOverride == true,
+                ),
+                'overriddenDepth': Property(
+                  getValue: (CT_ c) => c.overriddenDepth,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'int'),
+                  isNullValue: (CT_ c) => c.overriddenDepth == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(c.overriddenDepth, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['int']);
+                  },
+                ),
+                'overriddenElement': Property(
+                  getValue: (CT_ c) => c.overriddenElement,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_Inheritable.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.overriddenElement == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(c.overriddenElement, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['Inheritable']);
+                  },
+                ),
+              });
+
+  _Renderer_Inheritable(Inheritable context, RendererBase<Object> parent,
+      Template template, StringSink sink)
+      : super(context, parent, template, sink);
+
+  @override
+  Property<Inheritable> getProperty(String key) {
+    if (propertyMap<Inheritable>().containsKey(key)) {
+      return propertyMap<Inheritable>()[key];
+    } else {
+      return null;
+    }
+  }
+}
+
+void _render_InheritingContainer(InheritingContainer context,
+    List<MustachioNode> ast, Template template, StringSink sink,
+    {RendererBase<Object> parent}) {
+  var renderer = _Renderer_InheritingContainer(context, parent, template, sink);
+  renderer.renderBlock(ast);
+}
+
+class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
+  static final Map<Type, Object> _propertyMapCache = {};
+  static Map<String, Property<CT_>> propertyMap<
+          CT_ extends InheritingContainer>() =>
+      _propertyMapCache.putIfAbsent(
+          CT_,
+          () => {
+                ..._Renderer_Container.propertyMap<CT_>(),
+                ..._Renderer_ExtensionTarget.propertyMap<CT_>(),
+                'allFields': Property(
+                  getValue: (CT_ c) => c.allFields,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<Field>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.allFields.map((e) =>
+                        _render_Field(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'allModelElements': Property(
+                  getValue: (CT_ c) => c.allModelElements,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<ModelElement>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.allModelElements.map((e) => _render_ModelElement(
+                        e, ast, r.template, sink,
+                        parent: r));
+                  },
+                ),
+                'constantFields': Property(
+                  getValue: (CT_ c) => c.constantFields,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Field>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.constantFields.map((e) =>
+                        _render_Field(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'declaredFields': Property(
+                  getValue: (CT_ c) => c.declaredFields,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Field>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.declaredFields.map((e) =>
+                        _render_Field(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'declaredMethods': Property(
+                  getValue: (CT_ c) => c.declaredMethods,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Method>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.declaredMethods.map((e) =>
+                        _render_Method(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'definingContainer': Property(
+                  getValue: (CT_ c) => c.definingContainer,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_InheritingContainer.propertyMap()
+                            .getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.definingContainer == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_InheritingContainer(
+                        c.definingContainer, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'element': Property(
+                  getValue: (CT_ c) => c.element,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'ClassElement'),
+                  isNullValue: (CT_ c) => c.element == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(c.element, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['ClassElement']);
+                  },
+                ),
+                'enclosingElement': Property(
+                  getValue: (CT_ c) => c.enclosingElement,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_ModelElement.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.enclosingElement == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_ModelElement(
+                        c.enclosingElement, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'filePath': Property(
+                  getValue: (CT_ c) => c.filePath,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_String.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.filePath == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_String(c.filePath, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'fullkind': Property(
+                  getValue: (CT_ c) => c.fullkind,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_String.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.fullkind == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_String(c.fullkind, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'hasModifiers': Property(
+                  getValue: (CT_ c) => c.hasModifiers,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasModifiers == true,
+                ),
+                'hasPublicImplementors': Property(
+                  getValue: (CT_ c) => c.hasPublicImplementors,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasPublicImplementors == true,
+                ),
+                'hasPublicInheritedMethods': Property(
+                  getValue: (CT_ c) => c.hasPublicInheritedMethods,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasPublicInheritedMethods == true,
+                ),
+                'hasPublicInterfaces': Property(
+                  getValue: (CT_ c) => c.hasPublicInterfaces,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasPublicInterfaces == true,
+                ),
+                'hasPublicSuperChainReversed': Property(
+                  getValue: (CT_ c) => c.hasPublicSuperChainReversed,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasPublicSuperChainReversed == true,
+                ),
+                'href': Property(
+                  getValue: (CT_ c) => c.href,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_String.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.href == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_String(c.href, ast, r.template, sink, parent: r);
+                  },
+                ),
+                'inheritanceChain': Property(
+                  getValue: (CT_ c) => c.inheritanceChain,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<InheritingContainer>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.inheritanceChain.map((e) =>
+                        _render_InheritingContainer(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+                'inheritedFields': Property(
+                  getValue: (CT_ c) => c.inheritedFields,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Field>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.inheritedFields.map((e) =>
+                        _render_Field(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'inheritedMethods': Property(
+                  getValue: (CT_ c) => c.inheritedMethods,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Method>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.inheritedMethods.map((e) =>
+                        _render_Method(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'inheritedOperators': Property(
+                  getValue: (CT_ c) => c.inheritedOperators,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Operator>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.inheritedOperators.map((e) =>
+                        _render_Operator(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'instanceFields': Property(
+                  getValue: (CT_ c) => c.instanceFields,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Field>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.instanceFields.map((e) =>
+                        _render_Field(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'instanceMethods': Property(
+                  getValue: (CT_ c) => c.instanceMethods,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Method>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.instanceMethods.map((e) =>
+                        _render_Method(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'instanceOperators': Property(
+                  getValue: (CT_ c) => c.instanceOperators,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Operator>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.instanceOperators.map((e) =>
+                        _render_Operator(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'isCanonical': Property(
+                  getValue: (CT_ c) => c.isCanonical,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.isCanonical == true,
+                ),
+                'modelType': Property(
+                  getValue: (CT_ c) => c.modelType,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_DefinedElementType.propertyMap()
+                            .getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.modelType == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_DefinedElementType(
+                        c.modelType, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'publicImplementors': Property(
+                  getValue: (CT_ c) => c.publicImplementors,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<InheritingContainer>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicImplementors.map((e) =>
+                        _render_InheritingContainer(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+                'publicImplementorsSorted': Property(
+                  getValue: (CT_ c) => c.publicImplementorsSorted,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<InheritingContainer>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicImplementorsSorted.map((e) =>
+                        _render_InheritingContainer(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+                'publicInheritedFields': Property(
+                  getValue: (CT_ c) => c.publicInheritedFields,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Field>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicInheritedFields.map((e) =>
+                        _render_Field(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'publicInheritedInstanceFields': Property(
+                  getValue: (CT_ c) => c.publicInheritedInstanceFields,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.publicInheritedInstanceFields == true,
+                ),
+                'publicInheritedInstanceMethods': Property(
+                  getValue: (CT_ c) => c.publicInheritedInstanceMethods,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.publicInheritedInstanceMethods == true,
+                ),
+                'publicInheritedInstanceOperators': Property(
+                  getValue: (CT_ c) => c.publicInheritedInstanceOperators,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) =>
+                      c.publicInheritedInstanceOperators == true,
+                ),
+                'publicInheritedMethods': Property(
+                  getValue: (CT_ c) => c.publicInheritedMethods,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<Method>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicInheritedMethods.map((e) =>
+                        _render_Method(e, ast, r.template, sink, parent: r));
+                  },
+                ),
+                'publicInterfaces': Property(
+                  getValue: (CT_ c) => c.publicInterfaces,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<DefinedElementType>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicInterfaces.map((e) =>
+                        _render_DefinedElementType(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+                'publicSuperChain': Property(
+                  getValue: (CT_ c) => c.publicSuperChain,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<DefinedElementType>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicSuperChain.map((e) =>
+                        _render_DefinedElementType(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+                'publicSuperChainReversed': Property(
+                  getValue: (CT_ c) => c.publicSuperChainReversed,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<DefinedElementType>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicSuperChainReversed.map((e) =>
+                        _render_DefinedElementType(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+                'superChain': Property(
+                  getValue: (CT_ c) => c.superChain,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<DefinedElementType>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.superChain.map((e) => _render_DefinedElementType(
+                        e, ast, r.template, sink,
+                        parent: r));
+                  },
+                ),
+                'supertype': Property(
+                  getValue: (CT_ c) => c.supertype,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_DefinedElementType.propertyMap()
+                            .getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.supertype == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_DefinedElementType(
+                        c.supertype, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'typeParameters': Property(
+                  getValue: (CT_ c) => c.typeParameters,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<TypeParameter>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.typeParameters.map((e) => _render_TypeParameter(
+                        e, ast, r.template, sink,
+                        parent: r));
+                  },
+                ),
+              });
+
+  _Renderer_InheritingContainer(InheritingContainer context,
+      RendererBase<Object> parent, Template template, StringSink sink)
+      : super(context, parent, template, sink);
+
+  @override
+  Property<InheritingContainer> getProperty(String key) {
+    if (propertyMap<InheritingContainer>().containsKey(key)) {
+      return propertyMap<InheritingContainer>()[key];
+    } else {
+      return null;
+    }
+  }
+}
+
+class _Renderer_InheritingContainerTemplateData<T extends InheritingContainer>
+    extends RendererBase<InheritingContainerTemplateData<T>> {
+  static final Map<Type, Object> _propertyMapCache = {};
+  static Map<String, Property<CT_>> propertyMap<T extends InheritingContainer,
+          CT_ extends InheritingContainerTemplateData>() =>
+      _propertyMapCache.putIfAbsent(
+          CT_,
+          () => {
+                ..._Renderer_TemplateData.propertyMap<T, CT_>(),
+                'clazz': Property(
+                  getValue: (CT_ c) => c.clazz,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_InheritingContainer.propertyMap()
+                            .getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.clazz == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_InheritingContainer(c.clazz, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'container': Property(
+                  getValue: (CT_ c) => c.container,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_Container.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.container == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_Container(c.container, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'htmlBase': Property(
+                  getValue: (CT_ c) => c.htmlBase,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_String.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.htmlBase == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_String(c.htmlBase, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'layoutTitle': Property(
+                  getValue: (CT_ c) => c.layoutTitle,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_String.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.layoutTitle == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_String(c.layoutTitle, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'library': Property(
+                  getValue: (CT_ c) => c.library,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_Library.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.linkedParamsNoMetadata == null,
+                  isNullValue: (CT_ c) => c.library == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(
-                        c.linkedParamsNoMetadata, ast, r.template, sink,
+                    _render_Library(c.library, ast, r.template, sink,
                         parent: r);
                   },
                 ),
-                'modelType': Property(
-                  getValue: (CT_ c) => c.modelType,
+                'linkedObjectType': Property(
+                  getValue: (CT_ c) => c.linkedObjectType,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -6618,19 +7041,19 @@ class _Renderer_GetterSetterCombo extends RendererBase<GetterSetterCombo> {
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_ElementType.propertyMap().getValue(name);
+                        _Renderer_String.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.modelType == null,
+                  isNullValue: (CT_ c) => c.linkedObjectType == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_ElementType(c.modelType, ast, r.template, sink,
+                    _render_String(c.linkedObjectType, ast, r.template, sink,
                         parent: r);
                   },
                 ),
-                'oneLineDoc': Property(
-                  getValue: (CT_ c) => c.oneLineDoc,
+                'metaDescription': Property(
+                  getValue: (CT_ c) => c.metaDescription,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -6642,54 +7065,28 @@ class _Renderer_GetterSetterCombo extends RendererBase<GetterSetterCombo> {
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.oneLineDoc == null,
+                  isNullValue: (CT_ c) => c.metaDescription == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.oneLineDoc, ast, r.template, sink,
+                    _render_String(c.metaDescription, ast, r.template, sink,
                         parent: r);
                   },
                 ),
-                'parameters': Property(
-                  getValue: (CT_ c) => c.parameters,
+                'navLinks': Property(
+                  getValue: (CT_ c) => c.navLinks,
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
                       self.renderSimpleVariable(
-                          c, remainingNames, 'List<Parameter>'),
+                          c, remainingNames, 'List<Documentable>'),
                   renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    return c.parameters.map((e) =>
-                        _render_Parameter(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'readOnly': Property(
-                  getValue: (CT_ c) => c.readOnly,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.readOnly == true,
-                ),
-                'readWrite': Property(
-                  getValue: (CT_ c) => c.readWrite,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.readWrite == true,
-                ),
-                'referenceChildren': Property(
-                  getValue: (CT_ c) => c.referenceChildren,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Map<String, CommentReferable>'),
-                  isNullValue: (CT_ c) => c.referenceChildren == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.referenceChildren, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['Map']);
+                    return c.navLinks.map((e) => _render_Documentable(
+                        e, ast, r.template, sink,
+                        parent: r));
                   },
                 ),
-                'setter': Property(
-                  getValue: (CT_ c) => c.setter,
+                'objectType': Property(
+                  getValue: (CT_ c) => c.objectType,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -6697,49 +7094,19 @@ class _Renderer_GetterSetterCombo extends RendererBase<GetterSetterCombo> {
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_Accessor.propertyMap().getValue(name);
+                        _Renderer_Class.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.setter == null,
+                  isNullValue: (CT_ c) => c.objectType == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_Accessor(c.setter, ast, r.template, sink,
+                    _render_Class(c.objectType, ast, r.template, sink,
                         parent: r);
                   },
                 ),
-                'writeOnly': Property(
-                  getValue: (CT_ c) => c.writeOnly,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.writeOnly == true,
-                ),
-              });
-
-  _Renderer_GetterSetterCombo(GetterSetterCombo context,
-      RendererBase<Object> parent, Template template, StringSink sink)
-      : super(context, parent, template, sink);
-
-  @override
-  Property<GetterSetterCombo> getProperty(String key) {
-    if (propertyMap<GetterSetterCombo>().containsKey(key)) {
-      return propertyMap<GetterSetterCombo>()[key];
-    } else {
-      return null;
-    }
-  }
-}
-
-class _Renderer_Indexable extends RendererBase<Indexable> {
-  static final Map<Type, Object> _propertyMapCache = {};
-  static Map<String, Property<CT_>> propertyMap<CT_ extends Indexable>() =>
-      _propertyMapCache.putIfAbsent(
-          CT_,
-          () => {
-                ..._Renderer_Object.propertyMap<CT_>(),
-                'href': Property(
-                  getValue: (CT_ c) => c.href,
+                'self': Property(
+                  getValue: (CT_ c) => c.self,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -6747,18 +7114,20 @@ class _Renderer_Indexable extends RendererBase<Indexable> {
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_String.propertyMap().getValue(name);
+                        _Renderer_InheritingContainer.propertyMap()
+                            .getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.href == null,
+                  isNullValue: (CT_ c) => c.self == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.href, ast, r.template, sink, parent: r);
+                    _render_InheritingContainer(c.self, ast, r.template, sink,
+                        parent: r);
                   },
                 ),
-                'kind': Property(
-                  getValue: (CT_ c) => c.kind,
+                'sidebarForContainer': Property(
+                  getValue: (CT_ c) => c.sidebarForContainer,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -6770,48 +7139,15 @@ class _Renderer_Indexable extends RendererBase<Indexable> {
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.kind == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    _render_String(c.kind, ast, r.template, sink, parent: r);
-                  },
-                ),
-                'overriddenDepth': Property(
-                  getValue: (CT_ c) => c.overriddenDepth,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'int'),
-                  isNullValue: (CT_ c) => c.overriddenDepth == null,
+                  isNullValue: (CT_ c) => c.sidebarForContainer == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.overriddenDepth, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['int']);
+                    _render_String(c.sidebarForContainer, ast, r.template, sink,
+                        parent: r);
                   },
                 ),
-              });
-
-  _Renderer_Indexable(Indexable context, RendererBase<Object> parent,
-      Template template, StringSink sink)
-      : super(context, parent, template, sink);
-
-  @override
-  Property<Indexable> getProperty(String key) {
-    if (propertyMap<Indexable>().containsKey(key)) {
-      return propertyMap<Indexable>()[key];
-    } else {
-      return null;
-    }
-  }
-}
-
-class _Renderer_Inheritable extends RendererBase<Inheritable> {
-  static final Map<Type, Object> _propertyMapCache = {};
-  static Map<String, Property<CT_>> propertyMap<CT_ extends Inheritable>() =>
-      _propertyMapCache.putIfAbsent(
-          CT_,
-          () => {
-                'canonicalLibrary': Property(
-                  getValue: (CT_ c) => c.canonicalLibrary,
+                'sidebarForLibrary': Property(
+                  getValue: (CT_ c) => c.sidebarForLibrary,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -6819,77 +7155,19 @@ class _Renderer_Inheritable extends RendererBase<Inheritable> {
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_Library.propertyMap().getValue(name);
+                        _Renderer_String.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.canonicalLibrary == null,
+                  isNullValue: (CT_ c) => c.sidebarForLibrary == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_Library(c.canonicalLibrary, ast, r.template, sink,
+                    _render_String(c.sidebarForLibrary, ast, r.template, sink,
                         parent: r);
                   },
                 ),
-                'features': Property(
-                  getValue: (CT_ c) => c.features,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Set<Feature>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.features.map((e) => renderSimple(
-                        e, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['Feature']));
-                  },
-                ),
-                'inheritance': Property(
-                  getValue: (CT_ c) => c.inheritance,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'List<Class>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.inheritance.map((e) =>
-                        _render_Class(e, ast, r.template, sink, parent: r));
-                  },
-                ),
-                'isCovariant': Property(
-                  getValue: (CT_ c) => c.isCovariant,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.isCovariant == true,
-                ),
-                'isInherited': Property(
-                  getValue: (CT_ c) => c.isInherited,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.isInherited == true,
-                ),
-                'isOverride': Property(
-                  getValue: (CT_ c) => c.isOverride,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.isOverride == true,
-                ),
-                'overriddenDepth': Property(
-                  getValue: (CT_ c) => c.overriddenDepth,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'int'),
-                  isNullValue: (CT_ c) => c.overriddenDepth == null,
-                  renderValue: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.overriddenDepth, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['int']);
-                  },
-                ),
-                'overriddenElement': Property(
-                  getValue: (CT_ c) => c.overriddenElement,
+                'title': Property(
+                  getValue: (CT_ c) => c.title,
                   renderVariable:
                       (CT_ c, Property<CT_> self, List<String> remainingNames) {
                     if (remainingNames.isEmpty) {
@@ -6897,27 +7175,29 @@ class _Renderer_Inheritable extends RendererBase<Inheritable> {
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_Inheritable.propertyMap().getValue(name);
+                        _Renderer_String.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
-                  isNullValue: (CT_ c) => c.overriddenElement == null,
+                  isNullValue: (CT_ c) => c.title == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.overriddenElement, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['Inheritable']);
+                    _render_String(c.title, ast, r.template, sink, parent: r);
                   },
                 ),
               });
 
-  _Renderer_Inheritable(Inheritable context, RendererBase<Object> parent,
-      Template template, StringSink sink)
+  _Renderer_InheritingContainerTemplateData(
+      InheritingContainerTemplateData<T> context,
+      RendererBase<Object> parent,
+      Template template,
+      StringSink sink)
       : super(context, parent, template, sink);
 
   @override
-  Property<Inheritable> getProperty(String key) {
-    if (propertyMap<Inheritable>().containsKey(key)) {
-      return propertyMap<Inheritable>()[key];
+  Property<InheritingContainerTemplateData<T>> getProperty(String key) {
+    if (propertyMap<T, InheritingContainerTemplateData>().containsKey(key)) {
+      return propertyMap<T, InheritingContainerTemplateData>()[key];
     } else {
       return null;
     }
@@ -8799,7 +9079,7 @@ class _Renderer_Mixin extends RendererBase<Mixin> {
       _propertyMapCache.putIfAbsent(
           CT_,
           () => {
-                ..._Renderer_Class.propertyMap<CT_>(),
+                ..._Renderer_InheritingContainer.propertyMap<CT_>(),
                 'fileName': Property(
                   getValue: (CT_ c) => c.fileName,
                   renderVariable:
@@ -8839,20 +9119,14 @@ class _Renderer_Mixin extends RendererBase<Mixin> {
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
                       self.renderSimpleVariable(
-                          c, remainingNames, 'List<Class>'),
+                          c, remainingNames, 'List<InheritingContainer>'),
                   renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
                     return c.inheritanceChain.map((e) =>
-                        _render_Class(e, ast, r.template, sink, parent: r));
+                        _render_InheritingContainer(e, ast, r.template, sink,
+                            parent: r));
                   },
                 ),
-                'isAbstract': Property(
-                  getValue: (CT_ c) => c.isAbstract,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.isAbstract == true,
-                ),
                 'kind': Property(
                   getValue: (CT_ c) => c.kind,
                   renderVariable:
@@ -8936,7 +9210,8 @@ class _Renderer_MixinTemplateData extends RendererBase<MixinTemplateData> {
       _propertyMapCache.putIfAbsent(
           CT_,
           () => {
-                ..._Renderer_ClassTemplateData.propertyMap<Mixin, CT_>(),
+                ..._Renderer_InheritingContainerTemplateData.propertyMap<Mixin,
+                    CT_>(),
                 'mixin': Property(
                   getValue: (CT_ c) => c.mixin,
                   renderVariable:
@@ -11296,7 +11571,7 @@ class _Renderer_Package extends RendererBase<Package> {
   }
 }
 
-String renderError(PackageTemplateData context, Template template) {
+String renderIndex(PackageTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_PackageTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
@@ -11498,7 +11773,7 @@ class _Renderer_PackageTemplateData extends RendererBase<PackageTemplateData> {
   }
 }
 
-String renderIndex(PackageTemplateData context, Template template) {
+String renderError(PackageTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_PackageTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
diff --git a/lib/src/model/accessor.dart b/lib/src/model/accessor.dart
index 48daf92fdf..ddd7c9cd9a 100644
--- a/lib/src/model/accessor.dart
+++ b/lib/src/model/accessor.dart
@@ -157,17 +157,19 @@ class Accessor extends ModelElement implements EnclosedElement {
 class ContainerAccessor extends Accessor with ContainerMember, Inheritable {
   /// Factory will return an [ContainerAccessor] with isInherited = true
   /// if [element] is in [inheritedAccessors].
-  factory ContainerAccessor.from(PropertyAccessorElement element,
-      Set<PropertyAccessorElement> inheritedAccessors, Class enclosingClass) {
+  factory ContainerAccessor.from(
+      PropertyAccessorElement element,
+      Set<PropertyAccessorElement> inheritedAccessors,
+      Container enclosingContainer) {
     ContainerAccessor accessor;
     if (element == null) return null;
     if (inheritedAccessors.contains(element)) {
       accessor = ModelElement.from(
-          element, enclosingClass.library, enclosingClass.packageGraph,
-          enclosingContainer: enclosingClass);
+          element, enclosingContainer.library, enclosingContainer.packageGraph,
+          enclosingContainer: enclosingContainer);
     } else {
       accessor = ModelElement.from(
-          element, enclosingClass.library, enclosingClass.packageGraph);
+          element, enclosingContainer.library, enclosingContainer.packageGraph);
     }
     return accessor;
   }
diff --git a/lib/src/model/class.dart b/lib/src/model/class.dart
index 85090ca9b4..265017c6a8 100644
--- a/lib/src/model/class.dart
+++ b/lib/src/model/class.dart
@@ -3,67 +3,34 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
 import 'package:dartdoc/src/element_type.dart';
-import 'package:dartdoc/src/model/extension_target.dart';
+import 'package:dartdoc/src/model/inheriting_container.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/model_utils.dart' as model_utils;
-import 'package:dartdoc/src/quiver.dart' as quiver;
 import 'package:meta/meta.dart';
 
 import 'comment_referable.dart';
 
-/// A [Container] defined with a `class` declaration in Dart.
-///
-/// Members follow similar naming rules to [Container], with the following
-/// additions:
-///
-/// **instance**: As with [Container], but also includes inherited children.
-/// **inherited**: Filtered getters giving only inherited children.
-class Class extends Container
-    with Categorization, ExtensionTarget
-    implements EnclosedElement {
-  // TODO(srawlins): To make final, remove public getter, setter, rename to be
-  // public, and add `final` modifier.
-  List<DefinedElementType> _mixedInTypes;
-
-  List<DefinedElementType> get mixedInTypes => _mixedInTypes;
-
-  @Deprecated('Field intended to be final; setter will be removed as early as '
-      'Dartdoc 1.0.0')
-  set mixedInTypes(List<DefinedElementType> value) => _mixedInTypes = value;
-
-  // TODO(srawlins): To make final, remove public getter, setter, rename to be
-  // public, and add `final` modifier.
-  DefinedElementType _supertype;
+/// An mixin to build an [InheritingContainer] capable of being constructed
+/// with a direct call to a [Constructor] in Dart.
+mixin Constructable on InheritingContainer {
+  Iterable<Constructor> get constructors => element.constructors
+      .map((e) => ModelElement.from(e, library, packageGraph) as Constructor);
 
-  DefinedElementType get supertype => _supertype;
+  @override
+  bool get hasPublicConstructors => publicConstructors.isNotEmpty;
 
-  @Deprecated('Field intended to be final; setter will be removed as early as '
-      'Dartdoc 1.0.0')
-  set supertype(DefinedElementType value) => _supertype = value;
+  @visibleForTesting
+  Iterable<Constructor> get publicConstructors =>
+      model_utils.filterNonPublic(constructors);
 
-  final List<DefinedElementType> _directInterfaces;
+  List<Constructor> _publicConstructorsSorted;
 
-  Class(ClassElement element, Library library, PackageGraph packageGraph)
-      : _mixedInTypes = element.mixins
-            .map<DefinedElementType>(
-                (f) => ElementType.from(f, library, packageGraph))
-            .where((mixin) => mixin != null)
-            .toList(growable: false),
-        _supertype = element.supertype?.element?.supertype == null
-            ? null
-            : ElementType.from(element.supertype, library, packageGraph),
-        _directInterfaces = element.interfaces
-            .map<DefinedElementType>(
-                (f) => ElementType.from(f, library, packageGraph))
-            .toList(growable: false),
-        super(element, library, packageGraph) {
-    packageGraph.specialClasses.addSpecial(this);
-  }
+  @override
+  Iterable<Constructor> get publicConstructorsSorted =>
+      _publicConstructorsSorted ??= publicConstructors.toList()..sort(byName);
 
   Constructor _unnamedConstructor;
-
   Constructor get unnamedConstructor {
     _unnamedConstructor ??= constructors
         .firstWhere((c) => c.isUnnamedConstructor, orElse: () => null);
@@ -80,93 +47,100 @@ class Class extends Container
     return _defaultConstructor;
   }
 
-  @override
-  Iterable<Method> get instanceMethods =>
-      quiver.concat([super.instanceMethods, inheritedMethods]);
+  static Iterable<MapEntry<String, CommentReferable>> _constructorGenerator(
+      Iterable<Constructor> source) sync* {
+    for (var constructor in source) {
+      yield MapEntry(constructor.referenceName, constructor);
+      yield MapEntry(
+          '${constructor.enclosingElement.referenceName}.${constructor.referenceName}',
+          constructor);
+      if (constructor.isDefaultConstructor) {
+        yield MapEntry('new', constructor);
+      }
+    }
+  }
 
   @override
-  bool get publicInheritedInstanceMethods =>
-      instanceMethods.every((f) => f.isInherited);
+  Iterable<MapEntry<String, CommentReferable>>
+      get extraReferenceChildren sync* {
+    yield* _constructorGenerator(constructors);
+    // TODO(jcollins-g): wean important users off of relying on static method
+    // inheritance (dart-lang/dartdoc#2698)
+    for (var container
+        in publicSuperChain.map((t) => t.modelElement).whereType<Container>()) {
+      for (var modelElement in [
+        ...container.staticFields,
+        ...container.staticMethods,
+      ]) {
+        yield MapEntry(modelElement.referenceName, modelElement);
+      }
+      if (container is Class) {
+        yield* _constructorGenerator(container.constructors);
+      }
+    }
+  }
+}
 
-  @override
-  Iterable<Operator> get instanceOperators =>
-      quiver.concat([super.instanceOperators, inheritedOperators]);
+/// A [Container] defined with a `class` declaration in Dart.
+///
+/// Members follow similar naming rules to [Container], with the following
+/// additions:
+///
+/// **instance**: As with [Container], but also includes inherited children.
+/// **inherited**: Filtered getters giving only inherited children.
+class Class extends InheritingContainer with Constructable {
+  final List<DefinedElementType> mixedInTypes;
 
-  @override
-  bool get publicInheritedInstanceOperators =>
-      publicInstanceOperators.every((f) => f.isInherited);
+  final List<DefinedElementType> _directInterfaces;
+
+  Class(ClassElement element, Library library, PackageGraph packageGraph)
+      : mixedInTypes = element.mixins
+            .map<DefinedElementType>(
+                (f) => ElementType.from(f, library, packageGraph))
+            .where((mixin) => mixin != null)
+            .toList(growable: false),
+        _directInterfaces = element.interfaces
+            .map<DefinedElementType>(
+                (f) => ElementType.from(f, library, packageGraph))
+            .toList(growable: false),
+        super(element, library, packageGraph) {
+    packageGraph.specialClasses.addSpecial(this);
+  }
 
   List<ModelElement> _allModelElements;
 
   @override
   List<ModelElement> get allModelElements {
-    _allModelElements ??= List.from(
-        quiver.concat<ModelElement>([
-          super.allModelElements,
-          constructors,
-          typeParameters,
-        ]),
-        growable: false);
+    _allModelElements ??= <ModelElement>[
+      ...super.allModelElements,
+      ...constructors,
+    ];
     return _allModelElements;
   }
 
-  List<ModelElement> _allCanonicalModelElements;
-
-  List<ModelElement> get allCanonicalModelElements {
-    return (_allCanonicalModelElements ??=
-        allModelElements.where((e) => e.isCanonical).toList());
-  }
-
-  Iterable<Constructor> get constructors => element.constructors
-      .map((e) => ModelElement.from(e, library, packageGraph) as Constructor);
-
-  @override
-  bool get hasPublicConstructors => publicConstructors.isNotEmpty;
-
-  @visibleForTesting
-  Iterable<Constructor> get publicConstructors =>
-      model_utils.filterNonPublic(constructors);
-
-  List<Constructor> _publicConstructorsSorted;
-
-  @override
-  Iterable<Constructor> get publicConstructorsSorted =>
-      _publicConstructorsSorted ??= publicConstructors.toList()..sort(byName);
-
   /// Returns the library that encloses this element.
   @override
   ModelElement get enclosingElement => library;
 
-  @override
-  ClassElement get element => super.element;
-
   @override
   String get fileName => '$name-class.$fileType';
 
   @override
   String get filePath => '${library.dirName}/$fileName';
 
+  @override
   String get fullkind {
     if (isAbstract) return 'abstract $kind';
-    return kind;
+    return super.fullkind;
   }
 
-  bool get hasPublicImplementors => publicImplementors.isNotEmpty;
-
-  bool get hasPublicInterfaces => publicInterfaces.isNotEmpty;
+  @override
+  bool get hasModifiers => super.hasModifiers || hasPublicMixedInTypes;
 
   bool get hasPublicMixedInTypes => publicMixedInTypes.isNotEmpty;
 
-  @override
-  bool get hasModifiers =>
-      hasPublicMixedInTypes ||
-      hasAnnotations ||
-      hasPublicInterfaces ||
-      hasPublicSuperChainReversed ||
-      hasPublicImplementors ||
-      hasPotentiallyApplicableExtensions;
-
-  bool get hasPublicSuperChainReversed => publicSuperChainReversed.isNotEmpty;
+  Iterable<DefinedElementType> get publicMixedInTypes =>
+      model_utils.filterNonPublic(mixedInTypes);
 
   @override
   String get href {
@@ -178,105 +152,13 @@ class Class extends Container
     return '${package.baseHref}$filePath';
   }
 
-  /// Returns the [Class] with the library in which [element] is defined.
-  Class get definingClass =>
-      ModelElement.from(element, definingLibrary, packageGraph);
-
-  /// Returns all the "immediate" public implementors of this class.
-  ///
-  /// If this class has a private implementor, then that is counted as a proxy
-  /// for any public implementors of that private class.
-  Iterable<Class> get publicImplementors {
-    var result = <Class>{};
-    var seen = <Class>{};
-
-    // Recursively adds [implementor] if public, or the implementors of
-    // [implementor] if not.
-    void addToResult(Class implementor) {
-      if (seen.contains(implementor)) return;
-      seen.add(implementor);
-      if (implementor.isPublicAndPackageDocumented) {
-        result.add(implementor);
-      } else {
-        model_utils
-            .findCanonicalFor(packageGraph.implementors[implementor] ?? [])
-            .forEach(addToResult);
-      }
-    }
-
-    model_utils
-        .findCanonicalFor(packageGraph.implementors[this] ?? [])
-        .forEach(addToResult);
-    return result;
-  }
-
-  List<Class> _publicImplementorsSorted;
-
-  Iterable<Class> get publicImplementorsSorted =>
-      _publicImplementorsSorted ??= publicImplementors.toList()..sort(byName);
-
-  /*lazy final*/
-  List<Method> _inheritedMethods;
-
-  Iterable<Method> get inheritedMethods {
-    if (_inheritedMethods == null) {
-      _inheritedMethods = <Method>[];
-      var methodNames = declaredMethods.map((m) => m.element.name).toSet();
-
-      var inheritedMethodElements = _inheritedElements.where((e) {
-        return (e is MethodElement &&
-            !e.isOperator &&
-            e is! PropertyAccessorElement &&
-            !methodNames.contains(e.name));
-      }).toSet();
-
-      for (var e in inheritedMethodElements) {
-        Method m = ModelElement.from(e, library, packageGraph,
-            enclosingContainer: this);
-        _inheritedMethods.add(m);
-      }
-    }
-    return _inheritedMethods;
-  }
-
-  Iterable<Method> get publicInheritedMethods =>
-      model_utils.filterNonPublic(inheritedMethods);
-
-  bool get hasPublicInheritedMethods => publicInheritedMethods.isNotEmpty;
-
-  /*lazy final*/
-  List<Operator> _inheritedOperators;
-
-  Iterable<Operator> get inheritedOperators {
-    if (_inheritedOperators == null) {
-      _inheritedOperators = [];
-      var operatorNames = declaredOperators.map((o) => o.element.name).toSet();
-
-      var inheritedOperatorElements = _inheritedElements.where((e) {
-        return (e is MethodElement &&
-            e.isOperator &&
-            !operatorNames.contains(e.name));
-      }).toSet();
-      for (var e in inheritedOperatorElements) {
-        Operator o = ModelElement.from(e, library, packageGraph,
-            enclosingContainer: this);
-        _inheritedOperators.add(o);
-      }
-    }
-    return _inheritedOperators;
-  }
-
-  Iterable<Field> get inheritedFields => allFields.where((f) => f.isInherited);
-
-  Iterable<Field> get publicInheritedFields =>
-      model_utils.filterNonPublic(inheritedFields);
-
   /// Interfaces directly implemented by this class.
   List<DefinedElementType> get interfaces => _directInterfaces;
 
   /// The public interfaces may include substitutions for intermediate
   /// private interfaces, and so unlike other public* methods, is not
   /// a strict subset of [interfaces].
+  @override
   Iterable<DefinedElementType> get publicInterfaces sync* {
     for (var i in _directInterfaces) {
       /// Do not recurse if we can find an element here.
@@ -294,12 +176,12 @@ class Class extends Container
       // the superchain and publicInterfaces of this interface to pretend
       // as though the hidden class didn't exist and this class was declared
       // directly referencing the canonical classes further up the chain.
-      if (i.modelElement is Class) {
-        var hiddenClass = i.modelElement as Class;
-        if (hiddenClass.publicSuperChain.isNotEmpty) {
-          yield hiddenClass.publicSuperChain.first;
+      if (i.modelElement is InheritingContainer) {
+        var hiddenContainer = i.modelElement as InheritingContainer;
+        if (hiddenContainer.publicSuperChain.isNotEmpty) {
+          yield hiddenContainer.publicSuperChain.first;
         }
-        yield* hiddenClass.publicInterfaces;
+        yield* hiddenContainer.publicInterfaces;
       } else {
         assert(
             false,
@@ -329,277 +211,41 @@ class Class extends Container
     return element.allSupertypes.map((t) => t.element).any(_doCheck);
   }
 
-  /// Returns true if [other] is a parent class for this class.
-  bool _isInheritingFrom(Class other) =>
-      superChain.map((et) => (et.modelElement as Class)).contains(other);
-
-  @Deprecated(
-      'Public method intended to be private; will be removed as early as '
-      'Dartdoc 1.0.0')
-  bool isInheritingFrom(Class other) => _isInheritingFrom(other);
-
   @override
   String get kind => 'class';
 
-  Iterable<DefinedElementType> get publicMixedInTypes =>
-      model_utils.filterNonPublic(mixedInTypes);
-
-  DefinedElementType _modelType;
-
-  @override
-  DefinedElementType get modelType =>
-      _modelType ??= ElementType.from(element.thisType, library, packageGraph);
-
   /// Not the same as superChain as it may include mixins.
   /// It's really not even the same as ordinary Dart inheritance, either,
   /// because we pretend that interfaces are part of the inheritance chain
   /// to include them in the set of things we might link to for documentation
   /// purposes in abstract classes.
-  List<Class> _inheritanceChain;
+  List<InheritingContainer> _inheritanceChain;
 
-  List<Class> get inheritanceChain {
+  @override
+  List<InheritingContainer> get inheritanceChain {
     if (_inheritanceChain == null) {
       _inheritanceChain = [];
       _inheritanceChain.add(this);
 
       /// Caching should make this recursion a little less painful.
-      for (var c
-          in mixedInTypes.reversed.map((e) => (e.modelElement as Class))) {
+      for (var c in mixedInTypes.reversed
+          .map((e) => (e.modelElement as InheritingContainer))) {
         _inheritanceChain.addAll(c.inheritanceChain);
       }
 
-      for (var c in superChain.map((e) => (e.modelElement as Class))) {
+      for (var c
+          in superChain.map((e) => (e.modelElement as InheritingContainer))) {
         _inheritanceChain.addAll(c.inheritanceChain);
       }
 
       /// Interfaces need to come last, because classes in the superChain might
       /// implement them even when they aren't mentioned.
-      _inheritanceChain.addAll(
-          interfaces.expand((e) => (e.modelElement as Class).inheritanceChain));
+      _inheritanceChain.addAll(interfaces.expand(
+          (e) => (e.modelElement as InheritingContainer).inheritanceChain));
     }
     return _inheritanceChain.toList(growable: false);
   }
 
-  List<DefinedElementType> get superChain {
-    var typeChain = <DefinedElementType>[];
-    var parent = supertype;
-    while (parent != null) {
-      typeChain.add(parent);
-      if (parent.type is InterfaceType) {
-        // Avoid adding [Object] to the superChain (_supertype already has this
-        // check)
-        if ((parent.type as InterfaceType)?.superclass?.superclass == null) {
-          parent = null;
-        } else {
-          parent = ElementType.from(
-              (parent.type as InterfaceType).superclass, library, packageGraph);
-        }
-      } else {
-        parent = (parent.modelElement as Class).supertype;
-      }
-    }
-    return typeChain;
-  }
-
-  Iterable<DefinedElementType> get publicSuperChain =>
-      model_utils.filterNonPublic(superChain);
-
-  Iterable<DefinedElementType> get publicSuperChainReversed =>
-      publicSuperChain.toList().reversed;
-
-  List<ExecutableElement> __inheritedElements;
-
-  List<ExecutableElement> get _inheritedElements {
-    if (__inheritedElements == null) {
-      if (element.isDartCoreObject) {
-        return __inheritedElements = <ExecutableElement>[];
-      }
-
-      if (definingLibrary == null) {
-        // [definingLibrary] may be null if [element] has been imported or
-        // exported with a non-normalized URI, like "src//a.dart".
-        // TODO(srawlins): It would be nice to allow references from such
-        // libraries, but for now, PackageGraph.allLibraries is a Map with
-        // LibraryElement keys, which include [Element.location] in their
-        // `==` calculation; I think we should not key off of Elements.
-        return __inheritedElements = <ExecutableElement>[];
-      }
-
-      var inheritance = definingLibrary.inheritanceManager;
-      var cmap = inheritance.getInheritedConcreteMap2(element);
-      var imap = inheritance.getInheritedMap2(element);
-
-      List<ClassElement> inheritanceChainElements;
-
-      var combinedMap = <String, ExecutableElement>{};
-      for (var nameObj in cmap.keys) {
-        combinedMap[nameObj.name] = cmap[nameObj];
-      }
-      for (var nameObj in imap.keys) {
-        if (combinedMap[nameObj.name] != null) {
-          // Elements in the inheritance chain starting from [this.element]
-          // down to, but not including, [Object].
-          inheritanceChainElements ??=
-              inheritanceChain.map((c) => c.element).toList();
-          // [packageGraph.specialClasses] is not available yet.
-          bool _isDartCoreObject(ClassElement e) =>
-              e.name == 'Object' && e.library.name == 'dart.core';
-          assert(inheritanceChainElements
-                  .contains(imap[nameObj].enclosingElement) ||
-              _isDartCoreObject(imap[nameObj].enclosingElement));
-
-          // If the concrete object from [InheritanceManager3.getInheritedConcreteMap2]
-          // is farther from this class in the inheritance chain than the one
-          // provided by InheritedMap2, prefer InheritedMap2.  This
-          // correctly accounts for intermediate abstract classes that have
-          // method/field implementations.
-          if (inheritanceChainElements
-                  .indexOf(combinedMap[nameObj.name].enclosingElement) <
-              inheritanceChainElements
-                  .indexOf(imap[nameObj].enclosingElement)) {
-            combinedMap[nameObj.name] = imap[nameObj];
-          }
-        } else {
-          combinedMap[nameObj.name] = imap[nameObj];
-        }
-      }
-
-      __inheritedElements = combinedMap.values.toList();
-    }
-    return __inheritedElements;
-  }
-
-  List<Field> _allFields;
-
-  List<Field> get allFields {
-    if (_allFields == null) {
-      _allFields = [];
-      var inheritedAccessorElements = <PropertyAccessorElement>{}
-        ..addAll(_inheritedElements.whereType<PropertyAccessorElement>());
-
-      // This structure keeps track of inherited accessors, allowing lookup
-      // by field name (stripping the '=' from setters).
-      var accessorMap = <String, List<PropertyAccessorElement>>{};
-      for (var accessorElement in inheritedAccessorElements) {
-        var name = accessorElement.name.replaceFirst('=', '');
-        accessorMap.putIfAbsent(name, () => []).add(accessorElement);
-      }
-
-      // For half-inherited fields, the analyzer only links the non-inherited
-      // to the [FieldElement].  Compose our [Field] class by hand by looking up
-      // inherited accessors that may be related.
-      for (var f in element.fields) {
-        var getterElement = f.getter;
-        if (getterElement == null && accessorMap.containsKey(f.name)) {
-          getterElement = accessorMap[f.name]
-              .firstWhere((e) => e.isGetter, orElse: () => null);
-        }
-        var setterElement = f.setter;
-        if (setterElement == null && accessorMap.containsKey(f.name)) {
-          setterElement = accessorMap[f.name]
-              .firstWhere((e) => e.isSetter, orElse: () => null);
-        }
-        _addSingleField(
-            getterElement, setterElement, inheritedAccessorElements, f);
-        accessorMap.remove(f.name);
-      }
-
-      // Now we only have inherited accessors who aren't associated with
-      // anything in cls._fields.
-      for (var fieldName in accessorMap.keys) {
-        var elements = accessorMap[fieldName].toList();
-        var getterElement =
-            elements.firstWhere((e) => e.isGetter, orElse: () => null);
-        var setterElement =
-            elements.firstWhere((e) => e.isSetter, orElse: () => null);
-        _addSingleField(
-            getterElement, setterElement, inheritedAccessorElements);
-      }
-    }
-    return _allFields;
-  }
-
-  @override
-  Iterable<Field> get declaredFields => allFields.where((f) => !f.isInherited);
-
-  /// Add a single Field to _fields.
-  ///
-  /// If [f] is not specified, pick the FieldElement from the PropertyAccessorElement
-  /// whose enclosing class inherits from the other (defaulting to the getter)
-  /// and construct a Field using that.
-  void _addSingleField(
-      PropertyAccessorElement getterElement,
-      PropertyAccessorElement setterElement,
-      Set<PropertyAccessorElement> inheritedAccessors,
-      [FieldElement f]) {
-    var getter =
-        ContainerAccessor.from(getterElement, inheritedAccessors, this);
-    var setter =
-        ContainerAccessor.from(setterElement, inheritedAccessors, this);
-    // Rebind getterElement/setterElement as ModelElement.from can resolve
-    // MultiplyInheritedExecutableElements or resolve Members.
-    getterElement = getter?.element;
-    setterElement = setter?.element;
-    assert(!(getter == null && setter == null));
-    if (f == null) {
-      // Pick an appropriate FieldElement to represent this element.
-      // Only hard when dealing with a synthetic Field.
-      if (getter != null && setter == null) {
-        f = getterElement.variable;
-      } else if (getter == null && setter != null) {
-        f = setterElement.variable;
-      } else {
-        /* getter != null && setter != null */
-        // In cases where a Field is composed of two Accessors defined in
-        // different places in the inheritance chain, there are two FieldElements
-        // for this single Field we're trying to compose.  Pick the one closest
-        // to this class on the inheritance chain.
-        if (setter.enclosingElement is Class &&
-            (setter.enclosingElement as Class)
-                ._isInheritingFrom(getter.enclosingElement)) {
-          f = setterElement.variable;
-        } else {
-          f = getterElement.variable;
-        }
-      }
-    }
-    Field field;
-    if ((getter == null || getter.isInherited) &&
-        (setter == null || setter.isInherited)) {
-      // Field is 100% inherited.
-      field = ModelElement.fromPropertyInducingElement(f, library, packageGraph,
-          enclosingContainer: this, getter: getter, setter: setter);
-    } else {
-      // Field is <100% inherited (could be half-inherited).
-      // TODO(jcollins-g): Navigation is probably still confusing for
-      // half-inherited fields when traversing the inheritance tree.  Make
-      // this better, somehow.
-      field = ModelElement.fromPropertyInducingElement(f, library, packageGraph,
-          getter: getter, setter: setter);
-    }
-    _allFields.add(field);
-  }
-
-  Iterable<Method> _declaredMethods;
-
-  @override
-  Iterable<Method> get declaredMethods =>
-      _declaredMethods ??= element.methods.map((e) {
-        return ModelElement.from(e, library, packageGraph) as Method;
-      });
-
-  List<TypeParameter> _typeParameters;
-
-  // a stronger hash?
-  @override
-  List<TypeParameter> get typeParameters {
-    _typeParameters ??= element.typeParameters.map((f) {
-      var lib = Library(f.enclosingElement.library, packageGraph);
-      return ModelElement.from(f, lib, packageGraph) as TypeParameter;
-    }).toList();
-    return _typeParameters;
-  }
-
   Iterable<Field> _instanceFields;
 
   @override
diff --git a/lib/src/model/container.dart b/lib/src/model/container.dart
index f75ffc8217..31eefd2c0f 100644
--- a/lib/src/model/container.dart
+++ b/lib/src/model/container.dart
@@ -29,7 +29,8 @@ import 'package:meta/meta.dart';
 /// **has** : boolean getters indicating whether the underlying getters are
 /// empty.  Mostly for the templating system.
 /// **all** : Referring to all children.
-abstract class Container extends ModelElement with TypeParameters {
+abstract class Container extends ModelElement
+    with Categorization, TypeParameters {
   Container(Element element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph);
 
@@ -65,6 +66,13 @@ abstract class Container extends ModelElement with TypeParameters {
         staticMethods,
       ]);
 
+  List<ModelElement> _allCanonicalModelElements;
+
+  List<ModelElement> get allCanonicalModelElements {
+    return (_allCanonicalModelElements ??=
+        allModelElements.where((e) => e.isCanonical).toList());
+  }
+
   /// All methods, including operators and statics, declared as part of this
   /// [Container].  [declaredMethods] must be the union of [instanceMethods],
   /// [staticMethods], and [instanceOperators].
@@ -83,9 +91,10 @@ abstract class Container extends ModelElement with TypeParameters {
   /// Whether all instance operators are inherited.
   bool get publicInheritedInstanceOperators => false;
 
-  bool get hasPublicConstructors;
+  /// Override if this is [Constructable].
+  bool get hasPublicConstructors => false;
 
-  Iterable<Constructor> get publicConstructorsSorted;
+  Iterable<Constructor> get publicConstructorsSorted => [];
 
   @nonVirtual
   bool get hasPublicInstanceMethods =>
diff --git a/lib/src/model/extension.dart b/lib/src/model/extension.dart
index ff0704c5af..fb01c511e7 100644
--- a/lib/src/model/extension.dart
+++ b/lib/src/model/extension.dart
@@ -10,9 +10,7 @@ import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/quiver.dart' as quiver;
 
 /// Extension methods
-class Extension extends Container
-    with Categorization
-    implements EnclosedElement {
+class Extension extends Container implements EnclosedElement {
   ElementType extendedType;
 
   Extension(
diff --git a/lib/src/model/field.dart b/lib/src/model/field.dart
index d259ff916d..b0ac5e6606 100644
--- a/lib/src/model/field.dart
+++ b/lib/src/model/field.dart
@@ -12,7 +12,7 @@ class Field extends ModelElement
     with GetterSetterCombo, ContainerMember, Inheritable
     implements EnclosedElement {
   bool _isInherited = false;
-  Container _enclosingClass;
+  Container _enclosingContainer;
   @override
   final ContainerAccessor getter;
   @override
@@ -28,14 +28,14 @@ class Field extends ModelElement
 
   factory Field.inherited(
       FieldElement element,
-      Class enclosingClass,
+      Container enclosingContainer,
       Library library,
       PackageGraph packageGraph,
       Accessor getter,
       Accessor setter) {
     var newField = Field(element, library, packageGraph, getter, setter);
     newField._isInherited = true;
-    newField._enclosingClass = enclosingClass;
+    newField._enclosingContainer = enclosingContainer;
     // Can't set _isInherited to true if this is the defining element, because
     // that would mean it isn't inherited.
     assert(newField.enclosingElement != newField.definingEnclosingContainer);
@@ -57,9 +57,9 @@ class Field extends ModelElement
 
   @override
   ModelElement get enclosingElement {
-    _enclosingClass ??=
+    _enclosingContainer ??=
         ModelElement.from(field.enclosingElement, library, packageGraph);
-    return _enclosingClass;
+    return _enclosingContainer;
   }
 
   @override
diff --git a/lib/src/model/inheritable.dart b/lib/src/model/inheritable.dart
index 5b6a9dd4cb..f93ada56db 100644
--- a/lib/src/model/inheritable.dart
+++ b/lib/src/model/inheritable.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:dartdoc/src/model/feature.dart';
+import 'package:dartdoc/src/model/inheriting_container.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/special_elements.dart';
 
@@ -45,13 +46,10 @@ mixin Inheritable on ContainerMember {
     if (canonicalEnclosingContainer is Extension) {
       return this;
     }
-    if (canonicalEnclosingContainer is Class) {
-      return (canonicalEnclosingContainer as Class)
-          ?.allCanonicalModelElements
-          ?.firstWhere(
-              (m) =>
-                  m.name == name && m.isPropertyAccessor == isPropertyAccessor,
-              orElse: () => null);
+    if (canonicalEnclosingContainer is Container) {
+      return canonicalEnclosingContainer.allCanonicalModelElements.firstWhere(
+          (m) => m.name == name && m.isPropertyAccessor == isPropertyAccessor,
+          orElse: () => null);
     }
     if (canonicalEnclosingContainer != null) {
       throw UnimplementedError('$canonicalEnclosingContainer: unknown type');
@@ -65,9 +63,9 @@ mixin Inheritable on ContainerMember {
       var searchElement = element.declaration;
       // TODO(jcollins-g): generate warning if an inherited element's definition
       // is in an intermediate non-canonical class in the inheritance chain?
-      Class previous;
-      Class previousNonSkippable;
-      Class found;
+      Container previous;
+      Container previousNonSkippable;
+      Container found;
       for (var c in inheritance.reversed) {
         // Filter out mixins.
         if (c.containsElement(searchElement)) {
@@ -79,7 +77,7 @@ mixin Inheritable on ContainerMember {
                 .memberByExample(this)
                 .canonicalEnclosingContainer;
           }
-          Class canonicalC =
+          Container canonicalC =
               packageGraph.findCanonicalModelElementFor(c.element);
           // TODO(jcollins-g): invert this lookup so traversal is recursive
           // starting from the ModelElement.
@@ -112,9 +110,10 @@ mixin Inheritable on ContainerMember {
     return super.computeCanonicalEnclosingContainer();
   }
 
-  List<Class> get inheritance {
-    var inheritance = <Class>[];
-    inheritance.addAll((enclosingElement as Class).inheritanceChain);
+  List<InheritingContainer> get inheritance {
+    var inheritance = <InheritingContainer>[];
+    inheritance
+        .addAll((enclosingElement as InheritingContainer).inheritanceChain);
     var object = packageGraph.specialClasses[SpecialClass.object];
     if (!inheritance.contains(definingEnclosingContainer) &&
         definingEnclosingContainer != null) {
@@ -146,7 +145,8 @@ mixin Inheritable on ContainerMember {
         _isOverride = false;
         return _isOverride;
       }
-      Class enclosingCanonical = enclosingElement.canonicalModelElement;
+      InheritingContainer enclosingCanonical =
+          enclosingElement.canonicalModelElement;
       // The container in which this element was defined, canonical if available.
       Container definingCanonical =
           definingEnclosingContainer.canonicalModelElement ??
diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
new file mode 100644
index 0000000000..bd6c1f1f58
--- /dev/null
+++ b/lib/src/model/inheriting_container.dart
@@ -0,0 +1,462 @@
+// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:dartdoc/src/element_type.dart';
+import 'package:dartdoc/src/model/class.dart';
+import 'package:dartdoc/src/model/extension_target.dart';
+import 'package:dartdoc/src/model/model.dart';
+import 'package:dartdoc/src/model_utils.dart' as model_utils;
+import 'package:dartdoc/src/quiver.dart' as quiver;
+
+/// A [Container] that participates in inheritance in Dart.
+///
+/// Members follow similar naming rules to [Container], with the following
+/// additions:
+///
+/// **instance**: As with [Container], but also includes inherited children.
+/// **inherited**: Filtered getters giving only inherited children.
+abstract class InheritingContainer extends Container
+    with ExtensionTarget
+    implements EnclosedElement {
+  // TODO(srawlins): To make final, remove public getter, setter, rename to be
+  // public, and add `final` modifier.
+  DefinedElementType _supertype;
+
+  DefinedElementType get supertype => _supertype;
+
+  @Deprecated('Field intended to be final; setter will be removed as early as '
+      'Dartdoc 1.0.0')
+  set supertype(DefinedElementType value) => _supertype = value;
+
+  InheritingContainer(
+      ClassElement element, Library library, PackageGraph packageGraph)
+      : _supertype = element.supertype?.element?.supertype == null
+            ? null
+            : ElementType.from(element.supertype, library, packageGraph),
+        super(element, library, packageGraph);
+
+  @override
+  Iterable<Method> get instanceMethods =>
+      quiver.concat([super.instanceMethods, inheritedMethods]);
+
+  @override
+  bool get publicInheritedInstanceMethods =>
+      instanceMethods.every((f) => f.isInherited);
+
+  @override
+  Iterable<Operator> get instanceOperators =>
+      quiver.concat([super.instanceOperators, inheritedOperators]);
+
+  @override
+  bool get publicInheritedInstanceOperators =>
+      publicInstanceOperators.every((f) => f.isInherited);
+
+  List<ModelElement> _allModelElements;
+
+  @override
+  List<ModelElement> get allModelElements {
+    _allModelElements ??= List.from(
+        quiver.concat<ModelElement>([
+          super.allModelElements,
+          typeParameters,
+        ]),
+        growable: false);
+    return _allModelElements;
+  }
+
+  bool get hasPublicImplementors => publicImplementors.isNotEmpty;
+
+  /// Returns all the "immediate" public implementors of this
+  /// [InheritingContainer].  For a [Mixin], this is actually the mixin
+  /// applications using the [Mixin].
+  ///
+  /// If this [InheritingContainer] has a private implementor, then that is
+  /// counted as a proxy for any public implementors of that private container.
+  Iterable<InheritingContainer> get publicImplementors {
+    var result = <InheritingContainer>{};
+    var seen = <InheritingContainer>{};
+
+    // Recursively adds [implementor] if public, or the implementors of
+    // [implementor] if not.
+    void addToResult(InheritingContainer implementor) {
+      if (seen.contains(implementor)) return;
+      seen.add(implementor);
+      if (implementor.isPublicAndPackageDocumented) {
+        result.add(implementor);
+      } else {
+        model_utils
+            .findCanonicalFor(packageGraph.implementors[implementor] ?? [])
+            .forEach(addToResult);
+      }
+    }
+
+    model_utils
+        .findCanonicalFor(packageGraph.implementors[this] ?? [])
+        .forEach(addToResult);
+    return result;
+  }
+
+  List<InheritingContainer> _publicImplementorsSorted;
+
+  Iterable<InheritingContainer> get publicImplementorsSorted =>
+      _publicImplementorsSorted ??= publicImplementors.toList()..sort(byName);
+
+  /// Returns the [InheritingContainer] with the library in which [element] is defined.
+  InheritingContainer get definingContainer =>
+      ModelElement.from(element, definingLibrary, packageGraph);
+
+  /// Returns the library that encloses this element.
+  @override
+  ModelElement get enclosingElement => library;
+
+  @override
+  ClassElement get element => super.element;
+
+  @override
+  String get filePath => '${library.dirName}/$fileName';
+
+  String get fullkind => kind;
+
+  bool get hasPublicInterfaces => publicInterfaces.isNotEmpty;
+
+  @override
+  bool get hasModifiers =>
+      hasAnnotations ||
+      hasPublicSuperChainReversed ||
+      hasPublicInterfaces ||
+      hasPotentiallyApplicableExtensions;
+
+  bool get hasPublicSuperChainReversed => publicSuperChainReversed.isNotEmpty;
+
+  @override
+  String get href {
+    if (!identical(canonicalModelElement, this)) {
+      return canonicalModelElement?.href;
+    }
+    assert(canonicalLibrary != null);
+    assert(canonicalLibrary == library);
+    return '${package.baseHref}$filePath';
+  }
+
+  /*lazy final*/
+  List<Method> _inheritedMethods;
+
+  Iterable<Method> get inheritedMethods {
+    if (_inheritedMethods == null) {
+      _inheritedMethods = <Method>[];
+      var methodNames = declaredMethods.map((m) => m.element.name).toSet();
+
+      var inheritedMethodElements = _inheritedElements.where((e) {
+        return (e is MethodElement &&
+            !e.isOperator &&
+            e is! PropertyAccessorElement &&
+            !methodNames.contains(e.name));
+      }).toSet();
+
+      for (var e in inheritedMethodElements) {
+        Method m = ModelElement.from(e, library, packageGraph,
+            enclosingContainer: this);
+        _inheritedMethods.add(m);
+      }
+    }
+    return _inheritedMethods;
+  }
+
+  Iterable<Method> get publicInheritedMethods =>
+      model_utils.filterNonPublic(inheritedMethods);
+
+  bool get hasPublicInheritedMethods => publicInheritedMethods.isNotEmpty;
+
+  /*lazy final*/
+  List<Operator> _inheritedOperators;
+
+  Iterable<Operator> get inheritedOperators {
+    if (_inheritedOperators == null) {
+      _inheritedOperators = [];
+      var operatorNames = declaredOperators.map((o) => o.element.name).toSet();
+
+      var inheritedOperatorElements = _inheritedElements.where((e) {
+        return (e is MethodElement &&
+            e.isOperator &&
+            !operatorNames.contains(e.name));
+      }).toSet();
+      for (var e in inheritedOperatorElements) {
+        Operator o = ModelElement.from(e, library, packageGraph,
+            enclosingContainer: this);
+        _inheritedOperators.add(o);
+      }
+    }
+    return _inheritedOperators;
+  }
+
+  Iterable<Field> get inheritedFields => allFields.where((f) => f.isInherited);
+
+  Iterable<DefinedElementType> get publicInterfaces => [];
+
+  Iterable<Field> get publicInheritedFields =>
+      model_utils.filterNonPublic(inheritedFields);
+
+  @override
+  bool get isCanonical => super.isCanonical && isPublic;
+
+  /// Returns true if [other] is a parent class for this class.
+  bool _isInheritingFrom(InheritingContainer other) => superChain
+      .map((et) => (et.modelElement as InheritingContainer))
+      .contains(other);
+
+  @Deprecated(
+      'Public method intended to be private; will be removed as early as '
+      'Dartdoc 1.0.0')
+  bool isInheritingFrom(InheritingContainer other) => _isInheritingFrom(other);
+
+  DefinedElementType _modelType;
+
+  @override
+  DefinedElementType get modelType =>
+      _modelType ??= ElementType.from(element.thisType, library, packageGraph);
+
+  /// Not the same as superChain as it may include mixins.
+  /// It's really not even the same as ordinary Dart inheritance, either,
+  /// because we pretend that interfaces are part of the inheritance chain
+  /// to include them in the set of things we might link to for documentation
+  /// purposes in abstract classes.
+  List<InheritingContainer> get inheritanceChain;
+
+  List<DefinedElementType> get superChain {
+    var typeChain = <DefinedElementType>[];
+    var parent = supertype;
+    while (parent != null) {
+      typeChain.add(parent);
+      if (parent.type is InterfaceType) {
+        // Avoid adding [Object] to the superChain (_supertype already has this
+        // check)
+        if ((parent.type as InterfaceType)?.superclass?.superclass == null) {
+          parent = null;
+        } else {
+          parent = ElementType.from(
+              (parent.type as InterfaceType).superclass, library, packageGraph);
+        }
+      } else {
+        parent = (parent.modelElement as Class).supertype;
+      }
+    }
+    return typeChain;
+  }
+
+  Iterable<DefinedElementType> get publicSuperChain =>
+      model_utils.filterNonPublic(superChain);
+
+  Iterable<DefinedElementType> get publicSuperChainReversed =>
+      publicSuperChain.toList().reversed;
+
+  List<ExecutableElement> __inheritedElements;
+
+  List<ExecutableElement> get _inheritedElements {
+    if (__inheritedElements == null) {
+      if (element.isDartCoreObject) {
+        return __inheritedElements = <ExecutableElement>[];
+      }
+
+      if (definingLibrary == null) {
+        // [definingLibrary] may be null if [element] has been imported or
+        // exported with a non-normalized URI, like "src//a.dart".
+        // TODO(srawlins): It would be nice to allow references from such
+        // libraries, but for now, PackageGraph.allLibraries is a Map with
+        // LibraryElement keys, which include [Element.location] in their
+        // `==` calculation; I think we should not key off of Elements.
+        return __inheritedElements = <ExecutableElement>[];
+      }
+
+      var inheritance = definingLibrary.inheritanceManager;
+      var cmap = inheritance.getInheritedConcreteMap2(element);
+      var imap = inheritance.getInheritedMap2(element);
+
+      List<ClassElement> inheritanceChainElements;
+
+      var combinedMap = <String, ExecutableElement>{};
+      for (var nameObj in cmap.keys) {
+        combinedMap[nameObj.name] = cmap[nameObj];
+      }
+      for (var nameObj in imap.keys) {
+        if (combinedMap[nameObj.name] != null) {
+          // Elements in the inheritance chain starting from [this.element]
+          // down to, but not including, [Object].
+          inheritanceChainElements ??=
+              inheritanceChain.map((c) => c.element).toList();
+          // [packageGraph.specialClasses] is not available yet.
+          bool _isDartCoreObject(ClassElement e) =>
+              e.name == 'Object' && e.library.name == 'dart.core';
+          if (!(inheritanceChainElements
+                  .contains(imap[nameObj].enclosingElement) ||
+              _isDartCoreObject(imap[nameObj].enclosingElement))) {
+            print('wtf');
+          }
+
+          // If the concrete object from [InheritanceManager3.getInheritedConcreteMap2]
+          // is farther from this class in the inheritance chain than the one
+          // provided by InheritedMap2, prefer InheritedMap2.  This
+          // correctly accounts for intermediate abstract classes that have
+          // method/field implementations.
+          if (inheritanceChainElements
+                  .indexOf(combinedMap[nameObj.name].enclosingElement) <
+              inheritanceChainElements
+                  .indexOf(imap[nameObj].enclosingElement)) {
+            combinedMap[nameObj.name] = imap[nameObj];
+          }
+        } else {
+          combinedMap[nameObj.name] = imap[nameObj];
+        }
+      }
+
+      __inheritedElements = combinedMap.values.toList();
+    }
+    return __inheritedElements;
+  }
+
+  List<Field> _allFields;
+
+  List<Field> get allFields {
+    if (_allFields == null) {
+      _allFields = [];
+      var inheritedAccessorElements = <PropertyAccessorElement>{}
+        ..addAll(_inheritedElements.whereType<PropertyAccessorElement>());
+
+      // This structure keeps track of inherited accessors, allowing lookup
+      // by field name (stripping the '=' from setters).
+      var accessorMap = <String, List<PropertyAccessorElement>>{};
+      for (var accessorElement in inheritedAccessorElements) {
+        var name = accessorElement.name.replaceFirst('=', '');
+        accessorMap.putIfAbsent(name, () => []).add(accessorElement);
+      }
+
+      // For half-inherited fields, the analyzer only links the non-inherited
+      // to the [FieldElement].  Compose our [Field] class by hand by looking up
+      // inherited accessors that may be related.
+      for (var f in element.fields) {
+        var getterElement = f.getter;
+        if (getterElement == null && accessorMap.containsKey(f.name)) {
+          getterElement = accessorMap[f.name]
+              .firstWhere((e) => e.isGetter, orElse: () => null);
+        }
+        var setterElement = f.setter;
+        if (setterElement == null && accessorMap.containsKey(f.name)) {
+          setterElement = accessorMap[f.name]
+              .firstWhere((e) => e.isSetter, orElse: () => null);
+        }
+        _addSingleField(
+            getterElement, setterElement, inheritedAccessorElements, f);
+        accessorMap.remove(f.name);
+      }
+
+      // Now we only have inherited accessors who aren't associated with
+      // anything in cls._fields.
+      for (var fieldName in accessorMap.keys) {
+        var elements = accessorMap[fieldName].toList();
+        var getterElement =
+            elements.firstWhere((e) => e.isGetter, orElse: () => null);
+        var setterElement =
+            elements.firstWhere((e) => e.isSetter, orElse: () => null);
+        _addSingleField(
+            getterElement, setterElement, inheritedAccessorElements);
+      }
+    }
+    return _allFields;
+  }
+
+  @override
+  Iterable<Field> get declaredFields => allFields.where((f) => !f.isInherited);
+
+  /// Add a single Field to _fields.
+  ///
+  /// If [f] is not specified, pick the FieldElement from the PropertyAccessorElement
+  /// whose enclosing class inherits from the other (defaulting to the getter)
+  /// and construct a Field using that.
+  void _addSingleField(
+      PropertyAccessorElement getterElement,
+      PropertyAccessorElement setterElement,
+      Set<PropertyAccessorElement> inheritedAccessors,
+      [FieldElement f]) {
+    var getter =
+        ContainerAccessor.from(getterElement, inheritedAccessors, this);
+    var setter =
+        ContainerAccessor.from(setterElement, inheritedAccessors, this);
+    // Rebind getterElement/setterElement as ModelElement.from can resolve
+    // MultiplyInheritedExecutableElements or resolve Members.
+    getterElement = getter?.element;
+    setterElement = setter?.element;
+    assert(!(getter == null && setter == null));
+    if (f == null) {
+      // Pick an appropriate FieldElement to represent this element.
+      // Only hard when dealing with a synthetic Field.
+      if (getter != null && setter == null) {
+        f = getterElement.variable;
+      } else if (getter == null && setter != null) {
+        f = setterElement.variable;
+      } else {
+        /* getter != null && setter != null */
+        // In cases where a Field is composed of two Accessors defined in
+        // different places in the inheritance chain, there are two FieldElements
+        // for this single Field we're trying to compose.  Pick the one closest
+        // to this class on the inheritance chain.
+        if (setter.enclosingElement is Class &&
+            (setter.enclosingElement as Class)
+                ._isInheritingFrom(getter.enclosingElement)) {
+          f = setterElement.variable;
+        } else {
+          f = getterElement.variable;
+        }
+      }
+    }
+    Field field;
+    if ((getter == null || getter.isInherited) &&
+        (setter == null || setter.isInherited)) {
+      // Field is 100% inherited.
+      field = ModelElement.fromPropertyInducingElement(f, library, packageGraph,
+          enclosingContainer: this, getter: getter, setter: setter);
+    } else {
+      // Field is <100% inherited (could be half-inherited).
+      // TODO(jcollins-g): Navigation is probably still confusing for
+      // half-inherited fields when traversing the inheritance tree.  Make
+      // this better, somehow.
+      field = ModelElement.fromPropertyInducingElement(f, library, packageGraph,
+          getter: getter, setter: setter);
+    }
+    _allFields.add(field);
+  }
+
+  Iterable<Method> _declaredMethods;
+
+  @override
+  Iterable<Method> get declaredMethods =>
+      _declaredMethods ??= element.methods.map((e) {
+        return ModelElement.from(e, library, packageGraph) as Method;
+      });
+
+  List<TypeParameter> _typeParameters;
+
+  // a stronger hash?
+  @override
+  List<TypeParameter> get typeParameters {
+    _typeParameters ??= element.typeParameters.map((f) {
+      var lib = Library(f.enclosingElement.library, packageGraph);
+      return ModelElement.from(f, lib, packageGraph) as TypeParameter;
+    }).toList();
+    return _typeParameters;
+  }
+
+  Iterable<Field> _instanceFields;
+
+  @override
+  Iterable<Field> get instanceFields =>
+      _instanceFields ??= allFields.where((f) => !f.isStatic);
+
+  @override
+  bool get publicInheritedInstanceFields =>
+      publicInstanceFields.every((f) => f.isInherited);
+
+  @override
+  Iterable<Field> get constantFields => allFields.where((f) => f.isConst);
+}
diff --git a/lib/src/model/mixin.dart b/lib/src/model/mixin.dart
index 6daaa12270..961f2ecf51 100644
--- a/lib/src/model/mixin.dart
+++ b/lib/src/model/mixin.dart
@@ -5,41 +5,17 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:dartdoc/src/element_type.dart';
+import 'package:dartdoc/src/model/inheriting_container.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/model_utils.dart' as model_utils;
 import 'package:dartdoc/src/special_elements.dart';
 
 /// Implements the Dart 2.1 "mixin" style of mixin declarations.
-class Mixin extends Class {
+class Mixin extends InheritingContainer {
   Mixin(ClassElement element, Library library, PackageGraph packageGraph)
-      : super(element, library, packageGraph);
-
-  @override
-  bool get isAbstract => false;
-
-  List<Class> _inheritanceChain;
-
-  @override
-  List<Class> get inheritanceChain {
-    if (_inheritanceChain == null) {
-      _inheritanceChain = [];
-      _inheritanceChain.add(this);
-
-      // Mix-in interfaces come before other interfaces.
-      _inheritanceChain.addAll(superclassConstraints
-          .expand((ParameterizedElementType i) =>
-              (i.modelElement as Class).inheritanceChain)
-          .where((Class c) =>
-              c != packageGraph.specialClasses[SpecialClass.object]));
-
-      // Interfaces need to come last, because classes in the superChain might
-      // implement them even when they aren't mentioned.
-      _inheritanceChain.addAll(
-          interfaces.expand((e) => (e.modelElement as Class).inheritanceChain));
-    }
-    return _inheritanceChain.toList(growable: false);
+      : super(element, library, packageGraph) {
+    assert(element.interfaces.isEmpty);
   }
-
   List<ParameterizedElementType> _superclassConstraints;
 
   /// Returns a list of superclass constraints for this mixin.
@@ -65,4 +41,22 @@ class Mixin extends Class {
 
   @override
   String get kind => 'mixin';
+
+  List<InheritingContainer> _inheritanceChain;
+
+  @override
+  List<InheritingContainer> get inheritanceChain {
+    if (_inheritanceChain == null) {
+      _inheritanceChain = [];
+      _inheritanceChain.add(this);
+
+      // Mix-in interfaces come before other interfaces.
+      _inheritanceChain.addAll(superclassConstraints
+          .expand((ParameterizedElementType i) =>
+              (i.modelElement as InheritingContainer).inheritanceChain)
+          .where((InheritingContainer c) =>
+              c != packageGraph.specialClasses[SpecialClass.object]));
+    }
+    return _inheritanceChain.toList(growable: false);
+  }
 }
diff --git a/lib/src/model/model.dart b/lib/src/model/model.dart
index 34557bf9ef..a6d40f3d2f 100644
--- a/lib/src/model/model.dart
+++ b/lib/src/model/model.dart
@@ -22,6 +22,7 @@ export 'field.dart';
 export 'getter_setter_combo.dart';
 export 'indexable.dart';
 export 'inheritable.dart';
+export 'inheriting_container.dart';
 export 'library.dart';
 export 'library_container.dart';
 export 'locatable.dart';
diff --git a/lib/src/model/operator.dart b/lib/src/model/operator.dart
index 68551e541c..1a7b6eda74 100644
--- a/lib/src/model/operator.dart
+++ b/lib/src/model/operator.dart
@@ -11,9 +11,9 @@ class Operator extends Method {
   Operator(MethodElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph);
 
-  Operator.inherited(MethodElement element, Class enclosingClass,
+  Operator.inherited(MethodElement element, Container enclosingContainer,
       Library library, PackageGraph packageGraph, {Member originalMember})
-      : super.inherited(element, enclosingClass, library, packageGraph,
+      : super.inherited(element, enclosingContainer, library, packageGraph,
             originalMember: originalMember);
 
   @override
diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart
index 94f7c2d547..e0c878e43e 100644
--- a/lib/src/model/package_graph.dart
+++ b/lib/src/model/package_graph.dart
@@ -98,6 +98,7 @@ class PackageGraph with CommentReferable, Nameable {
     for (var package in documentedPackages) {
       for (var library in package.libraries) {
         _addToImplementors(library.allClasses);
+        _addToImplementors(library.mixins);
         _extensions.addAll(library.extensions);
       }
       if (package.isLocal && !package.hasPublicLibraries) {
@@ -181,7 +182,7 @@ class PackageGraph with CommentReferable, Nameable {
   /// is true.
   bool allExtensionsAdded = false;
 
-  Map<Class, List<Class>> get implementors {
+  Map<InheritingContainer, List<InheritingContainer>> get implementors {
     assert(allImplementorsAdded);
     return _implementors;
   }
@@ -219,9 +220,12 @@ class PackageGraph with CommentReferable, Nameable {
       HashMap<Tuple2<Element, Library>, Set<ModelElement>>();
 
   /// A mapping of the list of classes which implement each class.
-  final _implementors = LinkedHashMap<Class, List<Class>>(
-      equals: (Class a, Class b) => a.definingClass == b.definingClass,
-      hashCode: (Class clazz) => clazz.definingClass.hashCode);
+  final _implementors =
+      LinkedHashMap<InheritingContainer, List<InheritingContainer>>(
+          equals: (InheritingContainer a, InheritingContainer b) =>
+              a.definingContainer == b.definingContainer,
+          hashCode: (InheritingContainer clazz) =>
+              clazz.definingContainer.hashCode);
 
   /// A list of extensions that exist in the package graph.
   final List<Extension> _extensions = [];
@@ -583,15 +587,16 @@ class PackageGraph with CommentReferable, Nameable {
     return hrefMap;
   }
 
-  void _addToImplementors(Iterable<Class> classes) {
+  void _addToImplementors(Iterable<InheritingContainer> containers) {
     assert(!allImplementorsAdded);
 
-    // Private classes may not be included in [classes], but may still be
+    // Private containers may not be included in documentation, but may still be
     // necessary links in the implementation chain. They are added here as they
-    // are found, then processed after [classes].
-    var privates = <Class>[];
+    // are found, then processed after [containers].
+    var privates = <InheritingContainer>[];
 
-    void checkAndAddClass(Class implemented, Class implementor) {
+    void checkAndAddContainer(
+        InheritingContainer implemented, InheritingContainer implementor) {
       if (!implemented.isPublic) {
         privates.add(implemented);
       }
@@ -605,22 +610,24 @@ class PackageGraph with CommentReferable, Nameable {
       }
     }
 
-    void addImplementor(Class clazz) {
-      for (var type in clazz.mixedInTypes) {
-        checkAndAddClass(type.modelElement, clazz);
-      }
+    void addImplementor(InheritingContainer clazz) {
       if (clazz.supertype != null) {
-        checkAndAddClass(clazz.supertype.modelElement, clazz);
+        checkAndAddContainer(clazz.supertype.modelElement, clazz);
       }
-      for (var type in clazz.interfaces) {
-        checkAndAddClass(type.modelElement, clazz);
+      if (clazz is Class) {
+        for (var type in clazz.mixedInTypes) {
+          checkAndAddContainer(type.modelElement, clazz);
+        }
+        for (var type in clazz.interfaces) {
+          checkAndAddContainer(type.modelElement, clazz);
+        }
       }
       for (var type in clazz.publicInterfaces) {
-        checkAndAddClass(type.modelElement, clazz);
+        checkAndAddContainer(type.modelElement, clazz);
       }
     }
 
-    classes.forEach(addImplementor);
+    containers.forEach(addImplementor);
 
     // [privates] may grow while processing; use a for loop, rather than a
     // for-each loop, to avoid concurrent modification errors.
diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart
index 7a94cb7848..5bc5d9c01c 100644
--- a/lib/src/model_utils.dart
+++ b/lib/src/model_utils.dart
@@ -91,8 +91,9 @@ Iterable<T> filterNonPublic<T extends Privacy>(Iterable<T> privacyItems) {
 
 /// Finds canonical classes for all classes in the iterable, if possible.
 /// If a canonical class can not be found, returns the original class.
-Iterable<Class> findCanonicalFor(Iterable<Class> classes) {
-  return classes.map((c) =>
+Iterable<InheritingContainer> findCanonicalFor(
+    Iterable<InheritingContainer> containers) {
+  return containers.map((c) =>
       c.packageGraph.findCanonicalModelElementFor(c.element) as Class ?? c);
 }
 
diff --git a/lib/templates/html/mixin.html b/lib/templates/html/mixin.html
index 531620633b..508978008e 100644
--- a/lib/templates/html/mixin.html
+++ b/lib/templates/html/mixin.html
@@ -42,22 +42,15 @@
         </dd>
         {{/hasPublicInterfaces}}
 
-        {{#hasPublicMixedInTypes}}
-        <dt>Mixes-in</dt>
-        <dd><ul class="comma-separated mixin-relationships">
-          {{#publicMixedInTypes}}
-          <li>{{{linkedName}}}</li>
-          {{/publicMixedInTypes}}
-        </ul></dd>
-        {{/hasPublicMixedInTypes}}
-
         {{#hasPublicImplementors}}
-        <dt>Implemented by</dt>
-        <dd><ul class="comma-separated mixin-relationships">
-          {{#publicImplementorsSorted}}
-          <li>{{{linkedName}}}</li>
-          {{/publicImplementorsSorted}}
-        </ul></dd>
+        <dt>Mixin Applications</dt>
+        <dd>
+          <ul class="comma-separated mixin-relationships">
+            {{#publicImplementorsSorted}}
+            <li>{{{linkedName}}}</li>
+            {{/publicImplementorsSorted}}
+          </ul>
+        </dd>
         {{/hasPublicImplementors}}
 
         {{#hasAnnotations}}
@@ -72,29 +65,6 @@
     </section>
     {{/hasModifiers}}
 
-    {{#hasPublicConstructors}}
-    <section class="summary offset-anchor" id="constructors">
-      <h2>Constructors</h2>
-
-      <dl class="constructor-summary-list">
-        {{#publicConstructorsSorted}}
-        <dt id="{{htmlId}}" class="callable">
-          <span class="name">{{{linkedName}}}</span><span class="signature">({{{ linkedParams }}})</span>
-        </dt>
-        <dd>
-          {{{ oneLineDoc }}} {{{ extendedDocLink }}}
-          {{#isConst}}
-          <div class="constructor-modifier features">const</div>
-          {{/isConst}}
-          {{#isFactory}}
-          <div class="constructor-modifier features">factory</div>
-          {{/isFactory}}
-        </dd>
-        {{/publicConstructorsSorted}}
-      </dl>
-    </section>
-    {{/hasPublicConstructors}}
-
     {{#hasPublicInstanceFields}}
     <section class="summary offset-anchor{{ #publicInheritedInstanceFields }} inherited{{ /publicInheritedInstanceFields }}" id="instance-properties">
       <h2>Properties</h2>
diff --git a/lib/templates/md/mixin.md b/lib/templates/md/mixin.md
index 301aae3837..40328c69b2 100644
--- a/lib/templates/md/mixin.md
+++ b/lib/templates/md/mixin.md
@@ -38,16 +38,8 @@
 {{/publicInterfaces}}
 {{/hasPublicInterfaces}}
 
-{{#hasPublicMixedInTypes}}
-**Mixed in types**
-
-{{#publicMixedInTypes}}
-- {{{linkedName}}}
-{{/publicMixedInTypes}}
-{{/hasPublicMixedInTypes}}
-
 {{#hasPublicImplementors}}
-**Implementers**
+**Mixin Applications**
 
 {{#publicImplementorsSorted}}
 - {{{linkedName}}}
@@ -63,18 +55,6 @@
 {{/hasAnnotations}}
 {{/hasModifiers}}
 
-{{#hasPublicConstructors}}
-## Constructors
-
-{{#publicConstructorsSorted}}
-{{{linkedName}}}({{{ linkedParams }}})
-
-{{{ oneLineDoc }}} {{{ extendedDocLink }}}  {{!two spaces intentional}}
-{{#isConst}}_const_{{/isConst}} {{#isFactory}}_factory_{{/isFactory}}
-
-{{/publicConstructorsSorted}}
-{{/hasPublicConstructors}}
-
 {{#hasPublicInstanceFields}}
 ## Properties
 
diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart
index bc153c1398..73e7535ac3 100644
--- a/test/end2end/model_test.dart
+++ b/test/end2end/model_test.dart
@@ -4851,7 +4851,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
   group('Implementors', () {
     Class apple;
     Class b;
-    List<Class> implA, implC;
+    List<InheritingContainer> implA, implC;
 
     setUpAll(() {
       apple = exLibrary.classes.firstWhere((c) => c.name == 'Apple');

From 40a85e226c82c53768fd7474fff8f46f7e8103dc Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 1 Sep 2021 13:24:32 -0700
Subject: [PATCH 03/19] fix up enum / mixin as well

---
 .../templates.aot_renderers_for_html.dart     | 656 +++++++-----------
 .../templates.aot_renderers_for_md.dart       | 489 ++++++-------
 .../templates.runtime_renderers.dart          |  46 +-
 lib/src/model/class.dart                      |   4 +-
 lib/src/model/enum.dart                       |  20 +-
 lib/src/model/extension.dart                  |   6 -
 lib/src/model/field.dart                      |   2 +-
 lib/src/model/inheriting_container.dart       |   6 +-
 lib/src/model/top_level_container.dart        |   5 +-
 .../html/{_class.html => _container.html}     |   0
 lib/templates/html/_mixin.html                |   6 -
 lib/templates/html/category.html              |   8 +-
 lib/templates/html/enum.html                  |  32 -
 lib/templates/html/library.html               |   8 +-
 lib/templates/md/{_class.md => _container.md} |   0
 lib/templates/md/category.md                  |   8 +-
 lib/templates/md/enum.md                      |  20 -
 lib/templates/md/library.md                   |   6 +-
 18 files changed, 513 insertions(+), 809 deletions(-)
 rename lib/templates/html/{_class.html => _container.html} (100%)
 delete mode 100644 lib/templates/html/_mixin.html
 rename lib/templates/md/{_class.md => _container.md} (100%)

diff --git a/lib/src/generator/templates.aot_renderers_for_html.dart b/lib/src/generator/templates.aot_renderers_for_html.dart
index b5e3d9c5ee..9a94f2a720 100644
--- a/lib/src/generator/templates.aot_renderers_for_html.dart
+++ b/lib/src/generator/templates.aot_renderers_for_html.dart
@@ -8,25 +8,26 @@
 // non-bool, non-Iterable field is non-null.
 // ignore_for_file: unused_local_variable
 
-import 'dart:convert' as _i18;
+import 'dart:convert' as _i19;
 
 import 'package:dartdoc/src/generator/template_data.dart' as _i1;
-import 'package:dartdoc/src/model/accessor.dart' as _i16;
+import 'package:dartdoc/src/model/accessor.dart' as _i17;
 import 'package:dartdoc/src/model/category.dart' as _i2;
-import 'package:dartdoc/src/model/class.dart' as _i4;
+import 'package:dartdoc/src/model/class.dart' as _i8;
 import 'package:dartdoc/src/model/constructor.dart' as _i11;
-import 'package:dartdoc/src/model/documentable.dart' as _i17;
+import 'package:dartdoc/src/model/container.dart' as _i4;
+import 'package:dartdoc/src/model/documentable.dart' as _i18;
 import 'package:dartdoc/src/model/enum.dart' as _i12;
 import 'package:dartdoc/src/model/extension.dart' as _i13;
 import 'package:dartdoc/src/model/field.dart' as _i9;
 import 'package:dartdoc/src/model/library.dart' as _i3;
 import 'package:dartdoc/src/model/library_container.dart' as _i15;
 import 'package:dartdoc/src/model/method.dart' as _i10;
-import 'package:dartdoc/src/model/mixin.dart' as _i5;
-import 'package:dartdoc/src/model/model_function.dart' as _i7;
+import 'package:dartdoc/src/model/mixin.dart' as _i16;
+import 'package:dartdoc/src/model/model_function.dart' as _i6;
 import 'package:dartdoc/src/model/package.dart' as _i14;
-import 'package:dartdoc/src/model/top_level_variable.dart' as _i6;
-import 'package:dartdoc/src/model/typedef.dart' as _i8;
+import 'package:dartdoc/src/model/top_level_variable.dart' as _i5;
+import 'package:dartdoc/src/model/typedef.dart' as _i7;
 
 String renderCategory(_i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -79,8 +80,8 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context4 != null) {
         for (var context5 in context4) {
           buffer.write('\n      ');
-          buffer.write(
-              _renderCategory_partial_class_3(context5, context1, context0));
+          buffer.write(_renderCategory_partial_container_3(
+              context5, context1, context0));
         }
       }
       buffer.writeln();
@@ -100,8 +101,8 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context6 != null) {
         for (var context7 in context6) {
           buffer.write('\n      ');
-          buffer.write(
-              _renderCategory_partial_mixin_4(context7, context1, context0));
+          buffer.write(_renderCategory_partial_container_3(
+              context7, context1, context0));
         }
       }
       buffer.writeln();
@@ -122,7 +123,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
         for (var context9 in context8) {
           buffer.write('\n      ');
           buffer.write(
-              _renderCategory_partial_constant_5(context9, context1, context0));
+              _renderCategory_partial_constant_4(context9, context1, context0));
         }
       }
       buffer.writeln();
@@ -142,7 +143,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context10 != null) {
         for (var context11 in context10) {
           buffer.write('\n      ');
-          buffer.write(_renderCategory_partial_property_6(
+          buffer.write(_renderCategory_partial_property_5(
               context11, context1, context0));
         }
       }
@@ -163,7 +164,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context12 != null) {
         for (var context13 in context12) {
           buffer.write('\n      ');
-          buffer.write(_renderCategory_partial_callable_7(
+          buffer.write(_renderCategory_partial_callable_6(
               context13, context1, context0));
         }
       }
@@ -184,8 +185,8 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context14 != null) {
         for (var context15 in context14) {
           buffer.write('\n      ');
-          buffer.write(
-              _renderCategory_partial_class_3(context15, context1, context0));
+          buffer.write(_renderCategory_partial_container_3(
+              context15, context1, context0));
         }
       }
       buffer.writeln();
@@ -206,7 +207,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
         for (var context17 in context16) {
           buffer.write('\n      ');
           buffer.write(
-              _renderCategory_partial_typedef_8(context17, context1, context0));
+              _renderCategory_partial_typedef_7(context17, context1, context0));
         }
       }
       buffer.writeln();
@@ -226,8 +227,8 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context18 != null) {
         for (var context19 in context18) {
           buffer.write('\n      ');
-          buffer.write(
-              _renderCategory_partial_class_3(context19, context1, context0));
+          buffer.write(_renderCategory_partial_container_3(
+              context19, context1, context0));
         }
       }
       buffer.writeln();
@@ -243,7 +244,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
 
 <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
   ''');
-  buffer.write(_renderCategory_partial_search_sidebar_9(context0));
+  buffer.write(_renderCategory_partial_search_sidebar_8(context0));
   buffer.writeln();
   buffer.write('''
   <h5><span class="package-name">''');
@@ -252,7 +253,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
   buffer.writeEscaped(context0.parent.kind.toString());
   buffer.write('''</span></h5>
   ''');
-  buffer.write(_renderCategory_partial_packages_10(context0));
+  buffer.write(_renderCategory_partial_packages_9(context0));
   buffer.writeln();
   buffer.write('''
 </div>
@@ -264,13 +265,13 @@ String renderCategory(_i1.CategoryTemplateData context0) {
   buffer.writeEscaped(context0.self.kind.toString());
   buffer.write('''</h5>
   ''');
-  buffer.write(_renderCategory_partial_sidebar_for_category_11(context0));
+  buffer.write(_renderCategory_partial_sidebar_for_category_10(context0));
   buffer.writeln();
   buffer.write('''
 </div>
 <!--/sidebar-offcanvas-right-->
 ''');
-  buffer.write(_renderCategory_partial_footer_12(context0));
+  buffer.write(_renderCategory_partial_footer_11(context0));
   buffer.writeln();
 
   return buffer.toString();
@@ -494,58 +495,7 @@ String __renderCategory_partial_library_2_partial_categorization_0(
   return buffer.toString();
 }
 
-String _renderCategory_partial_class_3(_i4.Class context2,
-    _i2.Category context1, _i1.CategoryTemplateData context0) {
-  final buffer = StringBuffer();
-  buffer.write('''<dt id="''');
-  buffer.writeEscaped(context2.htmlId.toString());
-  buffer.write('''">
-  <span class="name ''');
-  if (context2.isDeprecated == true) {
-    buffer.write('''deprecated''');
-  }
-  buffer.write('''">''');
-  buffer.write(context2.linkedName.toString());
-  buffer.write(context2.linkedGenericParameters.toString());
-  buffer.write('''</span> ''');
-  buffer.write(__renderCategory_partial_class_3_partial_categorization_0(
-      context2, context1, context0));
-  buffer.writeln();
-  buffer.write('''
-</dt>
-<dd>
-  ''');
-  buffer.write(context2.oneLineDoc.toString());
-  buffer.write(' ');
-  buffer.write(context2.extendedDocLink.toString());
-  buffer.writeln();
-  buffer.write('''
-</dd>
-''');
-
-  return buffer.toString();
-}
-
-String __renderCategory_partial_class_3_partial_categorization_0(
-    _i4.Class context2,
-    _i2.Category context1,
-    _i1.CategoryTemplateData context0) {
-  final buffer = StringBuffer();
-  if (context2.hasCategoryNames == true) {
-    var context3 = context2.displayedCategories;
-    if (context3 != null) {
-      for (var context4 in context3) {
-        buffer.write('\n    ');
-        buffer.write(context4.categoryLabel.toString());
-      }
-    }
-  }
-  buffer.writeln();
-
-  return buffer.toString();
-}
-
-String _renderCategory_partial_mixin_4(_i5.Mixin context2,
+String _renderCategory_partial_container_3(_i4.Container context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
@@ -559,7 +509,7 @@ String _renderCategory_partial_mixin_4(_i5.Mixin context2,
   buffer.write(context2.linkedName.toString());
   buffer.write(context2.linkedGenericParameters.toString());
   buffer.write('''</span> ''');
-  buffer.write(__renderCategory_partial_mixin_4_partial_categorization_0(
+  buffer.write(__renderCategory_partial_container_3_partial_categorization_0(
       context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -577,8 +527,8 @@ String _renderCategory_partial_mixin_4(_i5.Mixin context2,
   return buffer.toString();
 }
 
-String __renderCategory_partial_mixin_4_partial_categorization_0(
-    _i5.Mixin context2,
+String __renderCategory_partial_container_3_partial_categorization_0(
+    _i4.Container context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -596,7 +546,7 @@ String __renderCategory_partial_mixin_4_partial_categorization_0(
   return buffer.toString();
 }
 
-String _renderCategory_partial_constant_5(_i6.TopLevelVariable context2,
+String _renderCategory_partial_constant_4(_i5.TopLevelVariable context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
@@ -613,7 +563,7 @@ String _renderCategory_partial_constant_5(_i6.TopLevelVariable context2,
   buffer.write(context2.modelType.linkedName.toString());
   buffer.write('''</span>
   ''');
-  buffer.write(__renderCategory_partial_constant_5_partial_categorization_0(
+  buffer.write(__renderCategory_partial_constant_4_partial_categorization_0(
       context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -624,7 +574,7 @@ String _renderCategory_partial_constant_5(_i6.TopLevelVariable context2,
   buffer.write(' ');
   buffer.write(context2.extendedDocLink.toString());
   buffer.write('\n  ');
-  buffer.write(__renderCategory_partial_constant_5_partial_features_1(
+  buffer.write(__renderCategory_partial_constant_4_partial_features_1(
       context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -639,8 +589,8 @@ String _renderCategory_partial_constant_5(_i6.TopLevelVariable context2,
   return buffer.toString();
 }
 
-String __renderCategory_partial_constant_5_partial_categorization_0(
-    _i6.TopLevelVariable context2,
+String __renderCategory_partial_constant_4_partial_categorization_0(
+    _i5.TopLevelVariable context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -658,8 +608,8 @@ String __renderCategory_partial_constant_5_partial_categorization_0(
   return buffer.toString();
 }
 
-String __renderCategory_partial_constant_5_partial_features_1(
-    _i6.TopLevelVariable context2,
+String __renderCategory_partial_constant_4_partial_features_1(
+    _i5.TopLevelVariable context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -673,7 +623,7 @@ String __renderCategory_partial_constant_5_partial_features_1(
   return buffer.toString();
 }
 
-String _renderCategory_partial_property_6(_i6.TopLevelVariable context2,
+String _renderCategory_partial_property_5(_i5.TopLevelVariable context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
@@ -691,7 +641,7 @@ String _renderCategory_partial_property_6(_i6.TopLevelVariable context2,
   buffer.write(' ');
   buffer.write(context2.modelType.linkedName.toString());
   buffer.write('''</span> ''');
-  buffer.write(__renderCategory_partial_property_6_partial_categorization_0(
+  buffer.write(__renderCategory_partial_property_5_partial_categorization_0(
       context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -706,7 +656,7 @@ String _renderCategory_partial_property_6(_i6.TopLevelVariable context2,
   buffer.write(' ');
   buffer.write(context2.extendedDocLink.toString());
   buffer.write('\n  ');
-  buffer.write(__renderCategory_partial_property_6_partial_features_1(
+  buffer.write(__renderCategory_partial_property_5_partial_features_1(
       context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -716,8 +666,8 @@ String _renderCategory_partial_property_6(_i6.TopLevelVariable context2,
   return buffer.toString();
 }
 
-String __renderCategory_partial_property_6_partial_categorization_0(
-    _i6.TopLevelVariable context2,
+String __renderCategory_partial_property_5_partial_categorization_0(
+    _i5.TopLevelVariable context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -735,8 +685,8 @@ String __renderCategory_partial_property_6_partial_categorization_0(
   return buffer.toString();
 }
 
-String __renderCategory_partial_property_6_partial_features_1(
-    _i6.TopLevelVariable context2,
+String __renderCategory_partial_property_5_partial_features_1(
+    _i5.TopLevelVariable context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -750,7 +700,7 @@ String __renderCategory_partial_property_6_partial_features_1(
   return buffer.toString();
 }
 
-String _renderCategory_partial_callable_7(_i7.ModelFunctionTyped context2,
+String _renderCategory_partial_callable_6(_i6.ModelFunctionTyped context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
@@ -776,7 +726,7 @@ String _renderCategory_partial_callable_7(_i7.ModelFunctionTyped context2,
   buffer.write('''</span>
   </span>
   ''');
-  buffer.write(__renderCategory_partial_callable_7_partial_categorization_0(
+  buffer.write(__renderCategory_partial_callable_6_partial_categorization_0(
       context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -791,7 +741,7 @@ String _renderCategory_partial_callable_7(_i7.ModelFunctionTyped context2,
   buffer.write(' ');
   buffer.write(context2.extendedDocLink.toString());
   buffer.write('\n  ');
-  buffer.write(__renderCategory_partial_callable_7_partial_features_1(
+  buffer.write(__renderCategory_partial_callable_6_partial_features_1(
       context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -801,8 +751,8 @@ String _renderCategory_partial_callable_7(_i7.ModelFunctionTyped context2,
   return buffer.toString();
 }
 
-String __renderCategory_partial_callable_7_partial_categorization_0(
-    _i7.ModelFunctionTyped context2,
+String __renderCategory_partial_callable_6_partial_categorization_0(
+    _i6.ModelFunctionTyped context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -820,8 +770,8 @@ String __renderCategory_partial_callable_7_partial_categorization_0(
   return buffer.toString();
 }
 
-String __renderCategory_partial_callable_7_partial_features_1(
-    _i7.ModelFunctionTyped context2,
+String __renderCategory_partial_callable_6_partial_features_1(
+    _i6.ModelFunctionTyped context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -835,7 +785,7 @@ String __renderCategory_partial_callable_7_partial_features_1(
   return buffer.toString();
 }
 
-String _renderCategory_partial_typedef_8(_i8.Typedef context2,
+String _renderCategory_partial_typedef_7(_i7.Typedef context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.isCallable == true) {
@@ -864,7 +814,7 @@ String _renderCategory_partial_typedef_8(_i8.Typedef context2,
       buffer.write('''</span>
     </span>
     ''');
-      buffer.write(__renderCategory_partial_typedef_8_partial_categorization_0(
+      buffer.write(__renderCategory_partial_typedef_7_partial_categorization_0(
           context3, context2, context1, context0));
       buffer.writeln();
       buffer.write('''
@@ -879,7 +829,7 @@ String _renderCategory_partial_typedef_8(_i8.Typedef context2,
       buffer.write(' ');
       buffer.write(context3.extendedDocLink.toString());
       buffer.write('\n    ');
-      buffer.write(__renderCategory_partial_typedef_8_partial_features_1(
+      buffer.write(__renderCategory_partial_typedef_7_partial_features_1(
           context3, context2, context1, context0));
       buffer.writeln();
       buffer.write('''
@@ -888,7 +838,7 @@ String _renderCategory_partial_typedef_8(_i8.Typedef context2,
   }
   if (context2.isCallable != true) {
     buffer.write('\n  ');
-    buffer.write(__renderCategory_partial_typedef_8_partial_type_2(
+    buffer.write(__renderCategory_partial_typedef_7_partial_type_2(
         context2, context1, context0));
   }
   buffer.writeln();
@@ -896,9 +846,9 @@ String _renderCategory_partial_typedef_8(_i8.Typedef context2,
   return buffer.toString();
 }
 
-String __renderCategory_partial_typedef_8_partial_categorization_0(
-    _i8.FunctionTypedef context3,
-    _i8.Typedef context2,
+String __renderCategory_partial_typedef_7_partial_categorization_0(
+    _i7.FunctionTypedef context3,
+    _i7.Typedef context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -916,9 +866,9 @@ String __renderCategory_partial_typedef_8_partial_categorization_0(
   return buffer.toString();
 }
 
-String __renderCategory_partial_typedef_8_partial_features_1(
-    _i8.FunctionTypedef context3,
-    _i8.Typedef context2,
+String __renderCategory_partial_typedef_7_partial_features_1(
+    _i7.FunctionTypedef context3,
+    _i7.Typedef context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -932,7 +882,7 @@ String __renderCategory_partial_typedef_8_partial_features_1(
   return buffer.toString();
 }
 
-String __renderCategory_partial_typedef_8_partial_type_2(_i8.Typedef context2,
+String __renderCategory_partial_typedef_7_partial_type_2(_i7.Typedef context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
@@ -959,7 +909,7 @@ String __renderCategory_partial_typedef_8_partial_type_2(_i8.Typedef context2,
   </span>
   ''');
   buffer.write(
-      ___renderCategory_partial_typedef_8_partial_type_2_partial_categorization_0(
+      ___renderCategory_partial_typedef_7_partial_type_2_partial_categorization_0(
           context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -975,7 +925,7 @@ String __renderCategory_partial_typedef_8_partial_type_2(_i8.Typedef context2,
   buffer.write(context2.extendedDocLink.toString());
   buffer.write('\n  ');
   buffer.write(
-      ___renderCategory_partial_typedef_8_partial_type_2_partial_features_1(
+      ___renderCategory_partial_typedef_7_partial_type_2_partial_features_1(
           context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -986,8 +936,8 @@ String __renderCategory_partial_typedef_8_partial_type_2(_i8.Typedef context2,
 }
 
 String
-    ___renderCategory_partial_typedef_8_partial_type_2_partial_categorization_0(
-        _i8.Typedef context2,
+    ___renderCategory_partial_typedef_7_partial_type_2_partial_categorization_0(
+        _i7.Typedef context2,
         _i2.Category context1,
         _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -1005,8 +955,8 @@ String
   return buffer.toString();
 }
 
-String ___renderCategory_partial_typedef_8_partial_type_2_partial_features_1(
-    _i8.Typedef context2,
+String ___renderCategory_partial_typedef_7_partial_type_2_partial_features_1(
+    _i7.Typedef context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -1020,7 +970,7 @@ String ___renderCategory_partial_typedef_8_partial_type_2_partial_features_1(
   return buffer.toString();
 }
 
-String _renderCategory_partial_search_sidebar_9(
+String _renderCategory_partial_search_sidebar_8(
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<header id="header-search-sidebar" class="hidden-l">
@@ -1084,7 +1034,7 @@ String _renderCategory_partial_search_sidebar_9(
   return buffer.toString();
 }
 
-String _renderCategory_partial_packages_10(_i1.CategoryTemplateData context0) {
+String _renderCategory_partial_packages_9(_i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<ol>''');
   var context1 = context0.localPackages;
@@ -1160,7 +1110,7 @@ String _renderCategory_partial_packages_10(_i1.CategoryTemplateData context0) {
   return buffer.toString();
 }
 
-String _renderCategory_partial_sidebar_for_category_11(
+String _renderCategory_partial_sidebar_for_category_10(
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<ol>''');
@@ -1387,7 +1337,7 @@ String _renderCategory_partial_sidebar_for_category_11(
   return buffer.toString();
 }
 
-String _renderCategory_partial_footer_12(_i1.CategoryTemplateData context0) {
+String _renderCategory_partial_footer_11(_i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''</main>
 
@@ -1975,7 +1925,7 @@ String _renderClass_partial_head_0(_i1.ClassTemplateData context0) {
 }
 
 String _renderClass_partial_source_link_1(
-    _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -1990,7 +1940,7 @@ String _renderClass_partial_source_link_1(
 }
 
 String _renderClass_partial_feature_set_2(
-    _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -2007,7 +1957,7 @@ String _renderClass_partial_feature_set_2(
 }
 
 String _renderClass_partial_categorization_3(
-    _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     var context2 = context1.displayedCategories;
@@ -2024,7 +1974,7 @@ String _renderClass_partial_categorization_3(
 }
 
 String _renderClass_partial_documentation_4(
-    _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -2042,7 +1992,7 @@ String _renderClass_partial_documentation_4(
 }
 
 String _renderClass_partial_property_5(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context2.htmlId.toString());
@@ -2085,7 +2035,7 @@ String _renderClass_partial_property_5(
 }
 
 String __renderClass_partial_property_5_partial_categorization_0(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     var context3 = context2.displayedCategories;
@@ -2102,7 +2052,7 @@ String __renderClass_partial_property_5_partial_categorization_0(
 }
 
 String __renderClass_partial_property_5_partial_features_1(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -2115,7 +2065,7 @@ String __renderClass_partial_property_5_partial_features_1(
 }
 
 String _renderClass_partial_callable_6(
-    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i10.Method context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context2.htmlId.toString());
@@ -2166,7 +2116,7 @@ String _renderClass_partial_callable_6(
 }
 
 String __renderClass_partial_callable_6_partial_categorization_0(
-    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i10.Method context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     var context3 = context2.displayedCategories;
@@ -2183,7 +2133,7 @@ String __renderClass_partial_callable_6_partial_categorization_0(
 }
 
 String __renderClass_partial_callable_6_partial_features_1(
-    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i10.Method context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -2196,7 +2146,7 @@ String __renderClass_partial_callable_6_partial_features_1(
 }
 
 String _renderClass_partial_constant_7(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context2.htmlId.toString());
@@ -2239,7 +2189,7 @@ String _renderClass_partial_constant_7(
 }
 
 String __renderClass_partial_constant_7_partial_categorization_0(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     var context3 = context2.displayedCategories;
@@ -2256,7 +2206,7 @@ String __renderClass_partial_constant_7_partial_categorization_0(
 }
 
 String __renderClass_partial_constant_7_partial_features_1(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -2901,12 +2851,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
         </dd>''');
       }
       buffer.writeln();
-      if (context2.hasPublicMixedInTypes == true) {
+      if (context2.hasPublicImplementors == true) {
         buffer.writeln();
         buffer.write('''
-        <dt>Mixed in types</dt>
+        <dt>Implementers</dt>
         <dd><ul class="comma-separated eNum-relationships">''');
-        var context7 = context2.publicMixedInTypes;
+        var context7 = context2.publicImplementorsSorted;
         if (context7 != null) {
           for (var context8 in context7) {
             buffer.writeln();
@@ -2921,38 +2871,18 @@ String renderEnum(_i1.EnumTemplateData context0) {
         </ul></dd>''');
       }
       buffer.writeln();
-      if (context2.hasPublicImplementors == true) {
-        buffer.writeln();
-        buffer.write('''
-        <dt>Implementers</dt>
-        <dd><ul class="comma-separated eNum-relationships">''');
-        var context9 = context2.publicImplementorsSorted;
-        if (context9 != null) {
-          for (var context10 in context9) {
-            buffer.writeln();
-            buffer.write('''
-          <li>''');
-            buffer.write(context10.linkedName.toString());
-            buffer.write('''</li>''');
-          }
-        }
-        buffer.writeln();
-        buffer.write('''
-        </ul></dd>''');
-      }
-      buffer.writeln();
       if (context2.hasAnnotations == true) {
         buffer.writeln();
         buffer.write('''
         <dt>Annotations</dt>
         <dd><ul class="annotation-list eNum-relationships">''');
-        var context11 = context2.annotations;
-        if (context11 != null) {
-          for (var context12 in context11) {
+        var context9 = context2.annotations;
+        if (context9 != null) {
+          for (var context10 in context9) {
             buffer.writeln();
             buffer.write('''
           <li>''');
-            buffer.write(context12.linkedNameWithParameters.toString());
+            buffer.write(context10.linkedNameWithParameters.toString());
             buffer.write('''</li>''');
           }
         }
@@ -2973,59 +2903,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       <h2>Constants</h2>
 
       <dl class="properties">''');
-      var context13 = context2.publicConstantFieldsSorted;
-      if (context13 != null) {
-        for (var context14 in context13) {
+      var context11 = context2.publicConstantFieldsSorted;
+      if (context11 != null) {
+        for (var context12 in context11) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_constant_5(context14, context2, context0));
-        }
-      }
-      buffer.writeln();
-      buffer.write('''
-      </dl>
-    </section>''');
-    }
-    buffer.writeln();
-    if (context2.hasPublicConstructors == true) {
-      buffer.writeln();
-      buffer.write('''
-    <section class="summary offset-anchor" id="constructors">
-      <h2>Constructors</h2>
-
-      <dl class="constructor-summary-list">''');
-      var context15 = context2.publicConstructorsSorted;
-      if (context15 != null) {
-        for (var context16 in context15) {
-          buffer.writeln();
-          buffer.write('''
-        <dt id="''');
-          buffer.writeEscaped(context16.htmlId.toString());
-          buffer.write('''" class="callable">
-          <span class="name">''');
-          buffer.write(context16.linkedName.toString());
-          buffer.write('''</span><span class="signature">(''');
-          buffer.write(context16.linkedParams.toString());
-          buffer.write(''')</span>
-        </dt>
-        <dd>
-          ''');
-          buffer.write(context16.oneLineDoc.toString());
-          buffer.write(' ');
-          buffer.write(context16.extendedDocLink.toString());
-          if (context16.isConst == true) {
-            buffer.writeln();
-            buffer.write('''
-          <div class="constructor-modifier features">const</div>''');
-          }
-          if (context16.isFactory == true) {
-            buffer.writeln();
-            buffer.write('''
-          <div class="constructor-modifier features">factory</div>''');
-          }
-          buffer.writeln();
-          buffer.write('''
-        </dd>''');
+              _renderEnum_partial_constant_5(context12, context2, context0));
         }
       }
       buffer.writeln();
@@ -3045,12 +2928,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       <h2>Properties</h2>
 
       <dl class="properties">''');
-      var context17 = context2.publicInstanceFieldsSorted;
-      if (context17 != null) {
-        for (var context18 in context17) {
+      var context13 = context2.publicInstanceFieldsSorted;
+      if (context13 != null) {
+        for (var context14 in context13) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_property_6(context18, context2, context0));
+              _renderEnum_partial_property_6(context14, context2, context0));
         }
       }
       buffer.writeln();
@@ -3069,12 +2952,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''" id="instance-methods">
       <h2>Methods</h2>
       <dl class="callables">''');
-      var context19 = context2.publicInstanceMethodsSorted;
-      if (context19 != null) {
-        for (var context20 in context19) {
+      var context15 = context2.publicInstanceMethodsSorted;
+      if (context15 != null) {
+        for (var context16 in context15) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_callable_7(context20, context2, context0));
+              _renderEnum_partial_callable_7(context16, context2, context0));
         }
       }
       buffer.writeln();
@@ -3093,12 +2976,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''" id="operators">
       <h2>Operators</h2>
       <dl class="callables">''');
-      var context21 = context2.publicInstanceOperatorsSorted;
-      if (context21 != null) {
-        for (var context22 in context21) {
+      var context17 = context2.publicInstanceOperatorsSorted;
+      if (context17 != null) {
+        for (var context18 in context17) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_callable_7(context22, context2, context0));
+              _renderEnum_partial_callable_7(context18, context2, context0));
         }
       }
       buffer.writeln();
@@ -3114,12 +2997,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       <h2>Static Properties</h2>
 
       <dl class="properties">''');
-      var context23 = context2.publicVariableStaticFieldsSorted;
-      if (context23 != null) {
-        for (var context24 in context23) {
+      var context19 = context2.publicVariableStaticFieldsSorted;
+      if (context19 != null) {
+        for (var context20 in context19) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_property_6(context24, context2, context0));
+              _renderEnum_partial_property_6(context20, context2, context0));
         }
       }
       buffer.writeln();
@@ -3134,12 +3017,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
     <section class="summary offset-anchor" id="static-methods">
       <h2>Static Methods</h2>
       <dl class="callables">''');
-      var context25 = context2.publicStaticMethodsSorted;
-      if (context25 != null) {
-        for (var context26 in context25) {
+      var context21 = context2.publicStaticMethodsSorted;
+      if (context21 != null) {
+        for (var context22 in context21) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_callable_7(context26, context2, context0));
+              _renderEnum_partial_callable_7(context22, context2, context0));
         }
       }
       buffer.writeln();
@@ -5140,7 +5023,7 @@ String _renderFunction_partial_head_0(_i1.FunctionTemplateData context0) {
 }
 
 String _renderFunction_partial_source_link_1(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -5155,7 +5038,7 @@ String _renderFunction_partial_source_link_1(
 }
 
 String _renderFunction_partial_feature_set_2(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -5172,7 +5055,7 @@ String _renderFunction_partial_feature_set_2(
 }
 
 String _renderFunction_partial_categorization_3(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     var context2 = context1.displayedCategories;
@@ -5189,7 +5072,7 @@ String _renderFunction_partial_categorization_3(
 }
 
 String _renderFunction_partial_callable_multiline_4(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasAnnotations == true) {
     buffer.writeln();
@@ -5233,7 +5116,7 @@ String _renderFunction_partial_callable_multiline_4(
 }
 
 String __renderFunction_partial_callable_multiline_4_partial_name_summary_0(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.isConst == true) {
     buffer.write('''const ''');
@@ -5250,7 +5133,7 @@ String __renderFunction_partial_callable_multiline_4_partial_name_summary_0(
 }
 
 String _renderFunction_partial_documentation_5(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -5268,7 +5151,7 @@ String _renderFunction_partial_documentation_5(
 }
 
 String _renderFunction_partial_source_code_6(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceCode == true) {
     buffer.writeln();
@@ -5955,7 +5838,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context5 != null) {
           for (var context6 in context5) {
             buffer.write('\n        ');
-            buffer.write(_renderLibrary_partial_class_5(
+            buffer.write(_renderLibrary_partial_container_5(
                 context6, context4, context3, context0));
           }
         }
@@ -5982,7 +5865,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context9 != null) {
           for (var context10 in context9) {
             buffer.write('\n        ');
-            buffer.write(_renderLibrary_partial_mixin_6(
+            buffer.write(_renderLibrary_partial_container_5(
                 context10, context8, context7, context0));
           }
         }
@@ -6009,7 +5892,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context13 != null) {
           for (var context14 in context13) {
             buffer.write('\n        ');
-            buffer.write(_renderLibrary_partial_extension_7(
+            buffer.write(_renderLibrary_partial_extension_6(
                 context14, context12, context11, context0));
           }
         }
@@ -6036,7 +5919,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context17 != null) {
           for (var context18 in context17) {
             buffer.write('\n        ');
-            buffer.write(_renderLibrary_partial_constant_8(
+            buffer.write(_renderLibrary_partial_constant_7(
                 context18, context16, context15, context0));
           }
         }
@@ -6063,7 +5946,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context21 != null) {
           for (var context22 in context21) {
             buffer.write('\n        ');
-            buffer.write(_renderLibrary_partial_property_9(
+            buffer.write(_renderLibrary_partial_property_8(
                 context22, context20, context19, context0));
           }
         }
@@ -6090,7 +5973,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context25 != null) {
           for (var context26 in context25) {
             buffer.write('\n        ');
-            buffer.write(_renderLibrary_partial_callable_10(
+            buffer.write(_renderLibrary_partial_callable_9(
                 context26, context24, context23, context0));
           }
         }
@@ -6117,7 +6000,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context29 != null) {
           for (var context30 in context29) {
             buffer.write('\n        ');
-            buffer.write(_renderLibrary_partial_class_5(
+            buffer.write(_renderLibrary_partial_container_5(
                 context30, context28, context27, context0));
           }
         }
@@ -6144,7 +6027,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context33 != null) {
           for (var context34 in context33) {
             buffer.write('\n          ');
-            buffer.write(_renderLibrary_partial_typedef_11(
+            buffer.write(_renderLibrary_partial_typedef_10(
                 context34, context32, context31, context0));
           }
         }
@@ -6171,7 +6054,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context37 != null) {
           for (var context38 in context37) {
             buffer.write('\n        ');
-            buffer.write(_renderLibrary_partial_class_5(
+            buffer.write(_renderLibrary_partial_container_5(
                 context38, context36, context35, context0));
           }
         }
@@ -6189,7 +6072,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
 
   <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
     ''');
-  buffer.write(_renderLibrary_partial_search_sidebar_12(context0));
+  buffer.write(_renderLibrary_partial_search_sidebar_11(context0));
   buffer.writeln();
   buffer.write('''
     <h5><span class="package-name">''');
@@ -6198,7 +6081,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
   buffer.writeEscaped(context0.parent.kind.toString());
   buffer.write('''</span></h5>
     ''');
-  buffer.write(_renderLibrary_partial_packages_13(context0));
+  buffer.write(_renderLibrary_partial_packages_12(context0));
   buffer.writeln();
   buffer.write('''
   </div>
@@ -6216,7 +6099,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
   </div><!--/sidebar-offcanvas-right-->
 
 ''');
-  buffer.write(_renderLibrary_partial_footer_14(context0));
+  buffer.write(_renderLibrary_partial_footer_13(context0));
   buffer.writeln();
 
   return buffer.toString();
@@ -6442,61 +6325,12 @@ String _renderLibrary_partial_documentation_4(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_class_5(_i4.Class context3, _i3.Library context2,
-    _i3.Library context1, _i1.LibraryTemplateData context0) {
-  final buffer = StringBuffer();
-  buffer.write('''<dt id="''');
-  buffer.writeEscaped(context3.htmlId.toString());
-  buffer.write('''">
-  <span class="name ''');
-  if (context3.isDeprecated == true) {
-    buffer.write('''deprecated''');
-  }
-  buffer.write('''">''');
-  buffer.write(context3.linkedName.toString());
-  buffer.write(context3.linkedGenericParameters.toString());
-  buffer.write('''</span> ''');
-  buffer.write(__renderLibrary_partial_class_5_partial_categorization_0(
-      context3, context2, context1, context0));
-  buffer.writeln();
-  buffer.write('''
-</dt>
-<dd>
-  ''');
-  buffer.write(context3.oneLineDoc.toString());
-  buffer.write(' ');
-  buffer.write(context3.extendedDocLink.toString());
-  buffer.writeln();
-  buffer.write('''
-</dd>
-''');
-
-  return buffer.toString();
-}
-
-String __renderLibrary_partial_class_5_partial_categorization_0(
-    _i4.Class context3,
+String _renderLibrary_partial_container_5(
+    _i4.Container context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
   final buffer = StringBuffer();
-  if (context3.hasCategoryNames == true) {
-    var context4 = context3.displayedCategories;
-    if (context4 != null) {
-      for (var context5 in context4) {
-        buffer.write('\n    ');
-        buffer.write(context5.categoryLabel.toString());
-      }
-    }
-  }
-  buffer.writeln();
-
-  return buffer.toString();
-}
-
-String _renderLibrary_partial_mixin_6(_i5.Mixin context3, _i3.Library context2,
-    _i3.Library context1, _i1.LibraryTemplateData context0) {
-  final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context3.htmlId.toString());
   buffer.write('''">
@@ -6508,7 +6342,7 @@ String _renderLibrary_partial_mixin_6(_i5.Mixin context3, _i3.Library context2,
   buffer.write(context3.linkedName.toString());
   buffer.write(context3.linkedGenericParameters.toString());
   buffer.write('''</span> ''');
-  buffer.write(__renderLibrary_partial_mixin_6_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_container_5_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -6526,8 +6360,8 @@ String _renderLibrary_partial_mixin_6(_i5.Mixin context3, _i3.Library context2,
   return buffer.toString();
 }
 
-String __renderLibrary_partial_mixin_6_partial_categorization_0(
-    _i5.Mixin context3,
+String __renderLibrary_partial_container_5_partial_categorization_0(
+    _i4.Container context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6546,7 +6380,7 @@ String __renderLibrary_partial_mixin_6_partial_categorization_0(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_extension_7(
+String _renderLibrary_partial_extension_6(
     _i13.Extension context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -6562,7 +6396,7 @@ String _renderLibrary_partial_extension_7(
   buffer.write('''">''');
   buffer.write(context3.linkedName.toString());
   buffer.write('''</span> ''');
-  buffer.write(__renderLibrary_partial_extension_7_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_extension_6_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -6581,7 +6415,7 @@ String _renderLibrary_partial_extension_7(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_extension_7_partial_categorization_0(
+String __renderLibrary_partial_extension_6_partial_categorization_0(
     _i13.Extension context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -6601,8 +6435,8 @@ String __renderLibrary_partial_extension_7_partial_categorization_0(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_constant_8(
-    _i6.TopLevelVariable context3,
+String _renderLibrary_partial_constant_7(
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6621,7 +6455,7 @@ String _renderLibrary_partial_constant_8(
   buffer.write(context3.modelType.linkedName.toString());
   buffer.write('''</span>
   ''');
-  buffer.write(__renderLibrary_partial_constant_8_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_constant_7_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -6632,7 +6466,7 @@ String _renderLibrary_partial_constant_8(
   buffer.write(' ');
   buffer.write(context3.extendedDocLink.toString());
   buffer.write('\n  ');
-  buffer.write(__renderLibrary_partial_constant_8_partial_features_1(
+  buffer.write(__renderLibrary_partial_constant_7_partial_features_1(
       context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -6647,8 +6481,8 @@ String _renderLibrary_partial_constant_8(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_constant_8_partial_categorization_0(
-    _i6.TopLevelVariable context3,
+String __renderLibrary_partial_constant_7_partial_categorization_0(
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6667,8 +6501,8 @@ String __renderLibrary_partial_constant_8_partial_categorization_0(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_constant_8_partial_features_1(
-    _i6.TopLevelVariable context3,
+String __renderLibrary_partial_constant_7_partial_features_1(
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6683,8 +6517,8 @@ String __renderLibrary_partial_constant_8_partial_features_1(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_property_9(
-    _i6.TopLevelVariable context3,
+String _renderLibrary_partial_property_8(
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6704,7 +6538,7 @@ String _renderLibrary_partial_property_9(
   buffer.write(' ');
   buffer.write(context3.modelType.linkedName.toString());
   buffer.write('''</span> ''');
-  buffer.write(__renderLibrary_partial_property_9_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_property_8_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -6719,7 +6553,7 @@ String _renderLibrary_partial_property_9(
   buffer.write(' ');
   buffer.write(context3.extendedDocLink.toString());
   buffer.write('\n  ');
-  buffer.write(__renderLibrary_partial_property_9_partial_features_1(
+  buffer.write(__renderLibrary_partial_property_8_partial_features_1(
       context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -6729,8 +6563,8 @@ String _renderLibrary_partial_property_9(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_property_9_partial_categorization_0(
-    _i6.TopLevelVariable context3,
+String __renderLibrary_partial_property_8_partial_categorization_0(
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6749,8 +6583,8 @@ String __renderLibrary_partial_property_9_partial_categorization_0(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_property_9_partial_features_1(
-    _i6.TopLevelVariable context3,
+String __renderLibrary_partial_property_8_partial_features_1(
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6765,8 +6599,8 @@ String __renderLibrary_partial_property_9_partial_features_1(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_callable_10(
-    _i7.ModelFunctionTyped context3,
+String _renderLibrary_partial_callable_9(
+    _i6.ModelFunctionTyped context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6794,7 +6628,7 @@ String _renderLibrary_partial_callable_10(
   buffer.write('''</span>
   </span>
   ''');
-  buffer.write(__renderLibrary_partial_callable_10_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_callable_9_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -6809,7 +6643,7 @@ String _renderLibrary_partial_callable_10(
   buffer.write(' ');
   buffer.write(context3.extendedDocLink.toString());
   buffer.write('\n  ');
-  buffer.write(__renderLibrary_partial_callable_10_partial_features_1(
+  buffer.write(__renderLibrary_partial_callable_9_partial_features_1(
       context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -6819,8 +6653,8 @@ String _renderLibrary_partial_callable_10(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_callable_10_partial_categorization_0(
-    _i7.ModelFunctionTyped context3,
+String __renderLibrary_partial_callable_9_partial_categorization_0(
+    _i6.ModelFunctionTyped context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6839,8 +6673,8 @@ String __renderLibrary_partial_callable_10_partial_categorization_0(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_callable_10_partial_features_1(
-    _i7.ModelFunctionTyped context3,
+String __renderLibrary_partial_callable_9_partial_features_1(
+    _i6.ModelFunctionTyped context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6855,8 +6689,8 @@ String __renderLibrary_partial_callable_10_partial_features_1(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_typedef_11(
-    _i8.Typedef context3,
+String _renderLibrary_partial_typedef_10(
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6887,7 +6721,7 @@ String _renderLibrary_partial_typedef_11(
       buffer.write('''</span>
     </span>
     ''');
-      buffer.write(__renderLibrary_partial_typedef_11_partial_categorization_0(
+      buffer.write(__renderLibrary_partial_typedef_10_partial_categorization_0(
           context4, context3, context2, context1, context0));
       buffer.writeln();
       buffer.write('''
@@ -6902,7 +6736,7 @@ String _renderLibrary_partial_typedef_11(
       buffer.write(' ');
       buffer.write(context4.extendedDocLink.toString());
       buffer.write('\n    ');
-      buffer.write(__renderLibrary_partial_typedef_11_partial_features_1(
+      buffer.write(__renderLibrary_partial_typedef_10_partial_features_1(
           context4, context3, context2, context1, context0));
       buffer.writeln();
       buffer.write('''
@@ -6911,7 +6745,7 @@ String _renderLibrary_partial_typedef_11(
   }
   if (context3.isCallable != true) {
     buffer.write('\n  ');
-    buffer.write(__renderLibrary_partial_typedef_11_partial_type_2(
+    buffer.write(__renderLibrary_partial_typedef_10_partial_type_2(
         context3, context2, context1, context0));
   }
   buffer.writeln();
@@ -6919,9 +6753,9 @@ String _renderLibrary_partial_typedef_11(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_typedef_11_partial_categorization_0(
-    _i8.FunctionTypedef context4,
-    _i8.Typedef context3,
+String __renderLibrary_partial_typedef_10_partial_categorization_0(
+    _i7.FunctionTypedef context4,
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6940,9 +6774,9 @@ String __renderLibrary_partial_typedef_11_partial_categorization_0(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_typedef_11_partial_features_1(
-    _i8.FunctionTypedef context4,
-    _i8.Typedef context3,
+String __renderLibrary_partial_typedef_10_partial_features_1(
+    _i7.FunctionTypedef context4,
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6957,8 +6791,8 @@ String __renderLibrary_partial_typedef_11_partial_features_1(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_typedef_11_partial_type_2(
-    _i8.Typedef context3,
+String __renderLibrary_partial_typedef_10_partial_type_2(
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -6987,7 +6821,7 @@ String __renderLibrary_partial_typedef_11_partial_type_2(
   </span>
   ''');
   buffer.write(
-      ___renderLibrary_partial_typedef_11_partial_type_2_partial_categorization_0(
+      ___renderLibrary_partial_typedef_10_partial_type_2_partial_categorization_0(
           context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -7003,7 +6837,7 @@ String __renderLibrary_partial_typedef_11_partial_type_2(
   buffer.write(context3.extendedDocLink.toString());
   buffer.write('\n  ');
   buffer.write(
-      ___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
+      ___renderLibrary_partial_typedef_10_partial_type_2_partial_features_1(
           context3, context2, context1, context0));
   buffer.writeln();
   buffer.write('''
@@ -7014,8 +6848,8 @@ String __renderLibrary_partial_typedef_11_partial_type_2(
 }
 
 String
-    ___renderLibrary_partial_typedef_11_partial_type_2_partial_categorization_0(
-        _i8.Typedef context3,
+    ___renderLibrary_partial_typedef_10_partial_type_2_partial_categorization_0(
+        _i7.Typedef context3,
         _i3.Library context2,
         _i3.Library context1,
         _i1.LibraryTemplateData context0) {
@@ -7034,8 +6868,8 @@ String
   return buffer.toString();
 }
 
-String ___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
-    _i8.Typedef context3,
+String ___renderLibrary_partial_typedef_10_partial_type_2_partial_features_1(
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -7050,7 +6884,7 @@ String ___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_search_sidebar_12(
+String _renderLibrary_partial_search_sidebar_11(
     _i1.LibraryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<header id="header-search-sidebar" class="hidden-l">
@@ -7114,7 +6948,7 @@ String _renderLibrary_partial_search_sidebar_12(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_packages_13(_i1.LibraryTemplateData context0) {
+String _renderLibrary_partial_packages_12(_i1.LibraryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<ol>''');
   var context1 = context0.localPackages;
@@ -7190,7 +7024,7 @@ String _renderLibrary_partial_packages_13(_i1.LibraryTemplateData context0) {
   return buffer.toString();
 }
 
-String _renderLibrary_partial_footer_14(_i1.LibraryTemplateData context0) {
+String _renderLibrary_partial_footer_13(_i1.LibraryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''</main>
 
@@ -8191,7 +8025,7 @@ String _renderMixin_partial_head_0(_i1.MixinTemplateData context0) {
 }
 
 String _renderMixin_partial_source_link_1(
-    _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -8206,7 +8040,7 @@ String _renderMixin_partial_source_link_1(
 }
 
 String _renderMixin_partial_feature_set_2(
-    _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -8223,7 +8057,7 @@ String _renderMixin_partial_feature_set_2(
 }
 
 String _renderMixin_partial_categorization_3(
-    _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     var context2 = context1.displayedCategories;
@@ -8240,7 +8074,7 @@ String _renderMixin_partial_categorization_3(
 }
 
 String _renderMixin_partial_documentation_4(
-    _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -8258,7 +8092,7 @@ String _renderMixin_partial_documentation_4(
 }
 
 String _renderMixin_partial_property_5(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context2.htmlId.toString());
@@ -8301,7 +8135,7 @@ String _renderMixin_partial_property_5(
 }
 
 String __renderMixin_partial_property_5_partial_categorization_0(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     var context3 = context2.displayedCategories;
@@ -8318,7 +8152,7 @@ String __renderMixin_partial_property_5_partial_categorization_0(
 }
 
 String __renderMixin_partial_property_5_partial_features_1(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -8331,7 +8165,7 @@ String __renderMixin_partial_property_5_partial_features_1(
 }
 
 String _renderMixin_partial_callable_6(
-    _i10.Method context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i10.Method context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context2.htmlId.toString());
@@ -8382,7 +8216,7 @@ String _renderMixin_partial_callable_6(
 }
 
 String __renderMixin_partial_callable_6_partial_categorization_0(
-    _i10.Method context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i10.Method context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     var context3 = context2.displayedCategories;
@@ -8399,7 +8233,7 @@ String __renderMixin_partial_callable_6_partial_categorization_0(
 }
 
 String __renderMixin_partial_callable_6_partial_features_1(
-    _i10.Method context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i10.Method context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -8412,7 +8246,7 @@ String __renderMixin_partial_callable_6_partial_features_1(
 }
 
 String _renderMixin_partial_constant_7(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''<dt id="''');
   buffer.writeEscaped(context2.htmlId.toString());
@@ -8455,7 +8289,7 @@ String _renderMixin_partial_constant_7(
 }
 
 String __renderMixin_partial_constant_7_partial_categorization_0(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     var context3 = context2.displayedCategories;
@@ -8472,7 +8306,7 @@ String __renderMixin_partial_constant_7_partial_categorization_0(
 }
 
 String __renderMixin_partial_constant_7_partial_features_1(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -8977,7 +8811,7 @@ String _renderProperty_partial_accessor_getter_7(
 }
 
 String __renderProperty_partial_accessor_getter_7_partial_name_summary_0(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -8996,7 +8830,7 @@ String __renderProperty_partial_accessor_getter_7_partial_name_summary_0(
 }
 
 String __renderProperty_partial_accessor_getter_7_partial_features_1(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -9011,7 +8845,7 @@ String __renderProperty_partial_accessor_getter_7_partial_features_1(
 }
 
 String __renderProperty_partial_accessor_getter_7_partial_documentation_2(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -9031,7 +8865,7 @@ String __renderProperty_partial_accessor_getter_7_partial_documentation_2(
 }
 
 String __renderProperty_partial_accessor_getter_7_partial_source_code_3(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -9093,7 +8927,7 @@ String _renderProperty_partial_accessor_setter_8(
 }
 
 String __renderProperty_partial_accessor_setter_8_partial_name_summary_0(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -9112,7 +8946,7 @@ String __renderProperty_partial_accessor_setter_8_partial_name_summary_0(
 }
 
 String __renderProperty_partial_accessor_setter_8_partial_features_1(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -9127,7 +8961,7 @@ String __renderProperty_partial_accessor_setter_8_partial_features_1(
 }
 
 String __renderProperty_partial_accessor_setter_8_partial_documentation_2(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -9147,7 +8981,7 @@ String __renderProperty_partial_accessor_setter_8_partial_documentation_2(
 }
 
 String __renderProperty_partial_accessor_setter_8_partial_source_code_3(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -9280,7 +9114,7 @@ String _renderProperty_partial_footer_10(_i1.PropertyTemplateData context0) {
   return buffer.toString();
 }
 
-String renderSidebarForContainer<T extends _i17.Documentable>(
+String renderSidebarForContainer<T extends _i18.Documentable>(
     _i1.TemplateDataWithContainer<T> context0) {
   final buffer = StringBuffer();
   buffer.write('''<ol>''');
@@ -9536,7 +9370,7 @@ String renderSidebarForContainer<T extends _i17.Documentable>(
   return buffer.toString();
 }
 
-String renderSidebarForLibrary<T extends _i17.Documentable>(
+String renderSidebarForLibrary<T extends _i18.Documentable>(
     _i1.TemplateDataWithLibrary<T> context0) {
   final buffer = StringBuffer();
   buffer.write('''<ol>''');
@@ -9958,7 +9792,7 @@ String _renderTopLevelProperty_partial_head_0(
 }
 
 String _renderTopLevelProperty_partial_source_link_1(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -9973,7 +9807,7 @@ String _renderTopLevelProperty_partial_source_link_1(
 }
 
 String _renderTopLevelProperty_partial_feature_set_2(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -9990,7 +9824,7 @@ String _renderTopLevelProperty_partial_feature_set_2(
 }
 
 String _renderTopLevelProperty_partial_categorization_3(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     var context2 = context1.displayedCategories;
@@ -10007,7 +9841,7 @@ String _renderTopLevelProperty_partial_categorization_3(
 }
 
 String _renderTopLevelProperty_partial_name_summary_4(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.isConst == true) {
     buffer.write('''const ''');
@@ -10024,7 +9858,7 @@ String _renderTopLevelProperty_partial_name_summary_4(
 }
 
 String _renderTopLevelProperty_partial_features_5(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatures == true) {
     buffer.write('''<div class="features">''');
@@ -10037,7 +9871,7 @@ String _renderTopLevelProperty_partial_features_5(
 }
 
 String _renderTopLevelProperty_partial_documentation_6(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -10055,7 +9889,7 @@ String _renderTopLevelProperty_partial_documentation_6(
 }
 
 String _renderTopLevelProperty_partial_source_code_7(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceCode == true) {
     buffer.writeln();
@@ -10073,7 +9907,7 @@ String _renderTopLevelProperty_partial_source_code_7(
 }
 
 String _renderTopLevelProperty_partial_accessor_getter_8(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   var context2 = context1.getter;
   if (context2 != null) {
@@ -10116,8 +9950,8 @@ String _renderTopLevelProperty_partial_accessor_getter_8(
 
 String
     __renderTopLevelProperty_partial_accessor_getter_8_partial_name_summary_0(
-        _i16.Accessor context2,
-        _i6.TopLevelVariable context1,
+        _i17.Accessor context2,
+        _i5.TopLevelVariable context1,
         _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.isConst == true) {
@@ -10135,8 +9969,8 @@ String
 }
 
 String __renderTopLevelProperty_partial_accessor_getter_8_partial_features_1(
-    _i16.Accessor context2,
-    _i6.TopLevelVariable context1,
+    _i17.Accessor context2,
+    _i5.TopLevelVariable context1,
     _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
@@ -10151,8 +9985,8 @@ String __renderTopLevelProperty_partial_accessor_getter_8_partial_features_1(
 
 String
     __renderTopLevelProperty_partial_accessor_getter_8_partial_documentation_2(
-        _i16.Accessor context2,
-        _i6.TopLevelVariable context1,
+        _i17.Accessor context2,
+        _i5.TopLevelVariable context1,
         _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasDocumentation == true) {
@@ -10171,8 +10005,8 @@ String
 }
 
 String __renderTopLevelProperty_partial_accessor_getter_8_partial_source_code_3(
-    _i16.Accessor context2,
-    _i6.TopLevelVariable context1,
+    _i17.Accessor context2,
+    _i5.TopLevelVariable context1,
     _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasSourceCode == true) {
@@ -10191,7 +10025,7 @@ String __renderTopLevelProperty_partial_accessor_getter_8_partial_source_code_3(
 }
 
 String _renderTopLevelProperty_partial_accessor_setter_9(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   var context2 = context1.setter;
   if (context2 != null) {
@@ -10235,8 +10069,8 @@ String _renderTopLevelProperty_partial_accessor_setter_9(
 
 String
     __renderTopLevelProperty_partial_accessor_setter_9_partial_name_summary_0(
-        _i16.Accessor context2,
-        _i6.TopLevelVariable context1,
+        _i17.Accessor context2,
+        _i5.TopLevelVariable context1,
         _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.isConst == true) {
@@ -10254,8 +10088,8 @@ String
 }
 
 String __renderTopLevelProperty_partial_accessor_setter_9_partial_features_1(
-    _i16.Accessor context2,
-    _i6.TopLevelVariable context1,
+    _i17.Accessor context2,
+    _i5.TopLevelVariable context1,
     _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
@@ -10270,8 +10104,8 @@ String __renderTopLevelProperty_partial_accessor_setter_9_partial_features_1(
 
 String
     __renderTopLevelProperty_partial_accessor_setter_9_partial_documentation_2(
-        _i16.Accessor context2,
-        _i6.TopLevelVariable context1,
+        _i17.Accessor context2,
+        _i5.TopLevelVariable context1,
         _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasDocumentation == true) {
@@ -10290,8 +10124,8 @@ String
 }
 
 String __renderTopLevelProperty_partial_accessor_setter_9_partial_source_code_3(
-    _i16.Accessor context2,
-    _i6.TopLevelVariable context1,
+    _i17.Accessor context2,
+    _i5.TopLevelVariable context1,
     _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasSourceCode == true) {
@@ -10653,7 +10487,7 @@ String _renderTypedef_partial_head_0(_i1.TypedefTemplateData context0) {
 }
 
 String _renderTypedef_partial_source_link_1(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -10668,7 +10502,7 @@ String _renderTypedef_partial_source_link_1(
 }
 
 String _renderTypedef_partial_feature_set_2(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -10685,7 +10519,7 @@ String _renderTypedef_partial_feature_set_2(
 }
 
 String _renderTypedef_partial_categorization_3(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     var context2 = context1.displayedCategories;
@@ -10702,7 +10536,7 @@ String _renderTypedef_partial_categorization_3(
 }
 
 String _renderTypedef_partial_typedef_multiline_4(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.isCallable == true) {
     var context2 = context1.asCallable;
@@ -10756,7 +10590,7 @@ String _renderTypedef_partial_typedef_multiline_4(
 }
 
 String __renderTypedef_partial_typedef_multiline_4_partial_type_multiline_0(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasAnnotations == true) {
     buffer.writeln();
@@ -10793,7 +10627,7 @@ String __renderTypedef_partial_typedef_multiline_4_partial_type_multiline_0(
 
 String
     ___renderTypedef_partial_typedef_multiline_4_partial_type_multiline_0_partial_name_summary_0(
-        _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+        _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.isConst == true) {
     buffer.write('''const ''');
@@ -10810,7 +10644,7 @@ String
 }
 
 String _renderTypedef_partial_documentation_5(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -10828,7 +10662,7 @@ String _renderTypedef_partial_documentation_5(
 }
 
 String _renderTypedef_partial_source_code_6(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceCode == true) {
     buffer.writeln();
@@ -10961,6 +10795,6 @@ String _renderTypedef_partial_footer_8(_i1.TypedefTemplateData context0) {
 
 extension on StringBuffer {
   void writeEscaped(String value) {
-    write(_i18.htmlEscape.convert(value));
+    write(_i19.htmlEscape.convert(value));
   }
 }
diff --git a/lib/src/generator/templates.aot_renderers_for_md.dart b/lib/src/generator/templates.aot_renderers_for_md.dart
index 1e36910909..ccce14888e 100644
--- a/lib/src/generator/templates.aot_renderers_for_md.dart
+++ b/lib/src/generator/templates.aot_renderers_for_md.dart
@@ -8,25 +8,26 @@
 // non-bool, non-Iterable field is non-null.
 // ignore_for_file: unused_local_variable
 
-import 'dart:convert' as _i18;
+import 'dart:convert' as _i19;
 
 import 'package:dartdoc/src/generator/template_data.dart' as _i1;
-import 'package:dartdoc/src/model/accessor.dart' as _i16;
+import 'package:dartdoc/src/model/accessor.dart' as _i17;
 import 'package:dartdoc/src/model/category.dart' as _i2;
-import 'package:dartdoc/src/model/class.dart' as _i4;
+import 'package:dartdoc/src/model/class.dart' as _i8;
 import 'package:dartdoc/src/model/constructor.dart' as _i11;
-import 'package:dartdoc/src/model/documentable.dart' as _i17;
+import 'package:dartdoc/src/model/container.dart' as _i4;
+import 'package:dartdoc/src/model/documentable.dart' as _i18;
 import 'package:dartdoc/src/model/enum.dart' as _i12;
 import 'package:dartdoc/src/model/extension.dart' as _i13;
 import 'package:dartdoc/src/model/field.dart' as _i9;
 import 'package:dartdoc/src/model/library.dart' as _i3;
 import 'package:dartdoc/src/model/library_container.dart' as _i15;
 import 'package:dartdoc/src/model/method.dart' as _i10;
-import 'package:dartdoc/src/model/mixin.dart' as _i5;
-import 'package:dartdoc/src/model/model_function.dart' as _i7;
+import 'package:dartdoc/src/model/mixin.dart' as _i16;
+import 'package:dartdoc/src/model/model_function.dart' as _i6;
 import 'package:dartdoc/src/model/package.dart' as _i14;
-import 'package:dartdoc/src/model/top_level_variable.dart' as _i6;
-import 'package:dartdoc/src/model/typedef.dart' as _i8;
+import 'package:dartdoc/src/model/top_level_variable.dart' as _i5;
+import 'package:dartdoc/src/model/typedef.dart' as _i7;
 
 String renderCategory(_i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -68,8 +69,8 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context4 != null) {
         for (var context5 in context4) {
           buffer.writeln();
-          buffer.write(
-              _renderCategory_partial_class_3(context5, context1, context0));
+          buffer.write(_renderCategory_partial_container_3(
+              context5, context1, context0));
           buffer.writeln();
         }
       }
@@ -84,8 +85,8 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context6 != null) {
         for (var context7 in context6) {
           buffer.writeln();
-          buffer.write(
-              _renderCategory_partial_mixin_4(context7, context1, context0));
+          buffer.write(_renderCategory_partial_container_3(
+              context7, context1, context0));
           buffer.writeln();
         }
       }
@@ -101,7 +102,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
         for (var context9 in context8) {
           buffer.writeln();
           buffer.write(
-              _renderCategory_partial_constant_5(context9, context1, context0));
+              _renderCategory_partial_constant_4(context9, context1, context0));
           buffer.writeln();
         }
       }
@@ -116,7 +117,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context10 != null) {
         for (var context11 in context10) {
           buffer.writeln();
-          buffer.write(_renderCategory_partial_property_6(
+          buffer.write(_renderCategory_partial_property_5(
               context11, context1, context0));
           buffer.writeln();
         }
@@ -132,7 +133,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context12 != null) {
         for (var context13 in context12) {
           buffer.writeln();
-          buffer.write(_renderCategory_partial_callable_7(
+          buffer.write(_renderCategory_partial_callable_6(
               context13, context1, context0));
           buffer.writeln();
         }
@@ -148,8 +149,8 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context14 != null) {
         for (var context15 in context14) {
           buffer.writeln();
-          buffer.write(
-              _renderCategory_partial_class_3(context15, context1, context0));
+          buffer.write(_renderCategory_partial_container_3(
+              context15, context1, context0));
           buffer.writeln();
         }
       }
@@ -165,7 +166,7 @@ String renderCategory(_i1.CategoryTemplateData context0) {
         for (var context17 in context16) {
           buffer.writeln();
           buffer.write(
-              _renderCategory_partial_typedef_8(context17, context1, context0));
+              _renderCategory_partial_typedef_7(context17, context1, context0));
           buffer.writeln();
         }
       }
@@ -180,15 +181,15 @@ String renderCategory(_i1.CategoryTemplateData context0) {
       if (context18 != null) {
         for (var context19 in context18) {
           buffer.writeln();
-          buffer.write(
-              _renderCategory_partial_class_3(context19, context1, context0));
+          buffer.write(_renderCategory_partial_container_3(
+              context19, context1, context0));
           buffer.writeln();
         }
       }
     }
   }
   buffer.write('\n\n');
-  buffer.write(_renderCategory_partial_footer_9(context0));
+  buffer.write(_renderCategory_partial_footer_8(context0));
   buffer.writeln();
 
   return buffer.toString();
@@ -231,54 +232,14 @@ String _renderCategory_partial_library_2(_i3.Library context2,
   return buffer.toString();
 }
 
-String _renderCategory_partial_class_3(_i4.Class context2,
-    _i2.Category context1, _i1.CategoryTemplateData context0) {
-  final buffer = StringBuffer();
-  buffer.write('''##### ''');
-  buffer.write(context2.linkedName.toString());
-  buffer.write(context2.linkedGenericParameters.toString());
-  buffer.writeln();
-  buffer.write(__renderCategory_partial_class_3_partial_categorization_0(
-      context2, context1, context0));
-  buffer.write('\n\n');
-  buffer.write(context2.oneLineDoc.toString());
-  buffer.write(' ');
-  buffer.write(context2.extendedDocLink.toString());
-  buffer.writeln();
-
-  return buffer.toString();
-}
-
-String __renderCategory_partial_class_3_partial_categorization_0(
-    _i4.Class context2,
-    _i2.Category context1,
-    _i1.CategoryTemplateData context0) {
-  final buffer = StringBuffer();
-  if (context2.hasCategoryNames == true) {
-    buffer.writeln();
-    buffer.write('''
-Categories:''');
-    var context3 = context2.displayedCategories;
-    if (context3 != null) {
-      for (var context4 in context3) {
-        buffer.writeln();
-        buffer.write(context4.categoryLabel.toString());
-      }
-    }
-  }
-  buffer.writeln();
-
-  return buffer.toString();
-}
-
-String _renderCategory_partial_mixin_4(_i5.Mixin context2,
+String _renderCategory_partial_container_3(_i4.Container context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
   buffer.write(context2.linkedGenericParameters.toString());
   buffer.writeln();
-  buffer.write(__renderCategory_partial_mixin_4_partial_categorization_0(
+  buffer.write(__renderCategory_partial_container_3_partial_categorization_0(
       context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context2.oneLineDoc.toString());
@@ -289,8 +250,8 @@ String _renderCategory_partial_mixin_4(_i5.Mixin context2,
   return buffer.toString();
 }
 
-String __renderCategory_partial_mixin_4_partial_categorization_0(
-    _i5.Mixin context2,
+String __renderCategory_partial_container_3_partial_categorization_0(
+    _i4.Container context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -311,7 +272,7 @@ Categories:''');
   return buffer.toString();
 }
 
-String _renderCategory_partial_constant_5(_i6.TopLevelVariable context2,
+String _renderCategory_partial_constant_4(_i5.TopLevelVariable context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
@@ -319,7 +280,7 @@ String _renderCategory_partial_constant_5(_i6.TopLevelVariable context2,
   buffer.write(''' const ''');
   buffer.write(context2.modelType.linkedName.toString());
   buffer.writeln();
-  buffer.write(__renderCategory_partial_constant_5_partial_categorization_0(
+  buffer.write(__renderCategory_partial_constant_4_partial_categorization_0(
       context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context2.oneLineDoc.toString());
@@ -327,15 +288,15 @@ String _renderCategory_partial_constant_5(_i6.TopLevelVariable context2,
   buffer.write(context2.extendedDocLink.toString());
   buffer.write('  ');
   buffer.writeln();
-  buffer.write(__renderCategory_partial_constant_5_partial_features_1(
+  buffer.write(__renderCategory_partial_constant_4_partial_features_1(
       context2, context1, context0));
   buffer.writeln();
 
   return buffer.toString();
 }
 
-String __renderCategory_partial_constant_5_partial_categorization_0(
-    _i6.TopLevelVariable context2,
+String __renderCategory_partial_constant_4_partial_categorization_0(
+    _i5.TopLevelVariable context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -356,8 +317,8 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderCategory_partial_constant_5_partial_features_1(
-    _i6.TopLevelVariable context2,
+String __renderCategory_partial_constant_4_partial_features_1(
+    _i5.TopLevelVariable context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -371,7 +332,7 @@ String __renderCategory_partial_constant_5_partial_features_1(
   return buffer.toString();
 }
 
-String _renderCategory_partial_property_6(_i6.TopLevelVariable context2,
+String _renderCategory_partial_property_5(_i5.TopLevelVariable context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
@@ -381,7 +342,7 @@ String _renderCategory_partial_property_6(_i6.TopLevelVariable context2,
   buffer.write(' ');
   buffer.write(context2.modelType.linkedName.toString());
   buffer.writeln();
-  buffer.write(__renderCategory_partial_property_6_partial_categorization_0(
+  buffer.write(__renderCategory_partial_property_5_partial_categorization_0(
       context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context2.oneLineDoc.toString());
@@ -389,15 +350,15 @@ String _renderCategory_partial_property_6(_i6.TopLevelVariable context2,
   buffer.write(context2.extendedDocLink.toString());
   buffer.write('  ');
   buffer.writeln();
-  buffer.write(__renderCategory_partial_property_6_partial_features_1(
+  buffer.write(__renderCategory_partial_property_5_partial_features_1(
       context2, context1, context0));
   buffer.writeln();
 
   return buffer.toString();
 }
 
-String __renderCategory_partial_property_6_partial_categorization_0(
-    _i6.TopLevelVariable context2,
+String __renderCategory_partial_property_5_partial_categorization_0(
+    _i5.TopLevelVariable context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -418,8 +379,8 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderCategory_partial_property_6_partial_features_1(
-    _i6.TopLevelVariable context2,
+String __renderCategory_partial_property_5_partial_features_1(
+    _i5.TopLevelVariable context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -433,7 +394,7 @@ String __renderCategory_partial_property_6_partial_features_1(
   return buffer.toString();
 }
 
-String _renderCategory_partial_callable_7(_i7.ModelFunctionTyped context2,
+String _renderCategory_partial_callable_6(_i6.ModelFunctionTyped context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
@@ -444,7 +405,7 @@ String _renderCategory_partial_callable_7(_i7.ModelFunctionTyped context2,
   buffer.write(''') ''');
   buffer.write(context2.modelType.returnType.linkedName.toString());
   buffer.writeln();
-  buffer.write(__renderCategory_partial_callable_7_partial_categorization_0(
+  buffer.write(__renderCategory_partial_callable_6_partial_categorization_0(
       context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context2.oneLineDoc.toString());
@@ -452,15 +413,15 @@ String _renderCategory_partial_callable_7(_i7.ModelFunctionTyped context2,
   buffer.write(context2.extendedDocLink.toString());
   buffer.write('  ');
   buffer.writeln();
-  buffer.write(__renderCategory_partial_callable_7_partial_features_1(
+  buffer.write(__renderCategory_partial_callable_6_partial_features_1(
       context2, context1, context0));
   buffer.writeln();
 
   return buffer.toString();
 }
 
-String __renderCategory_partial_callable_7_partial_categorization_0(
-    _i7.ModelFunctionTyped context2,
+String __renderCategory_partial_callable_6_partial_categorization_0(
+    _i6.ModelFunctionTyped context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -481,8 +442,8 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderCategory_partial_callable_7_partial_features_1(
-    _i7.ModelFunctionTyped context2,
+String __renderCategory_partial_callable_6_partial_features_1(
+    _i6.ModelFunctionTyped context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -496,7 +457,7 @@ String __renderCategory_partial_callable_7_partial_features_1(
   return buffer.toString();
 }
 
-String _renderCategory_partial_typedef_8(_i8.Typedef context2,
+String _renderCategory_partial_typedef_7(_i7.Typedef context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.isCallable == true) {
@@ -510,7 +471,7 @@ String _renderCategory_partial_typedef_8(_i8.Typedef context2,
       buffer.write(''' = ''');
       buffer.write(context3.modelType.linkedName.toString());
       buffer.write('\n    ');
-      buffer.write(__renderCategory_partial_typedef_8_partial_categorization_0(
+      buffer.write(__renderCategory_partial_typedef_7_partial_categorization_0(
           context3, context2, context1, context0));
       buffer.write('\n\n    ');
       buffer.write(context3.oneLineDoc.toString());
@@ -518,13 +479,13 @@ String _renderCategory_partial_typedef_8(_i8.Typedef context2,
       buffer.write(context3.extendedDocLink.toString());
       buffer.write('  ');
       buffer.write('\n    ');
-      buffer.write(__renderCategory_partial_typedef_8_partial_features_1(
+      buffer.write(__renderCategory_partial_typedef_7_partial_features_1(
           context3, context2, context1, context0));
     }
   }
   if (context2.isCallable != true) {
     buffer.write('\n  ');
-    buffer.write(__renderCategory_partial_typedef_8_partial_type_2(
+    buffer.write(__renderCategory_partial_typedef_7_partial_type_2(
         context2, context1, context0));
   }
   buffer.writeln();
@@ -532,9 +493,9 @@ String _renderCategory_partial_typedef_8(_i8.Typedef context2,
   return buffer.toString();
 }
 
-String __renderCategory_partial_typedef_8_partial_categorization_0(
-    _i8.FunctionTypedef context3,
-    _i8.Typedef context2,
+String __renderCategory_partial_typedef_7_partial_categorization_0(
+    _i7.FunctionTypedef context3,
+    _i7.Typedef context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -555,9 +516,9 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderCategory_partial_typedef_8_partial_features_1(
-    _i8.FunctionTypedef context3,
-    _i8.Typedef context2,
+String __renderCategory_partial_typedef_7_partial_features_1(
+    _i7.FunctionTypedef context3,
+    _i7.Typedef context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -571,7 +532,7 @@ String __renderCategory_partial_typedef_8_partial_features_1(
   return buffer.toString();
 }
 
-String __renderCategory_partial_typedef_8_partial_type_2(_i8.Typedef context2,
+String __renderCategory_partial_typedef_7_partial_type_2(_i7.Typedef context2,
     _i2.Category context1, _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
@@ -581,7 +542,7 @@ String __renderCategory_partial_typedef_8_partial_type_2(_i8.Typedef context2,
   buffer.write(context2.modelType.linkedName.toString());
   buffer.writeln();
   buffer.write(
-      ___renderCategory_partial_typedef_8_partial_type_2_partial_categorization_0(
+      ___renderCategory_partial_typedef_7_partial_type_2_partial_categorization_0(
           context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context2.oneLineDoc.toString());
@@ -590,7 +551,7 @@ String __renderCategory_partial_typedef_8_partial_type_2(_i8.Typedef context2,
   buffer.write('  ');
   buffer.writeln();
   buffer.write(
-      ___renderCategory_partial_typedef_8_partial_type_2_partial_features_1(
+      ___renderCategory_partial_typedef_7_partial_type_2_partial_features_1(
           context2, context1, context0));
   buffer.writeln();
 
@@ -598,8 +559,8 @@ String __renderCategory_partial_typedef_8_partial_type_2(_i8.Typedef context2,
 }
 
 String
-    ___renderCategory_partial_typedef_8_partial_type_2_partial_categorization_0(
-        _i8.Typedef context2,
+    ___renderCategory_partial_typedef_7_partial_type_2_partial_categorization_0(
+        _i7.Typedef context2,
         _i2.Category context1,
         _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -620,8 +581,8 @@ Categories:''');
   return buffer.toString();
 }
 
-String ___renderCategory_partial_typedef_8_partial_type_2_partial_features_1(
-    _i8.Typedef context2,
+String ___renderCategory_partial_typedef_7_partial_type_2_partial_features_1(
+    _i7.Typedef context2,
     _i2.Category context1,
     _i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
@@ -635,7 +596,7 @@ String ___renderCategory_partial_typedef_8_partial_type_2_partial_features_1(
   return buffer.toString();
 }
 
-String _renderCategory_partial_footer_9(_i1.CategoryTemplateData context0) {
+String _renderCategory_partial_footer_8(_i1.CategoryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.writeln();
   buffer.write(context0.customInnerFooter.toString());
@@ -918,7 +879,7 @@ String _renderClass_partial_head_0(_i1.ClassTemplateData context0) {
 }
 
 String _renderClass_partial_source_link_1(
-    _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -933,7 +894,7 @@ String _renderClass_partial_source_link_1(
 }
 
 String _renderClass_partial_categorization_2(
-    _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     buffer.writeln();
@@ -953,7 +914,7 @@ Categories:''');
 }
 
 String _renderClass_partial_feature_set_3(
-    _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -970,7 +931,7 @@ String _renderClass_partial_feature_set_3(
 }
 
 String _renderClass_partial_documentation_4(
-    _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -982,7 +943,7 @@ String _renderClass_partial_documentation_4(
 }
 
 String _renderClass_partial_property_5(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
@@ -1007,7 +968,7 @@ String _renderClass_partial_property_5(
 }
 
 String __renderClass_partial_property_5_partial_categorization_0(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     buffer.writeln();
@@ -1027,7 +988,7 @@ Categories:''');
 }
 
 String __renderClass_partial_property_5_partial_features_1(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''_''');
@@ -1040,7 +1001,7 @@ String __renderClass_partial_property_5_partial_features_1(
 }
 
 String _renderClass_partial_callable_6(
-    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i10.Method context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
@@ -1066,7 +1027,7 @@ String _renderClass_partial_callable_6(
 }
 
 String __renderClass_partial_callable_6_partial_categorization_0(
-    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i10.Method context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     buffer.writeln();
@@ -1086,7 +1047,7 @@ Categories:''');
 }
 
 String __renderClass_partial_callable_6_partial_features_1(
-    _i10.Method context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i10.Method context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''_''');
@@ -1099,7 +1060,7 @@ String __renderClass_partial_callable_6_partial_features_1(
 }
 
 String _renderClass_partial_constant_7(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
@@ -1122,7 +1083,7 @@ String _renderClass_partial_constant_7(
 }
 
 String __renderClass_partial_constant_7_partial_categorization_0(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     buffer.writeln();
@@ -1142,7 +1103,7 @@ Categories:''');
 }
 
 String __renderClass_partial_constant_7_partial_features_1(
-    _i9.Field context2, _i4.Class context1, _i1.ClassTemplateData context0) {
+    _i9.Field context2, _i8.Class context1, _i1.ClassTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''_''');
@@ -1368,12 +1329,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
         }
       }
       buffer.writeln();
-      if (context2.hasPublicMixedInTypes == true) {
+      if (context2.hasPublicImplementors == true) {
         buffer.writeln();
         buffer.write('''
-**Mixed in types**
+**Implementers**
 ''');
-        var context7 = context2.publicMixedInTypes;
+        var context7 = context2.publicImplementorsSorted;
         if (context7 != null) {
           for (var context8 in context7) {
             buffer.writeln();
@@ -1384,34 +1345,18 @@ String renderEnum(_i1.EnumTemplateData context0) {
         }
       }
       buffer.writeln();
-      if (context2.hasPublicImplementors == true) {
-        buffer.writeln();
-        buffer.write('''
-**Implementers**
-''');
-        var context9 = context2.publicImplementorsSorted;
-        if (context9 != null) {
-          for (var context10 in context9) {
-            buffer.writeln();
-            buffer.write('''
-- ''');
-            buffer.write(context10.linkedName.toString());
-          }
-        }
-      }
-      buffer.writeln();
       if (context2.hasAnnotations == true) {
         buffer.writeln();
         buffer.write('''
 **Annotations**
 ''');
-        var context11 = context2.annotations;
-        if (context11 != null) {
-          for (var context12 in context11) {
+        var context9 = context2.annotations;
+        if (context9 != null) {
+          for (var context10 in context9) {
             buffer.writeln();
             buffer.write('''
 - ''');
-            buffer.write(context12.linkedNameWithParameters.toString());
+            buffer.write(context10.linkedNameWithParameters.toString());
           }
         }
       }
@@ -1422,43 +1367,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Constants
 ''');
-      var context13 = context2.publicConstantFieldsSorted;
-      if (context13 != null) {
-        for (var context14 in context13) {
+      var context11 = context2.publicConstantFieldsSorted;
+      if (context11 != null) {
+        for (var context12 in context11) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_constant_4(context14, context2, context0));
-          buffer.writeln();
-        }
-      }
-    }
-    buffer.writeln();
-    if (context2.hasPublicConstructors == true) {
-      buffer.writeln();
-      buffer.write('''
-## Constructors
-''');
-      var context15 = context2.publicConstructorsSorted;
-      if (context15 != null) {
-        for (var context16 in context15) {
-          buffer.writeln();
-          buffer.write(context16.linkedName.toString());
-          buffer.write('''(''');
-          buffer.write(context16.linkedParams.toString());
-          buffer.write(''')
-
-''');
-          buffer.write(context16.oneLineDoc.toString());
-          buffer.write(' ');
-          buffer.write(context16.extendedDocLink.toString());
-          buffer.write('  ');
-          if (context16.isConst == true) {
-            buffer.write('''_const_''');
-          }
-          buffer.write(' ');
-          if (context16.isFactory == true) {
-            buffer.write('''_factory_''');
-          }
+              _renderEnum_partial_constant_4(context12, context2, context0));
           buffer.writeln();
         }
       }
@@ -1469,12 +1383,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Properties
 ''');
-      var context17 = context2.publicInstanceFieldsSorted;
-      if (context17 != null) {
-        for (var context18 in context17) {
+      var context13 = context2.publicInstanceFieldsSorted;
+      if (context13 != null) {
+        for (var context14 in context13) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_property_5(context18, context2, context0));
+              _renderEnum_partial_property_5(context14, context2, context0));
           buffer.writeln();
         }
       }
@@ -1485,12 +1399,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Methods
 ''');
-      var context19 = context2.publicInstanceMethodsSorted;
-      if (context19 != null) {
-        for (var context20 in context19) {
+      var context15 = context2.publicInstanceMethodsSorted;
+      if (context15 != null) {
+        for (var context16 in context15) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_callable_6(context20, context2, context0));
+              _renderEnum_partial_callable_6(context16, context2, context0));
           buffer.writeln();
         }
       }
@@ -1501,12 +1415,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Operators
 ''');
-      var context21 = context2.publicInstanceOperatorsSorted;
-      if (context21 != null) {
-        for (var context22 in context21) {
+      var context17 = context2.publicInstanceOperatorsSorted;
+      if (context17 != null) {
+        for (var context18 in context17) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_callable_6(context22, context2, context0));
+              _renderEnum_partial_callable_6(context18, context2, context0));
           buffer.writeln();
         }
       }
@@ -1517,12 +1431,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Static Properties
 ''');
-      var context23 = context2.publicVariableStaticFieldsSorted;
-      if (context23 != null) {
-        for (var context24 in context23) {
+      var context19 = context2.publicVariableStaticFieldsSorted;
+      if (context19 != null) {
+        for (var context20 in context19) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_property_5(context24, context2, context0));
+              _renderEnum_partial_property_5(context20, context2, context0));
           buffer.writeln();
         }
       }
@@ -1533,12 +1447,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Static Methods
 ''');
-      var context25 = context2.publicStaticMethodsSorted;
-      if (context25 != null) {
-        for (var context26 in context25) {
+      var context21 = context2.publicStaticMethodsSorted;
+      if (context21 != null) {
+        for (var context22 in context21) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_callable_6(context26, context2, context0));
+              _renderEnum_partial_callable_6(context22, context2, context0));
           buffer.writeln();
         }
       }
@@ -2253,7 +2167,7 @@ String _renderFunction_partial_head_0(_i1.FunctionTemplateData context0) {
 }
 
 String _renderFunction_partial_source_link_1(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -2268,7 +2182,7 @@ String _renderFunction_partial_source_link_1(
 }
 
 String _renderFunction_partial_categorization_2(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     buffer.writeln();
@@ -2288,7 +2202,7 @@ Categories:''');
 }
 
 String _renderFunction_partial_feature_set_3(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -2305,7 +2219,7 @@ String _renderFunction_partial_feature_set_3(
 }
 
 String _renderFunction_partial_callable_multiline_4(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasAnnotations == true) {
     var context2 = context1.annotations;
@@ -2336,7 +2250,7 @@ String _renderFunction_partial_callable_multiline_4(
 }
 
 String __renderFunction_partial_callable_multiline_4_partial_name_summary_0(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.isConst == true) {
     buffer.write('''const ''');
@@ -2354,7 +2268,7 @@ String __renderFunction_partial_callable_multiline_4_partial_name_summary_0(
 }
 
 String _renderFunction_partial_documentation_5(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -2366,7 +2280,7 @@ String _renderFunction_partial_documentation_5(
 }
 
 String _renderFunction_partial_source_code_6(
-    _i7.ModelFunction context1, _i1.FunctionTemplateData context0) {
+    _i6.ModelFunction context1, _i1.FunctionTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceCode == true) {
     buffer.writeln();
@@ -2555,7 +2469,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context5 != null) {
           for (var context6 in context5) {
             buffer.writeln();
-            buffer.write(_renderLibrary_partial_class_5(
+            buffer.write(_renderLibrary_partial_container_5(
                 context6, context4, context3, context0));
             buffer.writeln();
           }
@@ -2687,7 +2601,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context29 != null) {
           for (var context30 in context29) {
             buffer.writeln();
-            buffer.write(_renderLibrary_partial_class_5(
+            buffer.write(_renderLibrary_partial_container_5(
                 context30, context28, context27, context0));
             buffer.writeln();
           }
@@ -2731,7 +2645,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context37 != null) {
           for (var context38 in context37) {
             buffer.writeln();
-            buffer.write(_renderLibrary_partial_class_5(
+            buffer.write(_renderLibrary_partial_container_5(
                 context38, context36, context35, context0));
             buffer.writeln();
           }
@@ -2818,14 +2732,17 @@ String _renderLibrary_partial_documentation_4(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_class_5(_i4.Class context3, _i3.Library context2,
-    _i3.Library context1, _i1.LibraryTemplateData context0) {
+String _renderLibrary_partial_container_5(
+    _i4.Container context3,
+    _i3.Library context2,
+    _i3.Library context1,
+    _i1.LibraryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context3.linkedName.toString());
   buffer.write(context3.linkedGenericParameters.toString());
   buffer.writeln();
-  buffer.write(__renderLibrary_partial_class_5_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_container_5_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context3.oneLineDoc.toString());
@@ -2836,8 +2753,8 @@ String _renderLibrary_partial_class_5(_i4.Class context3, _i3.Library context2,
   return buffer.toString();
 }
 
-String __renderLibrary_partial_class_5_partial_categorization_0(
-    _i4.Class context3,
+String __renderLibrary_partial_container_5_partial_categorization_0(
+    _i4.Container context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -2859,7 +2776,7 @@ Categories:''');
   return buffer.toString();
 }
 
-String _renderLibrary_partial_mixin_6(_i5.Mixin context3, _i3.Library context2,
+String _renderLibrary_partial_mixin_6(_i16.Mixin context3, _i3.Library context2,
     _i3.Library context1, _i1.LibraryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
@@ -2878,7 +2795,7 @@ String _renderLibrary_partial_mixin_6(_i5.Mixin context3, _i3.Library context2,
 }
 
 String __renderLibrary_partial_mixin_6_partial_categorization_0(
-    _i5.Mixin context3,
+    _i16.Mixin context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -2944,7 +2861,7 @@ Categories:''');
 }
 
 String _renderLibrary_partial_constant_8(
-    _i6.TopLevelVariable context3,
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -2970,7 +2887,7 @@ String _renderLibrary_partial_constant_8(
 }
 
 String __renderLibrary_partial_constant_8_partial_categorization_0(
-    _i6.TopLevelVariable context3,
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -2993,7 +2910,7 @@ Categories:''');
 }
 
 String __renderLibrary_partial_constant_8_partial_features_1(
-    _i6.TopLevelVariable context3,
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3009,7 +2926,7 @@ String __renderLibrary_partial_constant_8_partial_features_1(
 }
 
 String _renderLibrary_partial_property_9(
-    _i6.TopLevelVariable context3,
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3037,7 +2954,7 @@ String _renderLibrary_partial_property_9(
 }
 
 String __renderLibrary_partial_property_9_partial_categorization_0(
-    _i6.TopLevelVariable context3,
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3060,7 +2977,7 @@ Categories:''');
 }
 
 String __renderLibrary_partial_property_9_partial_features_1(
-    _i6.TopLevelVariable context3,
+    _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3076,7 +2993,7 @@ String __renderLibrary_partial_property_9_partial_features_1(
 }
 
 String _renderLibrary_partial_callable_10(
-    _i7.ModelFunctionTyped context3,
+    _i6.ModelFunctionTyped context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3105,7 +3022,7 @@ String _renderLibrary_partial_callable_10(
 }
 
 String __renderLibrary_partial_callable_10_partial_categorization_0(
-    _i7.ModelFunctionTyped context3,
+    _i6.ModelFunctionTyped context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3128,7 +3045,7 @@ Categories:''');
 }
 
 String __renderLibrary_partial_callable_10_partial_features_1(
-    _i7.ModelFunctionTyped context3,
+    _i6.ModelFunctionTyped context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3144,7 +3061,7 @@ String __renderLibrary_partial_callable_10_partial_features_1(
 }
 
 String _renderLibrary_partial_typedef_11(
-    _i8.Typedef context3,
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3183,8 +3100,8 @@ String _renderLibrary_partial_typedef_11(
 }
 
 String __renderLibrary_partial_typedef_11_partial_categorization_0(
-    _i8.FunctionTypedef context4,
-    _i8.Typedef context3,
+    _i7.FunctionTypedef context4,
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3207,8 +3124,8 @@ Categories:''');
 }
 
 String __renderLibrary_partial_typedef_11_partial_features_1(
-    _i8.FunctionTypedef context4,
-    _i8.Typedef context3,
+    _i7.FunctionTypedef context4,
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3224,7 +3141,7 @@ String __renderLibrary_partial_typedef_11_partial_features_1(
 }
 
 String __renderLibrary_partial_typedef_11_partial_type_2(
-    _i8.Typedef context3,
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3254,7 +3171,7 @@ String __renderLibrary_partial_typedef_11_partial_type_2(
 
 String
     ___renderLibrary_partial_typedef_11_partial_type_2_partial_categorization_0(
-        _i8.Typedef context3,
+        _i7.Typedef context3,
         _i3.Library context2,
         _i3.Library context1,
         _i1.LibraryTemplateData context0) {
@@ -3277,7 +3194,7 @@ Categories:''');
 }
 
 String ___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
-    _i8.Typedef context3,
+    _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
     _i1.LibraryTemplateData context0) {
@@ -3711,7 +3628,7 @@ String _renderMixin_partial_head_0(_i1.MixinTemplateData context0) {
 }
 
 String _renderMixin_partial_source_link_1(
-    _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -3726,7 +3643,7 @@ String _renderMixin_partial_source_link_1(
 }
 
 String _renderMixin_partial_categorization_2(
-    _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     buffer.writeln();
@@ -3746,7 +3663,7 @@ Categories:''');
 }
 
 String _renderMixin_partial_feature_set_3(
-    _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -3763,7 +3680,7 @@ String _renderMixin_partial_feature_set_3(
 }
 
 String _renderMixin_partial_documentation_4(
-    _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -3775,7 +3692,7 @@ String _renderMixin_partial_documentation_4(
 }
 
 String _renderMixin_partial_property_5(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
@@ -3800,7 +3717,7 @@ String _renderMixin_partial_property_5(
 }
 
 String __renderMixin_partial_property_5_partial_categorization_0(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     buffer.writeln();
@@ -3820,7 +3737,7 @@ Categories:''');
 }
 
 String __renderMixin_partial_property_5_partial_features_1(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''_''');
@@ -3833,7 +3750,7 @@ String __renderMixin_partial_property_5_partial_features_1(
 }
 
 String _renderMixin_partial_callable_6(
-    _i10.Method context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i10.Method context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
@@ -3859,7 +3776,7 @@ String _renderMixin_partial_callable_6(
 }
 
 String __renderMixin_partial_callable_6_partial_categorization_0(
-    _i10.Method context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i10.Method context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     buffer.writeln();
@@ -3879,7 +3796,7 @@ Categories:''');
 }
 
 String __renderMixin_partial_callable_6_partial_features_1(
-    _i10.Method context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i10.Method context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''_''');
@@ -3892,7 +3809,7 @@ String __renderMixin_partial_callable_6_partial_features_1(
 }
 
 String _renderMixin_partial_constant_7(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   buffer.write('''##### ''');
   buffer.write(context2.linkedName.toString());
@@ -3915,7 +3832,7 @@ String _renderMixin_partial_constant_7(
 }
 
 String __renderMixin_partial_constant_7_partial_categorization_0(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasCategoryNames == true) {
     buffer.writeln();
@@ -3935,7 +3852,7 @@ Categories:''');
 }
 
 String __renderMixin_partial_constant_7_partial_features_1(
-    _i9.Field context2, _i5.Mixin context1, _i1.MixinTemplateData context0) {
+    _i9.Field context2, _i16.Mixin context1, _i1.MixinTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
     buffer.write('''_''');
@@ -4146,7 +4063,7 @@ String _renderProperty_partial_accessor_getter_7(
 }
 
 String __renderProperty_partial_accessor_getter_7_partial_name_summary_0(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -4166,7 +4083,7 @@ String __renderProperty_partial_accessor_getter_7_partial_name_summary_0(
 }
 
 String __renderProperty_partial_accessor_getter_7_partial_features_1(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -4181,7 +4098,7 @@ String __renderProperty_partial_accessor_getter_7_partial_features_1(
 }
 
 String __renderProperty_partial_accessor_getter_7_partial_documentation_2(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -4195,7 +4112,7 @@ String __renderProperty_partial_accessor_getter_7_partial_documentation_2(
 }
 
 String __renderProperty_partial_accessor_getter_7_partial_source_code_3(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -4246,7 +4163,7 @@ String _renderProperty_partial_accessor_setter_8(
 }
 
 String __renderProperty_partial_accessor_setter_8_partial_name_summary_0(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -4266,7 +4183,7 @@ String __renderProperty_partial_accessor_setter_8_partial_name_summary_0(
 }
 
 String __renderProperty_partial_accessor_setter_8_partial_features_1(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -4281,7 +4198,7 @@ String __renderProperty_partial_accessor_setter_8_partial_features_1(
 }
 
 String __renderProperty_partial_accessor_setter_8_partial_documentation_2(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -4295,7 +4212,7 @@ String __renderProperty_partial_accessor_setter_8_partial_documentation_2(
 }
 
 String __renderProperty_partial_accessor_setter_8_partial_source_code_3(
-    _i16.ContainerAccessor context2,
+    _i17.ContainerAccessor context2,
     _i9.Field context1,
     _i1.PropertyTemplateData context0) {
   final buffer = StringBuffer();
@@ -4327,14 +4244,14 @@ String _renderProperty_partial_footer_9(_i1.PropertyTemplateData context0) {
   return buffer.toString();
 }
 
-String renderSidebarForContainer<T extends _i17.Documentable>(
+String renderSidebarForContainer<T extends _i18.Documentable>(
     _i1.TemplateDataWithContainer<T> context0) {
   final buffer = StringBuffer();
 
   return buffer.toString();
 }
 
-String renderSidebarForLibrary<T extends _i17.Documentable>(
+String renderSidebarForLibrary<T extends _i18.Documentable>(
     _i1.TemplateDataWithLibrary<T> context0) {
   final buffer = StringBuffer();
 
@@ -4410,7 +4327,7 @@ String _renderTopLevelProperty_partial_head_0(
 }
 
 String _renderTopLevelProperty_partial_source_link_1(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -4425,7 +4342,7 @@ String _renderTopLevelProperty_partial_source_link_1(
 }
 
 String _renderTopLevelProperty_partial_categorization_2(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     buffer.writeln();
@@ -4445,7 +4362,7 @@ Categories:''');
 }
 
 String _renderTopLevelProperty_partial_feature_set_3(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -4462,7 +4379,7 @@ String _renderTopLevelProperty_partial_feature_set_3(
 }
 
 String _renderTopLevelProperty_partial_name_summary_4(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.isConst == true) {
     buffer.write('''const ''');
@@ -4480,7 +4397,7 @@ String _renderTopLevelProperty_partial_name_summary_4(
 }
 
 String _renderTopLevelProperty_partial_features_5(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatures == true) {
     buffer.write('''_''');
@@ -4493,7 +4410,7 @@ String _renderTopLevelProperty_partial_features_5(
 }
 
 String _renderTopLevelProperty_partial_documentation_6(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -4505,7 +4422,7 @@ String _renderTopLevelProperty_partial_documentation_6(
 }
 
 String _renderTopLevelProperty_partial_source_code_7(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceCode == true) {
     buffer.writeln();
@@ -4525,7 +4442,7 @@ String _renderTopLevelProperty_partial_source_code_7(
 }
 
 String _renderTopLevelProperty_partial_accessor_getter_8(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   var context2 = context1.getter;
   if (context2 != null) {
@@ -4556,8 +4473,8 @@ String _renderTopLevelProperty_partial_accessor_getter_8(
 
 String
     __renderTopLevelProperty_partial_accessor_getter_8_partial_name_summary_0(
-        _i16.Accessor context2,
-        _i6.TopLevelVariable context1,
+        _i17.Accessor context2,
+        _i5.TopLevelVariable context1,
         _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.isConst == true) {
@@ -4576,8 +4493,8 @@ String
 }
 
 String __renderTopLevelProperty_partial_accessor_getter_8_partial_features_1(
-    _i16.Accessor context2,
-    _i6.TopLevelVariable context1,
+    _i17.Accessor context2,
+    _i5.TopLevelVariable context1,
     _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
@@ -4592,8 +4509,8 @@ String __renderTopLevelProperty_partial_accessor_getter_8_partial_features_1(
 
 String
     __renderTopLevelProperty_partial_accessor_getter_8_partial_documentation_2(
-        _i16.Accessor context2,
-        _i6.TopLevelVariable context1,
+        _i17.Accessor context2,
+        _i5.TopLevelVariable context1,
         _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasDocumentation == true) {
@@ -4606,8 +4523,8 @@ String
 }
 
 String __renderTopLevelProperty_partial_accessor_getter_8_partial_source_code_3(
-    _i16.Accessor context2,
-    _i6.TopLevelVariable context1,
+    _i17.Accessor context2,
+    _i5.TopLevelVariable context1,
     _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasSourceCode == true) {
@@ -4628,7 +4545,7 @@ String __renderTopLevelProperty_partial_accessor_getter_8_partial_source_code_3(
 }
 
 String _renderTopLevelProperty_partial_accessor_setter_9(
-    _i6.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
+    _i5.TopLevelVariable context1, _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   var context2 = context1.setter;
   if (context2 != null) {
@@ -4659,8 +4576,8 @@ String _renderTopLevelProperty_partial_accessor_setter_9(
 
 String
     __renderTopLevelProperty_partial_accessor_setter_9_partial_name_summary_0(
-        _i16.Accessor context2,
-        _i6.TopLevelVariable context1,
+        _i17.Accessor context2,
+        _i5.TopLevelVariable context1,
         _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.isConst == true) {
@@ -4679,8 +4596,8 @@ String
 }
 
 String __renderTopLevelProperty_partial_accessor_setter_9_partial_features_1(
-    _i16.Accessor context2,
-    _i6.TopLevelVariable context1,
+    _i17.Accessor context2,
+    _i5.TopLevelVariable context1,
     _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasFeatures == true) {
@@ -4695,8 +4612,8 @@ String __renderTopLevelProperty_partial_accessor_setter_9_partial_features_1(
 
 String
     __renderTopLevelProperty_partial_accessor_setter_9_partial_documentation_2(
-        _i16.Accessor context2,
-        _i6.TopLevelVariable context1,
+        _i17.Accessor context2,
+        _i5.TopLevelVariable context1,
         _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasDocumentation == true) {
@@ -4709,8 +4626,8 @@ String
 }
 
 String __renderTopLevelProperty_partial_accessor_setter_9_partial_source_code_3(
-    _i16.Accessor context2,
-    _i6.TopLevelVariable context1,
+    _i17.Accessor context2,
+    _i5.TopLevelVariable context1,
     _i1.TopLevelPropertyTemplateData context0) {
   final buffer = StringBuffer();
   if (context2.hasSourceCode == true) {
@@ -4788,7 +4705,7 @@ String _renderTypedef_partial_head_0(_i1.TypedefTemplateData context0) {
 }
 
 String _renderTypedef_partial_source_link_1(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceHref == true) {
     buffer.writeln();
@@ -4803,7 +4720,7 @@ String _renderTypedef_partial_source_link_1(
 }
 
 String _renderTypedef_partial_categorization_2(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasCategoryNames == true) {
     buffer.writeln();
@@ -4823,7 +4740,7 @@ Categories:''');
 }
 
 String _renderTypedef_partial_feature_set_3(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasFeatureSet == true) {
     var context2 = context1.displayedLanguageFeatures;
@@ -4840,7 +4757,7 @@ String _renderTypedef_partial_feature_set_3(
 }
 
 String _renderTypedef_partial_typedef_multiline_4(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.isCallable == true) {
     var context2 = context1.asCallable;
@@ -4877,7 +4794,7 @@ String _renderTypedef_partial_typedef_multiline_4(
 }
 
 String __renderTypedef_partial_typedef_multiline_4_partial_type_multiline_0(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasAnnotations == true) {
     var context2 = context1.annotations;
@@ -4904,7 +4821,7 @@ String __renderTypedef_partial_typedef_multiline_4_partial_type_multiline_0(
 
 String
     ___renderTypedef_partial_typedef_multiline_4_partial_type_multiline_0_partial_name_summary_0(
-        _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+        _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.isConst == true) {
     buffer.write('''const ''');
@@ -4922,7 +4839,7 @@ String
 }
 
 String _renderTypedef_partial_documentation_5(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasDocumentation == true) {
     buffer.writeln();
@@ -4934,7 +4851,7 @@ String _renderTypedef_partial_documentation_5(
 }
 
 String _renderTypedef_partial_source_code_6(
-    _i8.Typedef context1, _i1.TypedefTemplateData context0) {
+    _i7.Typedef context1, _i1.TypedefTemplateData context0) {
   final buffer = StringBuffer();
   if (context1.hasSourceCode == true) {
     buffer.writeln();
@@ -4966,6 +4883,6 @@ String _renderTypedef_partial_footer_7(_i1.TypedefTemplateData context0) {
 
 extension on StringBuffer {
   void writeEscaped(String value) {
-    write(_i18.htmlEscape.convert(value));
+    write(_i19.htmlEscape.convert(value));
   }
 }
diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
index 10b1cced8b..770494cef7 100644
--- a/lib/src/generator/templates.runtime_renderers.dart
+++ b/lib/src/generator/templates.runtime_renderers.dart
@@ -1696,6 +1696,13 @@ class _Renderer_Class extends RendererBase<Class> {
                         parent: r);
                   },
                 ),
+                'hasModifiers': Property(
+                  getValue: (CT_ c) => c.hasModifiers,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasModifiers == true,
+                ),
                 'hasPublicMixedInTypes': Property(
                   getValue: (CT_ c) => c.hasPublicMixedInTypes,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -4284,7 +4291,20 @@ class _Renderer_Enum extends RendererBase<Enum> {
       _propertyMapCache.putIfAbsent(
           CT_,
           () => {
-                ..._Renderer_Class.propertyMap<CT_>(),
+                ..._Renderer_InheritingContainer.propertyMap<CT_>(),
+                'inheritanceChain': Property(
+                  getValue: (CT_ c) => c.inheritanceChain,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<InheritingContainer>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.inheritanceChain.map((e) =>
+                        _render_InheritingContainer(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
                 'kind': Property(
                   getValue: (CT_ c) => c.kind,
                   renderVariable:
@@ -4515,13 +4535,6 @@ class _Renderer_Extension extends RendererBase<Extension> {
                         parent: r);
                   },
                 ),
-                'hasPublicConstructors': Property(
-                  getValue: (CT_ c) => c.hasPublicConstructors,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasPublicConstructors == true,
-                ),
                 'href': Property(
                   getValue: (CT_ c) => c.href,
                   renderVariable:
@@ -4579,19 +4592,6 @@ class _Renderer_Extension extends RendererBase<Extension> {
                     _render_String(c.name, ast, r.template, sink, parent: r);
                   },
                 ),
-                'publicConstructorsSorted': Property(
-                  getValue: (CT_ c) => c.publicConstructorsSorted,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Constructor>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicConstructorsSorted.map((e) =>
-                        _render_Constructor(e, ast, r.template, sink,
-                            parent: r));
-                  },
-                ),
                 'referenceChildren': Property(
                   getValue: (CT_ c) => c.referenceChildren,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -13346,11 +13346,11 @@ class _Renderer_TopLevelContainer extends RendererBase<TopLevelContainer> {
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
                       self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<Class>'),
+                          c, remainingNames, 'Iterable<Container>'),
                   renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
                     return c.publicClassesSorted.map((e) =>
-                        _render_Class(e, ast, r.template, sink, parent: r));
+                        _render_Container(e, ast, r.template, sink, parent: r));
                   },
                 ),
                 'publicConstants': Property(
diff --git a/lib/src/model/class.dart b/lib/src/model/class.dart
index 265017c6a8..5b5c2a9770 100644
--- a/lib/src/model/class.dart
+++ b/lib/src/model/class.dart
@@ -214,13 +214,13 @@ class Class extends InheritingContainer with Constructable {
   @override
   String get kind => 'class';
 
+  List<InheritingContainer> _inheritanceChain;
+
   /// Not the same as superChain as it may include mixins.
   /// It's really not even the same as ordinary Dart inheritance, either,
   /// because we pretend that interfaces are part of the inheritance chain
   /// to include them in the set of things we might link to for documentation
   /// purposes in abstract classes.
-  List<InheritingContainer> _inheritanceChain;
-
   @override
   List<InheritingContainer> get inheritanceChain {
     if (_inheritanceChain == null) {
diff --git a/lib/src/model/enum.dart b/lib/src/model/enum.dart
index c6c6da6f85..bb9259a19a 100644
--- a/lib/src/model/enum.dart
+++ b/lib/src/model/enum.dart
@@ -7,10 +7,26 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/render/enum_field_renderer.dart';
 
-class Enum extends Class {
+class Enum extends InheritingContainer {
   Enum(ClassElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph);
 
+  List<InheritingContainer> _inheritanceChain;
+
+  @override
+  List<InheritingContainer> get inheritanceChain {
+    if (_inheritanceChain == null) {
+      _inheritanceChain = [];
+      _inheritanceChain.add(this);
+
+      for (var c
+          in superChain.map((e) => (e.modelElement as InheritingContainer))) {
+        _inheritanceChain.addAll(c.inheritanceChain);
+      }
+    }
+    return _inheritanceChain.toList(growable: false);
+  }
+
   @override
   String get kind => 'enum';
 }
@@ -64,7 +80,7 @@ class EnumField extends Field {
     assert(!(canonicalLibrary == null || canonicalEnclosingContainer == null));
     assert(canonicalLibrary == library);
     assert(canonicalEnclosingContainer == enclosingElement);
-    return '${package.baseHref}${enclosingElement.library.dirName}/${(enclosingElement as Class).fileName}';
+    return '${package.baseHref}${enclosingElement.library.dirName}/${enclosingElement.fileName}';
   }
 
   @override
diff --git a/lib/src/model/extension.dart b/lib/src/model/extension.dart
index fb01c511e7..8685b525be 100644
--- a/lib/src/model/extension.dart
+++ b/lib/src/model/extension.dart
@@ -127,10 +127,4 @@ class Extension extends Container implements EnclosedElement {
       ...super.referenceChildren,
     };
   }
-
-  @override
-  bool get hasPublicConstructors => false;
-
-  @override
-  Iterable<Constructor> get publicConstructorsSorted => [];
 }
diff --git a/lib/src/model/field.dart b/lib/src/model/field.dart
index b0ac5e6606..115a56d2ac 100644
--- a/lib/src/model/field.dart
+++ b/lib/src/model/field.dart
@@ -56,7 +56,7 @@ class Field extends ModelElement
   }
 
   @override
-  ModelElement get enclosingElement {
+  Container get enclosingElement {
     _enclosingContainer ??=
         ModelElement.from(field.enclosingElement, library, packageGraph);
     return _enclosingContainer;
diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
index bd6c1f1f58..fef44b9aaf 100644
--- a/lib/src/model/inheriting_container.dart
+++ b/lib/src/model/inheriting_container.dart
@@ -289,11 +289,9 @@ abstract class InheritingContainer extends Container
           // [packageGraph.specialClasses] is not available yet.
           bool _isDartCoreObject(ClassElement e) =>
               e.name == 'Object' && e.library.name == 'dart.core';
-          if (!(inheritanceChainElements
+          assert(inheritanceChainElements
                   .contains(imap[nameObj].enclosingElement) ||
-              _isDartCoreObject(imap[nameObj].enclosingElement))) {
-            print('wtf');
-          }
+              _isDartCoreObject(imap[nameObj].enclosingElement));
 
           // If the concrete object from [InheritanceManager3.getInheritedConcreteMap2]
           // is farther from this class in the inheritance chain than the one
diff --git a/lib/src/model/top_level_container.dart b/lib/src/model/top_level_container.dart
index 0f29d608cb..f383a198ed 100644
--- a/lib/src/model/top_level_container.dart
+++ b/lib/src/model/top_level_container.dart
@@ -51,7 +51,10 @@ abstract class TopLevelContainer implements Nameable {
   Iterable<Class> get publicClasses => model_utils.filterNonPublic(classes);
 
   List<Class> _publicClassesSorted;
-  Iterable<Class> get publicClassesSorted =>
+  // TODO(jcollins-g):  Setting this type parameter to `Container` magically
+  // fixes a number of type problems in the AOT compiler, but I am mystified as
+  // to why that should be the case.
+  Iterable<Container> get publicClassesSorted =>
       _publicClassesSorted ??= publicClasses.toList()..sort(byName);
 
   Iterable<Extension> get publicExtensions =>
diff --git a/lib/templates/html/_class.html b/lib/templates/html/_container.html
similarity index 100%
rename from lib/templates/html/_class.html
rename to lib/templates/html/_container.html
diff --git a/lib/templates/html/_mixin.html b/lib/templates/html/_mixin.html
deleted file mode 100644
index 08ffcf2436..0000000000
--- a/lib/templates/html/_mixin.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<dt id="{{htmlId}}">
-  <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}{{{linkedGenericParameters}}}</span> {{>categorization}}
-</dt>
-<dd>
-  {{{ oneLineDoc }}} {{{ extendedDocLink }}}
-</dd>
diff --git a/lib/templates/html/category.html b/lib/templates/html/category.html
index a6fa813ddc..297da5031a 100644
--- a/lib/templates/html/category.html
+++ b/lib/templates/html/category.html
@@ -23,7 +23,7 @@ <h2>Classes</h2>
 
     <dl>
       {{#publicClassesSorted}}
-      {{>class}}
+      {{>container}}
       {{/publicClassesSorted}}
     </dl>
   </section>
@@ -35,7 +35,7 @@ <h2>Mixins</h2>
 
     <dl>
       {{#publicMixinsSorted}}
-      {{>mixin}}
+      {{>container}}
       {{/publicMixinsSorted}}
     </dl>
   </section>
@@ -83,7 +83,7 @@ <h2>Enums</h2>
 
     <dl>
       {{#publicEnumsSorted}}
-      {{>class}}
+      {{>container}}
       {{/publicEnumsSorted}}
     </dl>
   </section>
@@ -107,7 +107,7 @@ <h2>Exceptions / Errors</h2>
 
     <dl>
       {{#publicExceptionsSorted}}
-      {{>class}}
+      {{>container}}
       {{/publicExceptionsSorted}}
     </dl>
   </section>
diff --git a/lib/templates/html/enum.html b/lib/templates/html/enum.html
index a229471674..c463b0fd9d 100644
--- a/lib/templates/html/enum.html
+++ b/lib/templates/html/enum.html
@@ -33,15 +33,6 @@
         </dd>
         {{/hasPublicInterfaces}}
 
-        {{#hasPublicMixedInTypes}}
-        <dt>Mixed in types</dt>
-        <dd><ul class="comma-separated eNum-relationships">
-          {{#publicMixedInTypes}}
-          <li>{{{linkedName}}}</li>
-          {{/publicMixedInTypes}}
-        </ul></dd>
-        {{/hasPublicMixedInTypes}}
-
         {{#hasPublicImplementors}}
         <dt>Implementers</dt>
         <dd><ul class="comma-separated eNum-relationships">
@@ -75,29 +66,6 @@ <h2>Constants</h2>
     </section>
     {{/hasPublicConstantFields}}
 
-    {{#hasPublicConstructors}}
-    <section class="summary offset-anchor" id="constructors">
-      <h2>Constructors</h2>
-
-      <dl class="constructor-summary-list">
-        {{#publicConstructorsSorted}}
-        <dt id="{{htmlId}}" class="callable">
-          <span class="name">{{{linkedName}}}</span><span class="signature">({{{ linkedParams }}})</span>
-        </dt>
-        <dd>
-          {{{ oneLineDoc }}} {{{ extendedDocLink }}}
-          {{#isConst}}
-          <div class="constructor-modifier features">const</div>
-          {{/isConst}}
-          {{#isFactory}}
-          <div class="constructor-modifier features">factory</div>
-          {{/isFactory}}
-        </dd>
-        {{/publicConstructorsSorted}}
-      </dl>
-    </section>
-    {{/hasPublicConstructors}}
-
     {{#hasPublicInstanceFields}}
     <section class="summary offset-anchor{{ #publicInheritedInstanceFields }} inherited{{ /publicInheritedInstanceFields }}" id="instance-properties">
       <h2>Properties</h2>
diff --git a/lib/templates/html/library.html b/lib/templates/html/library.html
index 831fb2ddd4..6773c3395b 100644
--- a/lib/templates/html/library.html
+++ b/lib/templates/html/library.html
@@ -15,7 +15,7 @@ <h2>Classes</h2>
 
       <dl>
         {{#library.publicClassesSorted}}
-        {{>class}}
+        {{>container}}
         {{/library.publicClassesSorted}}
       </dl>
     </section>
@@ -27,7 +27,7 @@ <h2>Mixins</h2>
 
       <dl>
         {{#library.publicMixinsSorted}}
-        {{>mixin}}
+        {{>container}}
         {{/library.publicMixinsSorted}}
       </dl>
     </section>
@@ -87,7 +87,7 @@ <h2>Enums</h2>
 
       <dl>
         {{#library.publicEnumsSorted}}
-        {{>class}}
+        {{>container}}
         {{/library.publicEnumsSorted}}
       </dl>
     </section>
@@ -111,7 +111,7 @@ <h2>Exceptions / Errors</h2>
 
       <dl>
         {{#library.publicExceptionsSorted}}
-        {{>class}}
+        {{>container}}
         {{/library.publicExceptionsSorted}}
       </dl>
     </section>
diff --git a/lib/templates/md/_class.md b/lib/templates/md/_container.md
similarity index 100%
rename from lib/templates/md/_class.md
rename to lib/templates/md/_container.md
diff --git a/lib/templates/md/category.md b/lib/templates/md/category.md
index aadf6c677a..c0919fab55 100644
--- a/lib/templates/md/category.md
+++ b/lib/templates/md/category.md
@@ -18,7 +18,7 @@
 ## Classes
 
 {{#publicClassesSorted}}
-{{>class}}
+{{>container}}
 
 {{/publicClassesSorted}}
 {{/hasPublicClasses}}
@@ -27,7 +27,7 @@
 ## Mixins
 
 {{#publicMixinsSorted}}
-{{>mixin}}
+{{>container}}
 
 {{/publicMixinsSorted}}
 {{/hasPublicMixins}}
@@ -63,7 +63,7 @@
 ## Enums
 
 {{#publicEnumsSorted}}
-{{>class}}
+{{>container}}
 
 {{/publicEnumsSorted}}
 {{/hasPublicEnums}}
@@ -81,7 +81,7 @@
 ## Exceptions / Errors
 
 {{#publicExceptionsSorted}}
-{{>class}}
+{{>container}}
 
 {{/publicExceptionsSorted}}
 {{/hasPublicExceptions}}
diff --git a/lib/templates/md/enum.md b/lib/templates/md/enum.md
index 44951dedc3..0e8e097606 100644
--- a/lib/templates/md/enum.md
+++ b/lib/templates/md/enum.md
@@ -29,14 +29,6 @@
 {{/publicInterfaces}}
 {{/hasPublicInterfaces}}
 
-{{#hasPublicMixedInTypes}}
-**Mixed in types**
-
-{{#publicMixedInTypes}}
-- {{{linkedName}}}
-{{/publicMixedInTypes}}
-{{/hasPublicMixedInTypes}}
-
 {{#hasPublicImplementors}}
 **Implementers**
 
@@ -63,18 +55,6 @@
 {{/publicConstantFieldsSorted}}
 {{/hasPublicConstantFields}}
 
-{{#hasPublicConstructors}}
-## Constructors
-
-{{#publicConstructorsSorted}}
-{{{linkedName}}}({{{ linkedParams }}})
-
-{{{ oneLineDoc }}} {{{ extendedDocLink }}}  {{!two spaces intentional}}
-{{#isConst}}_const_{{/isConst}} {{#isFactory}}_factory_{{/isFactory}}
-
-{{/publicConstructorsSorted}}
-{{/hasPublicConstructors}}
-
 {{#hasPublicInstanceFields}}
 ## Properties
 
diff --git a/lib/templates/md/library.md b/lib/templates/md/library.md
index eb0fe60236..0d4cee06a4 100644
--- a/lib/templates/md/library.md
+++ b/lib/templates/md/library.md
@@ -16,7 +16,7 @@
 ## Classes
 
 {{#library.publicClassesSorted}}
-{{>class}}
+{{>container}}
 
 {{/library.publicClassesSorted}}
 {{/library.hasPublicClasses}}
@@ -70,7 +70,7 @@
 ## Enums
 
 {{#library.publicEnumsSorted}}
-{{>class}}
+{{>container}}
 
 {{/library.publicEnumsSorted}}
 {{/library.hasPublicEnums}}
@@ -88,7 +88,7 @@
 ## Exceptions / Errors
 
 {{#library.publicExceptionsSorted}}
-{{>class}}
+{{>container}}
 
 {{/library.publicExceptionsSorted}}
 {{/library.hasPublicExceptions}}

From 8c0a5fce49ced308bd98671e73390ee7d023d891 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 2 Sep 2021 11:55:05 -0700
Subject: [PATCH 04/19] almost.  something wrong with mustachio rendering

---
 .../templates.aot_renderers_for_html.dart     |  98 ++---
 .../templates.aot_renderers_for_md.dart       |  88 ++---
 lib/src/generator/templates.dart              |   4 +
 .../templates.runtime_renderers.dart          | 358 +++++++++++-------
 lib/src/model/class.dart                      | 141 +------
 lib/src/model/inheriting_container.dart       | 245 +++++++++---
 lib/src/model/mixin.dart                      |  27 +-
 lib/src/model/package_graph.dart              |  12 +-
 lib/src/model_utils.dart                      |  11 +-
 lib/templates/html/enum.html                  |  20 -
 lib/templates/md/enum.md                      |  16 -
 test/end2end/model_test.dart                  |  24 ++
 testing/test_package/lib/fake.dart            |  11 +
 13 files changed, 547 insertions(+), 508 deletions(-)

diff --git a/lib/src/generator/templates.aot_renderers_for_html.dart b/lib/src/generator/templates.aot_renderers_for_html.dart
index 9a94f2a720..1dcabf64ff 100644
--- a/lib/src/generator/templates.aot_renderers_for_html.dart
+++ b/lib/src/generator/templates.aot_renderers_for_html.dart
@@ -2829,60 +2829,18 @@ String renderEnum(_i1.EnumTemplateData context0) {
         </ul></dd>''');
       }
       buffer.writeln();
-      if (context2.hasPublicInterfaces == true) {
-        buffer.writeln();
-        buffer.write('''
-        <dt>Implemented types</dt>
-        <dd>
-          <ul class="comma-separated eNum-relationships">''');
-        var context5 = context2.publicInterfaces;
-        if (context5 != null) {
-          for (var context6 in context5) {
-            buffer.writeln();
-            buffer.write('''
-            <li>''');
-            buffer.write(context6.linkedName.toString());
-            buffer.write('''</li>''');
-          }
-        }
-        buffer.writeln();
-        buffer.write('''
-          </ul>
-        </dd>''');
-      }
-      buffer.writeln();
-      if (context2.hasPublicImplementors == true) {
-        buffer.writeln();
-        buffer.write('''
-        <dt>Implementers</dt>
-        <dd><ul class="comma-separated eNum-relationships">''');
-        var context7 = context2.publicImplementorsSorted;
-        if (context7 != null) {
-          for (var context8 in context7) {
-            buffer.writeln();
-            buffer.write('''
-          <li>''');
-            buffer.write(context8.linkedName.toString());
-            buffer.write('''</li>''');
-          }
-        }
-        buffer.writeln();
-        buffer.write('''
-        </ul></dd>''');
-      }
-      buffer.writeln();
       if (context2.hasAnnotations == true) {
         buffer.writeln();
         buffer.write('''
         <dt>Annotations</dt>
         <dd><ul class="annotation-list eNum-relationships">''');
-        var context9 = context2.annotations;
-        if (context9 != null) {
-          for (var context10 in context9) {
+        var context5 = context2.annotations;
+        if (context5 != null) {
+          for (var context6 in context5) {
             buffer.writeln();
             buffer.write('''
           <li>''');
-            buffer.write(context10.linkedNameWithParameters.toString());
+            buffer.write(context6.linkedNameWithParameters.toString());
             buffer.write('''</li>''');
           }
         }
@@ -2903,12 +2861,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       <h2>Constants</h2>
 
       <dl class="properties">''');
-      var context11 = context2.publicConstantFieldsSorted;
-      if (context11 != null) {
-        for (var context12 in context11) {
+      var context7 = context2.publicConstantFieldsSorted;
+      if (context7 != null) {
+        for (var context8 in context7) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_constant_5(context12, context2, context0));
+              _renderEnum_partial_constant_5(context8, context2, context0));
         }
       }
       buffer.writeln();
@@ -2928,12 +2886,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       <h2>Properties</h2>
 
       <dl class="properties">''');
-      var context13 = context2.publicInstanceFieldsSorted;
-      if (context13 != null) {
-        for (var context14 in context13) {
+      var context9 = context2.publicInstanceFieldsSorted;
+      if (context9 != null) {
+        for (var context10 in context9) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_property_6(context14, context2, context0));
+              _renderEnum_partial_property_6(context10, context2, context0));
         }
       }
       buffer.writeln();
@@ -2952,12 +2910,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''" id="instance-methods">
       <h2>Methods</h2>
       <dl class="callables">''');
-      var context15 = context2.publicInstanceMethodsSorted;
-      if (context15 != null) {
-        for (var context16 in context15) {
+      var context11 = context2.publicInstanceMethodsSorted;
+      if (context11 != null) {
+        for (var context12 in context11) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_callable_7(context16, context2, context0));
+              _renderEnum_partial_callable_7(context12, context2, context0));
         }
       }
       buffer.writeln();
@@ -2976,12 +2934,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''" id="operators">
       <h2>Operators</h2>
       <dl class="callables">''');
-      var context17 = context2.publicInstanceOperatorsSorted;
-      if (context17 != null) {
-        for (var context18 in context17) {
+      var context13 = context2.publicInstanceOperatorsSorted;
+      if (context13 != null) {
+        for (var context14 in context13) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_callable_7(context18, context2, context0));
+              _renderEnum_partial_callable_7(context14, context2, context0));
         }
       }
       buffer.writeln();
@@ -2997,12 +2955,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       <h2>Static Properties</h2>
 
       <dl class="properties">''');
-      var context19 = context2.publicVariableStaticFieldsSorted;
-      if (context19 != null) {
-        for (var context20 in context19) {
+      var context15 = context2.publicVariableStaticFieldsSorted;
+      if (context15 != null) {
+        for (var context16 in context15) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_property_6(context20, context2, context0));
+              _renderEnum_partial_property_6(context16, context2, context0));
         }
       }
       buffer.writeln();
@@ -3017,12 +2975,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
     <section class="summary offset-anchor" id="static-methods">
       <h2>Static Methods</h2>
       <dl class="callables">''');
-      var context21 = context2.publicStaticMethodsSorted;
-      if (context21 != null) {
-        for (var context22 in context21) {
+      var context17 = context2.publicStaticMethodsSorted;
+      if (context17 != null) {
+        for (var context18 in context17) {
           buffer.write('\n        ');
           buffer.write(
-              _renderEnum_partial_callable_7(context22, context2, context0));
+              _renderEnum_partial_callable_7(context18, context2, context0));
         }
       }
       buffer.writeln();
diff --git a/lib/src/generator/templates.aot_renderers_for_md.dart b/lib/src/generator/templates.aot_renderers_for_md.dart
index ccce14888e..453fa71caf 100644
--- a/lib/src/generator/templates.aot_renderers_for_md.dart
+++ b/lib/src/generator/templates.aot_renderers_for_md.dart
@@ -1313,50 +1313,18 @@ String renderEnum(_i1.EnumTemplateData context0) {
         buffer.write(context2.name.toString());
       }
       buffer.writeln();
-      if (context2.hasPublicInterfaces == true) {
-        buffer.writeln();
-        buffer.write('''
-**Implemented types**
-''');
-        var context5 = context2.publicInterfaces;
-        if (context5 != null) {
-          for (var context6 in context5) {
-            buffer.writeln();
-            buffer.write('''
-- ''');
-            buffer.write(context6.linkedName.toString());
-          }
-        }
-      }
-      buffer.writeln();
-      if (context2.hasPublicImplementors == true) {
-        buffer.writeln();
-        buffer.write('''
-**Implementers**
-''');
-        var context7 = context2.publicImplementorsSorted;
-        if (context7 != null) {
-          for (var context8 in context7) {
-            buffer.writeln();
-            buffer.write('''
-- ''');
-            buffer.write(context8.linkedName.toString());
-          }
-        }
-      }
-      buffer.writeln();
       if (context2.hasAnnotations == true) {
         buffer.writeln();
         buffer.write('''
 **Annotations**
 ''');
-        var context9 = context2.annotations;
-        if (context9 != null) {
-          for (var context10 in context9) {
+        var context5 = context2.annotations;
+        if (context5 != null) {
+          for (var context6 in context5) {
             buffer.writeln();
             buffer.write('''
 - ''');
-            buffer.write(context10.linkedNameWithParameters.toString());
+            buffer.write(context6.linkedNameWithParameters.toString());
           }
         }
       }
@@ -1367,12 +1335,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Constants
 ''');
-      var context11 = context2.publicConstantFieldsSorted;
-      if (context11 != null) {
-        for (var context12 in context11) {
+      var context7 = context2.publicConstantFieldsSorted;
+      if (context7 != null) {
+        for (var context8 in context7) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_constant_4(context12, context2, context0));
+              _renderEnum_partial_constant_4(context8, context2, context0));
           buffer.writeln();
         }
       }
@@ -1383,12 +1351,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Properties
 ''');
-      var context13 = context2.publicInstanceFieldsSorted;
-      if (context13 != null) {
-        for (var context14 in context13) {
+      var context9 = context2.publicInstanceFieldsSorted;
+      if (context9 != null) {
+        for (var context10 in context9) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_property_5(context14, context2, context0));
+              _renderEnum_partial_property_5(context10, context2, context0));
           buffer.writeln();
         }
       }
@@ -1399,12 +1367,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Methods
 ''');
-      var context15 = context2.publicInstanceMethodsSorted;
-      if (context15 != null) {
-        for (var context16 in context15) {
+      var context11 = context2.publicInstanceMethodsSorted;
+      if (context11 != null) {
+        for (var context12 in context11) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_callable_6(context16, context2, context0));
+              _renderEnum_partial_callable_6(context12, context2, context0));
           buffer.writeln();
         }
       }
@@ -1415,12 +1383,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Operators
 ''');
-      var context17 = context2.publicInstanceOperatorsSorted;
-      if (context17 != null) {
-        for (var context18 in context17) {
+      var context13 = context2.publicInstanceOperatorsSorted;
+      if (context13 != null) {
+        for (var context14 in context13) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_callable_6(context18, context2, context0));
+              _renderEnum_partial_callable_6(context14, context2, context0));
           buffer.writeln();
         }
       }
@@ -1431,12 +1399,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Static Properties
 ''');
-      var context19 = context2.publicVariableStaticFieldsSorted;
-      if (context19 != null) {
-        for (var context20 in context19) {
+      var context15 = context2.publicVariableStaticFieldsSorted;
+      if (context15 != null) {
+        for (var context16 in context15) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_property_5(context20, context2, context0));
+              _renderEnum_partial_property_5(context16, context2, context0));
           buffer.writeln();
         }
       }
@@ -1447,12 +1415,12 @@ String renderEnum(_i1.EnumTemplateData context0) {
       buffer.write('''
 ## Static Methods
 ''');
-      var context21 = context2.publicStaticMethodsSorted;
-      if (context21 != null) {
-        for (var context22 in context21) {
+      var context17 = context2.publicStaticMethodsSorted;
+      if (context17 != null) {
+        for (var context18 in context17) {
           buffer.writeln();
           buffer.write(
-              _renderEnum_partial_callable_6(context22, context2, context0));
+              _renderEnum_partial_callable_6(context18, context2, context0));
           buffer.writeln();
         }
       }
diff --git a/lib/src/generator/templates.dart b/lib/src/generator/templates.dart
index 7c04f098bb..4a53662b7e 100644
--- a/lib/src/generator/templates.dart
+++ b/lib/src/generator/templates.dart
@@ -50,6 +50,7 @@ const _visibleTypes = {
   Category,
   Class,
   Constructor,
+  Constructable,
   DefinedElementType,
   Documentable,
   ElementType,
@@ -57,15 +58,18 @@ const _visibleTypes = {
   Extension,
   FeatureSet,
   FunctionTypeElementType,
+  InheritingContainer,
   LanguageFeature,
   Library,
   LibraryContainer,
   Method,
+  MixedInTypes,
   ModelElement,
   Package,
   // For getters like `isNotEmpty`; perhaps a smell, but currently in use.
   String,
   TopLevelVariable,
+  TypeInterfaces,
   TypeParameter,
 };
 
diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
index 770494cef7..d6c1786270 100644
--- a/lib/src/generator/templates.runtime_renderers.dart
+++ b/lib/src/generator/templates.runtime_renderers.dart
@@ -1577,6 +1577,8 @@ class _Renderer_Class extends RendererBase<Class> {
           () => {
                 ..._Renderer_InheritingContainer.propertyMap<CT_>(),
                 ..._Renderer_Constructable.propertyMap<CT_>(),
+                ..._Renderer_TypeInterfaces.propertyMap<CT_>(),
+                ..._Renderer_MixedInTypes.propertyMap<CT_>(),
                 'allModelElements': Property(
                   getValue: (CT_ c) => c.allModelElements,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -1696,20 +1698,6 @@ class _Renderer_Class extends RendererBase<Class> {
                         parent: r);
                   },
                 ),
-                'hasModifiers': Property(
-                  getValue: (CT_ c) => c.hasModifiers,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasModifiers == true,
-                ),
-                'hasPublicMixedInTypes': Property(
-                  getValue: (CT_ c) => c.hasPublicMixedInTypes,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasPublicMixedInTypes == true,
-                ),
                 'href': Property(
                   getValue: (CT_ c) => c.href,
                   renderVariable:
@@ -1754,19 +1742,6 @@ class _Renderer_Class extends RendererBase<Class> {
                         _render_Field(e, ast, r.template, sink, parent: r));
                   },
                 ),
-                'interfaces': Property(
-                  getValue: (CT_ c) => c.interfaces,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'List<DefinedElementType>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.interfaces.map((e) => _render_DefinedElementType(
-                        e, ast, r.template, sink,
-                        parent: r));
-                  },
-                ),
                 'isAbstract': Property(
                   getValue: (CT_ c) => c.isAbstract,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -1807,19 +1782,6 @@ class _Renderer_Class extends RendererBase<Class> {
                     _render_String(c.kind, ast, r.template, sink, parent: r);
                   },
                 ),
-                'mixedInTypes': Property(
-                  getValue: (CT_ c) => c.mixedInTypes,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'List<DefinedElementType>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.mixedInTypes.map((e) => _render_DefinedElementType(
-                        e, ast, r.template, sink,
-                        parent: r));
-                  },
-                ),
                 'publicInheritedInstanceFields': Property(
                   getValue: (CT_ c) => c.publicInheritedInstanceFields,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -1827,32 +1789,6 @@ class _Renderer_Class extends RendererBase<Class> {
                       self.renderSimpleVariable(c, remainingNames, 'bool'),
                   getBool: (CT_ c) => c.publicInheritedInstanceFields == true,
                 ),
-                'publicInterfaces': Property(
-                  getValue: (CT_ c) => c.publicInterfaces,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<DefinedElementType>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicInterfaces.map((e) =>
-                        _render_DefinedElementType(e, ast, r.template, sink,
-                            parent: r));
-                  },
-                ),
-                'publicMixedInTypes': Property(
-                  getValue: (CT_ c) => c.publicMixedInTypes,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<DefinedElementType>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicMixedInTypes.map((e) =>
-                        _render_DefinedElementType(e, ast, r.template, sink,
-                            parent: r));
-                  },
-                ),
               });
 
   _Renderer_Class(Class context, RendererBase<Object> parent, Template template,
@@ -5220,15 +5156,14 @@ class _Renderer_Field extends RendererBase<Field> {
                     }
                     var name = remainingNames.first;
                     var nextProperty =
-                        _Renderer_ModelElement.propertyMap().getValue(name);
+                        _Renderer_Container.propertyMap().getValue(name);
                     return nextProperty.renderVariable(self.getValue(c),
                         nextProperty, [...remainingNames.skip(1)]);
                   },
                   isNullValue: (CT_ c) => c.enclosingElement == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    _render_ModelElement(
-                        c.enclosingElement, ast, r.template, sink,
+                    _render_Container(c.enclosingElement, ast, r.template, sink,
                         parent: r);
                   },
                 ),
@@ -5707,33 +5642,46 @@ void _render_FunctionTypedef(FunctionTypedef context, List<MustachioNode> ast,
 
 class _Renderer_FunctionTypedef extends RendererBase<FunctionTypedef> {
   static final Map<Type, Object> _propertyMapCache = {};
-  static Map<String, Property<CT_>>
-      propertyMap<CT_ extends FunctionTypedef>() =>
-          _propertyMapCache.putIfAbsent(
-              CT_,
-              () => {
-                    ..._Renderer_Typedef.propertyMap<CT_>(),
-                    'modelType': Property(
-                      getValue: (CT_ c) => c.modelType,
-                      renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) {
-                        if (remainingNames.isEmpty) {
-                          return self.getValue(c).toString();
-                        }
-                        var name = remainingNames.first;
-                        var nextProperty =
-                            _Renderer_Callable.propertyMap().getValue(name);
-                        return nextProperty.renderVariable(self.getValue(c),
-                            nextProperty, [...remainingNames.skip(1)]);
-                      },
-                      isNullValue: (CT_ c) => c.modelType == null,
-                      renderValue: (CT_ c, RendererBase<CT_> r,
-                          List<MustachioNode> ast, StringSink sink) {
-                        _render_Callable(c.modelType, ast, r.template, sink,
-                            parent: r);
-                      },
-                    ),
-                  });
+  static Map<String, Property<CT_>> propertyMap<
+          CT_ extends FunctionTypedef>() =>
+      _propertyMapCache.putIfAbsent(
+          CT_,
+          () => {
+                ..._Renderer_Typedef.propertyMap<CT_>(),
+                'modelType': Property(
+                  getValue: (CT_ c) => c.modelType,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_Callable.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.modelType == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    _render_Callable(c.modelType, ast, r.template, sink,
+                        parent: r);
+                  },
+                ),
+                'referenceChildren': Property(
+                  getValue: (CT_ c) => c.referenceChildren,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Map<String, CommentReferable>'),
+                  isNullValue: (CT_ c) => c.referenceChildren == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(c.referenceChildren, ast, r.template, sink,
+                        parent: r, getters: _invisibleGetters['Map']);
+                  },
+                ),
+              });
 
   _Renderer_FunctionTypedef(FunctionTypedef context,
       RendererBase<Object> parent, Template template, StringSink sink)
@@ -6586,13 +6534,6 @@ class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
                       self.renderSimpleVariable(c, remainingNames, 'bool'),
                   getBool: (CT_ c) => c.hasModifiers == true,
                 ),
-                'hasPublicImplementors': Property(
-                  getValue: (CT_ c) => c.hasPublicImplementors,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasPublicImplementors == true,
-                ),
                 'hasPublicInheritedMethods': Property(
                   getValue: (CT_ c) => c.hasPublicInheritedMethods,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -6600,13 +6541,6 @@ class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
                       self.renderSimpleVariable(c, remainingNames, 'bool'),
                   getBool: (CT_ c) => c.hasPublicInheritedMethods == true,
                 ),
-                'hasPublicInterfaces': Property(
-                  getValue: (CT_ c) => c.hasPublicInterfaces,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasPublicInterfaces == true,
-                ),
                 'hasPublicSuperChainReversed': Property(
                   getValue: (CT_ c) => c.hasPublicSuperChainReversed,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -6747,32 +6681,6 @@ class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
                         parent: r);
                   },
                 ),
-                'publicImplementors': Property(
-                  getValue: (CT_ c) => c.publicImplementors,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<InheritingContainer>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicImplementors.map((e) =>
-                        _render_InheritingContainer(e, ast, r.template, sink,
-                            parent: r));
-                  },
-                ),
-                'publicImplementorsSorted': Property(
-                  getValue: (CT_ c) => c.publicImplementorsSorted,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<InheritingContainer>'),
-                  renderIterable: (CT_ c, RendererBase<CT_> r,
-                      List<MustachioNode> ast, StringSink sink) {
-                    return c.publicImplementorsSorted.map((e) =>
-                        _render_InheritingContainer(e, ast, r.template, sink,
-                            parent: r));
-                  },
-                ),
                 'publicInheritedFields': Property(
                   getValue: (CT_ c) => c.publicInheritedFields,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -9066,6 +8974,68 @@ class _Renderer_MethodTemplateData extends RendererBase<MethodTemplateData> {
   }
 }
 
+class _Renderer_MixedInTypes extends RendererBase<MixedInTypes> {
+  static final Map<Type, Object> _propertyMapCache = {};
+  static Map<String, Property<CT_>> propertyMap<CT_ extends MixedInTypes>() =>
+      _propertyMapCache.putIfAbsent(
+          CT_,
+          () => {
+                'hasModifiers': Property(
+                  getValue: (CT_ c) => c.hasModifiers,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasModifiers == true,
+                ),
+                'hasPublicMixedInTypes': Property(
+                  getValue: (CT_ c) => c.hasPublicMixedInTypes,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasPublicMixedInTypes == true,
+                ),
+                'mixedInTypes': Property(
+                  getValue: (CT_ c) => c.mixedInTypes,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<DefinedElementType>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.mixedInTypes.map((e) => _render_DefinedElementType(
+                        e, ast, r.template, sink,
+                        parent: r));
+                  },
+                ),
+                'publicMixedInTypes': Property(
+                  getValue: (CT_ c) => c.publicMixedInTypes,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<DefinedElementType>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicMixedInTypes.map((e) =>
+                        _render_DefinedElementType(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+              });
+
+  _Renderer_MixedInTypes(MixedInTypes context, RendererBase<Object> parent,
+      Template template, StringSink sink)
+      : super(context, parent, template, sink);
+
+  @override
+  Property<MixedInTypes> getProperty(String key) {
+    if (propertyMap<MixedInTypes>().containsKey(key)) {
+      return propertyMap<MixedInTypes>()[key];
+    } else {
+      return null;
+    }
+  }
+}
+
 void _render_Mixin(
     Mixin context, List<MustachioNode> ast, Template template, StringSink sink,
     {RendererBase<Object> parent}) {
@@ -9080,6 +9050,7 @@ class _Renderer_Mixin extends RendererBase<Mixin> {
           CT_,
           () => {
                 ..._Renderer_InheritingContainer.propertyMap<CT_>(),
+                ..._Renderer_TypeInterfaces.propertyMap<CT_>(),
                 'fileName': Property(
                   getValue: (CT_ c) => c.fileName,
                   renderVariable:
@@ -14038,6 +14009,121 @@ class _Renderer_TopLevelVariable extends RendererBase<TopLevelVariable> {
   }
 }
 
+void _render_TypeInterfaces(TypeInterfaces context, List<MustachioNode> ast,
+    Template template, StringSink sink,
+    {RendererBase<Object> parent}) {
+  var renderer = _Renderer_TypeInterfaces(context, parent, template, sink);
+  renderer.renderBlock(ast);
+}
+
+class _Renderer_TypeInterfaces extends RendererBase<TypeInterfaces> {
+  static final Map<Type, Object> _propertyMapCache = {};
+  static Map<String, Property<CT_>> propertyMap<CT_ extends TypeInterfaces>() =>
+      _propertyMapCache.putIfAbsent(
+          CT_,
+          () => {
+                'directInterfaces': Property(
+                  getValue: (CT_ c) => c.directInterfaces,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<DefinedElementType>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.directInterfaces.map((e) =>
+                        _render_DefinedElementType(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+                'hasModifiers': Property(
+                  getValue: (CT_ c) => c.hasModifiers,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasModifiers == true,
+                ),
+                'hasPublicImplementors': Property(
+                  getValue: (CT_ c) => c.hasPublicImplementors,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasPublicImplementors == true,
+                ),
+                'hasPublicInterfaces': Property(
+                  getValue: (CT_ c) => c.hasPublicInterfaces,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(c, remainingNames, 'bool'),
+                  getBool: (CT_ c) => c.hasPublicInterfaces == true,
+                ),
+                'interfaces': Property(
+                  getValue: (CT_ c) => c.interfaces,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'List<DefinedElementType>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.interfaces.map((e) => _render_DefinedElementType(
+                        e, ast, r.template, sink,
+                        parent: r));
+                  },
+                ),
+                'publicImplementors': Property(
+                  getValue: (CT_ c) => c.publicImplementors,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<TypeInterfaces>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicImplementors.map((e) =>
+                        _render_TypeInterfaces(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+                'publicImplementorsSorted': Property(
+                  getValue: (CT_ c) => c.publicImplementorsSorted,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<TypeInterfaces>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicImplementorsSorted.map((e) =>
+                        _render_TypeInterfaces(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+                'publicInterfaces': Property(
+                  getValue: (CT_ c) => c.publicInterfaces,
+                  renderVariable: (CT_ c, Property<CT_> self,
+                          List<String> remainingNames) =>
+                      self.renderSimpleVariable(
+                          c, remainingNames, 'Iterable<DefinedElementType>'),
+                  renderIterable: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    return c.publicInterfaces.map((e) =>
+                        _render_DefinedElementType(e, ast, r.template, sink,
+                            parent: r));
+                  },
+                ),
+              });
+
+  _Renderer_TypeInterfaces(TypeInterfaces context, RendererBase<Object> parent,
+      Template template, StringSink sink)
+      : super(context, parent, template, sink);
+
+  @override
+  Property<TypeInterfaces> getProperty(String key) {
+    if (propertyMap<TypeInterfaces>().containsKey(key)) {
+      return propertyMap<TypeInterfaces>()[key];
+    } else {
+      return null;
+    }
+  }
+}
+
 void _render_TypeParameter(TypeParameter context, List<MustachioNode> ast,
     Template template, StringSink sink,
     {RendererBase<Object> parent}) {
diff --git a/lib/src/model/class.dart b/lib/src/model/class.dart
index 5b5c2a9770..a457483327 100644
--- a/lib/src/model/class.dart
+++ b/lib/src/model/class.dart
@@ -3,84 +3,11 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/element.dart';
-import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/inheriting_container.dart';
 import 'package:dartdoc/src/model/model.dart';
-import 'package:dartdoc/src/model_utils.dart' as model_utils;
-import 'package:meta/meta.dart';
 
 import 'comment_referable.dart';
 
-/// An mixin to build an [InheritingContainer] capable of being constructed
-/// with a direct call to a [Constructor] in Dart.
-mixin Constructable on InheritingContainer {
-  Iterable<Constructor> get constructors => element.constructors
-      .map((e) => ModelElement.from(e, library, packageGraph) as Constructor);
-
-  @override
-  bool get hasPublicConstructors => publicConstructors.isNotEmpty;
-
-  @visibleForTesting
-  Iterable<Constructor> get publicConstructors =>
-      model_utils.filterNonPublic(constructors);
-
-  List<Constructor> _publicConstructorsSorted;
-
-  @override
-  Iterable<Constructor> get publicConstructorsSorted =>
-      _publicConstructorsSorted ??= publicConstructors.toList()..sort(byName);
-
-  Constructor _unnamedConstructor;
-  Constructor get unnamedConstructor {
-    _unnamedConstructor ??= constructors
-        .firstWhere((c) => c.isUnnamedConstructor, orElse: () => null);
-    return _unnamedConstructor;
-  }
-
-  Constructor _defaultConstructor;
-
-  /// With constructor tearoffs, this is no longer equivalent to the unnamed
-  /// constructor and assumptions based on that are incorrect.
-  Constructor get defaultConstructor {
-    _defaultConstructor ??= unnamedConstructor ??
-        constructors.firstWhere((c) => c.isDefaultConstructor);
-    return _defaultConstructor;
-  }
-
-  static Iterable<MapEntry<String, CommentReferable>> _constructorGenerator(
-      Iterable<Constructor> source) sync* {
-    for (var constructor in source) {
-      yield MapEntry(constructor.referenceName, constructor);
-      yield MapEntry(
-          '${constructor.enclosingElement.referenceName}.${constructor.referenceName}',
-          constructor);
-      if (constructor.isDefaultConstructor) {
-        yield MapEntry('new', constructor);
-      }
-    }
-  }
-
-  @override
-  Iterable<MapEntry<String, CommentReferable>>
-      get extraReferenceChildren sync* {
-    yield* _constructorGenerator(constructors);
-    // TODO(jcollins-g): wean important users off of relying on static method
-    // inheritance (dart-lang/dartdoc#2698)
-    for (var container
-        in publicSuperChain.map((t) => t.modelElement).whereType<Container>()) {
-      for (var modelElement in [
-        ...container.staticFields,
-        ...container.staticMethods,
-      ]) {
-        yield MapEntry(modelElement.referenceName, modelElement);
-      }
-      if (container is Class) {
-        yield* _constructorGenerator(container.constructors);
-      }
-    }
-  }
-}
-
 /// A [Container] defined with a `class` declaration in Dart.
 ///
 /// Members follow similar naming rules to [Container], with the following
@@ -88,22 +15,10 @@ mixin Constructable on InheritingContainer {
 ///
 /// **instance**: As with [Container], but also includes inherited children.
 /// **inherited**: Filtered getters giving only inherited children.
-class Class extends InheritingContainer with Constructable {
-  final List<DefinedElementType> mixedInTypes;
-
-  final List<DefinedElementType> _directInterfaces;
-
+class Class extends InheritingContainer
+    with Constructable, TypeInterfaces, MixedInTypes {
   Class(ClassElement element, Library library, PackageGraph packageGraph)
-      : mixedInTypes = element.mixins
-            .map<DefinedElementType>(
-                (f) => ElementType.from(f, library, packageGraph))
-            .where((mixin) => mixin != null)
-            .toList(growable: false),
-        _directInterfaces = element.interfaces
-            .map<DefinedElementType>(
-                (f) => ElementType.from(f, library, packageGraph))
-            .toList(growable: false),
-        super(element, library, packageGraph) {
+      : super(element, library, packageGraph) {
     packageGraph.specialClasses.addSpecial(this);
   }
 
@@ -134,14 +49,6 @@ class Class extends InheritingContainer with Constructable {
     return super.fullkind;
   }
 
-  @override
-  bool get hasModifiers => super.hasModifiers || hasPublicMixedInTypes;
-
-  bool get hasPublicMixedInTypes => publicMixedInTypes.isNotEmpty;
-
-  Iterable<DefinedElementType> get publicMixedInTypes =>
-      model_utils.filterNonPublic(mixedInTypes);
-
   @override
   String get href {
     if (!identical(canonicalModelElement, this)) {
@@ -152,48 +59,6 @@ class Class extends InheritingContainer with Constructable {
     return '${package.baseHref}$filePath';
   }
 
-  /// Interfaces directly implemented by this class.
-  List<DefinedElementType> get interfaces => _directInterfaces;
-
-  /// The public interfaces may include substitutions for intermediate
-  /// private interfaces, and so unlike other public* methods, is not
-  /// a strict subset of [interfaces].
-  @override
-  Iterable<DefinedElementType> get publicInterfaces sync* {
-    for (var i in _directInterfaces) {
-      /// Do not recurse if we can find an element here.
-      if (i.modelElement.canonicalModelElement != null) {
-        yield i;
-        continue;
-      }
-      // Public types used to be unconditionally exposed here.  However,
-      // if the packages are [DocumentLocation.missing] we generally treat types
-      // defined in them as actually defined in a documented package.
-      // That translates to them being defined here, but in 'src/' or similar,
-      // and so, are now always hidden.
-
-      // This type is not backed by a canonical Class; search
-      // the superchain and publicInterfaces of this interface to pretend
-      // as though the hidden class didn't exist and this class was declared
-      // directly referencing the canonical classes further up the chain.
-      if (i.modelElement is InheritingContainer) {
-        var hiddenContainer = i.modelElement as InheritingContainer;
-        if (hiddenContainer.publicSuperChain.isNotEmpty) {
-          yield hiddenContainer.publicSuperChain.first;
-        }
-        yield* hiddenContainer.publicInterfaces;
-      } else {
-        assert(
-            false,
-            'Can not handle intermediate non-public interfaces '
-            'created by ModelElements that are not classes or mixins:  '
-            '$fullyQualifiedName contains an interface {$i}, '
-            'defined by ${i.modelElement}');
-        continue;
-      }
-    }
-  }
-
   bool get isAbstract => element.isAbstract;
 
   @override
diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
index fef44b9aaf..68e6b9bf07 100644
--- a/lib/src/model/inheriting_container.dart
+++ b/lib/src/model/inheriting_container.dart
@@ -6,10 +6,206 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/class.dart';
+import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/extension_target.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/model_utils.dart' as model_utils;
 import 'package:dartdoc/src/quiver.dart' as quiver;
+import 'package:meta/meta.dart';
+
+/// An mixin to build an [InheritingContainer] capable of being constructed
+/// with a direct call to a [Constructor] in Dart.
+///
+/// Note that [Constructor]s are not considered to be modifiers so a
+/// [hasModifier] override is not necessary for this mixin.
+mixin Constructable on InheritingContainer {
+  Iterable<Constructor> get constructors => element.constructors
+      .map((e) => ModelElement.from(e, library, packageGraph) as Constructor);
+
+  @override
+  bool get hasPublicConstructors => publicConstructors.isNotEmpty;
+
+  @visibleForTesting
+  Iterable<Constructor> get publicConstructors =>
+      model_utils.filterNonPublic(constructors);
+
+  List<Constructor> _publicConstructorsSorted;
+
+  @override
+  Iterable<Constructor> get publicConstructorsSorted =>
+      _publicConstructorsSorted ??= publicConstructors.toList()..sort(byName);
+
+  Constructor _unnamedConstructor;
+  Constructor get unnamedConstructor {
+    _unnamedConstructor ??= constructors
+        .firstWhere((c) => c.isUnnamedConstructor, orElse: () => null);
+    return _unnamedConstructor;
+  }
+
+  Constructor _defaultConstructor;
+
+  /// With constructor tearoffs, this is no longer equivalent to the unnamed
+  /// constructor and assumptions based on that are incorrect.
+  Constructor get defaultConstructor {
+    _defaultConstructor ??= unnamedConstructor ??
+        constructors.firstWhere((c) => c.isDefaultConstructor);
+    return _defaultConstructor;
+  }
+
+  static Iterable<MapEntry<String, CommentReferable>> _constructorGenerator(
+      Iterable<Constructor> source) sync* {
+    for (var constructor in source) {
+      yield MapEntry(constructor.referenceName, constructor);
+      yield MapEntry(
+          '${constructor.enclosingElement.referenceName}.${constructor.referenceName}',
+          constructor);
+      if (constructor.isDefaultConstructor) {
+        yield MapEntry('new', constructor);
+      }
+    }
+  }
+
+  @override
+  Iterable<MapEntry<String, CommentReferable>>
+      get extraReferenceChildren sync* {
+    yield* _constructorGenerator(constructors);
+    // TODO(jcollins-g): wean important users off of relying on static method
+    // inheritance (dart-lang/dartdoc#2698)
+    for (var container
+        in publicSuperChain.map((t) => t.modelElement).whereType<Container>()) {
+      for (var modelElement in [
+        ...container.staticFields,
+        ...container.staticMethods,
+      ]) {
+        yield MapEntry(modelElement.referenceName, modelElement);
+      }
+      if (container is Class) {
+        yield* _constructorGenerator(container.constructors);
+      }
+    }
+  }
+}
+
+/// Add the ability to support mixed-in types to an [InheritingContainer].
+mixin MixedInTypes on InheritingContainer {
+  List<DefinedElementType> _mixedInTypes;
+
+  List<DefinedElementType> get mixedInTypes =>
+      _mixedInTypes ??
+      [
+        ...element.mixins
+            .map<DefinedElementType>(
+                (f) => ElementType.from(f, library, packageGraph))
+            .where((mixin) => mixin != null)
+      ];
+
+  bool get hasPublicMixedInTypes => publicMixedInTypes.isNotEmpty;
+
+  @override
+  bool get hasModifiers => super.hasModifiers || hasPublicMixedInTypes;
+
+  Iterable<DefinedElementType> get publicMixedInTypes =>
+      model_utils.filterNonPublic(mixedInTypes);
+}
+
+/// Add the ability for an [InheritingContainer] to be implemented by other
+/// InheritingContainers and to reference what it itself implements.
+mixin TypeInterfaces on InheritingContainer {
+  List<DefinedElementType> _directInterfaces;
+  List<DefinedElementType> get directInterfaces =>
+      _directInterfaces ??
+      [
+        ...element.interfaces
+            .map<DefinedElementType>(
+                (f) => ElementType.from(f, library, packageGraph))
+            .toList(growable: false)
+      ];
+
+  /// Interfaces directly implemented by this container.
+  List<DefinedElementType> get interfaces => directInterfaces;
+
+  bool get hasPublicInterfaces => publicInterfaces.isNotEmpty;
+
+  @override
+  bool get hasModifiers =>
+      super.hasModifiers || hasPublicInterfaces || hasPublicImplementors;
+
+  /// The public interfaces may include substitutions for intermediate
+  /// private interfaces, and so unlike other public* methods, is not
+  /// a strict subset of [interfaces].
+  @override
+  Iterable<DefinedElementType> get publicInterfaces sync* {
+    for (var i in directInterfaces) {
+      /// Do not recurse if we can find an element here.
+      if (i.modelElement.canonicalModelElement != null) {
+        yield i;
+        continue;
+      }
+      // Public types used to be unconditionally exposed here.  However,
+      // if the packages are [DocumentLocation.missing] we generally treat types
+      // defined in them as actually defined in a documented package.
+      // That translates to them being defined here, but in 'src/' or similar,
+      // and so, are now always hidden.
+
+      // This type is not backed by a canonical Class; search
+      // the superchain and publicInterfaces of this interface to pretend
+      // as though the hidden class didn't exist and this class was declared
+      // directly referencing the canonical classes further up the chain.
+      if (i.modelElement is InheritingContainer) {
+        var hiddenContainer = i.modelElement as InheritingContainer;
+        if (hiddenContainer.publicSuperChain.isNotEmpty) {
+          yield hiddenContainer.publicSuperChain.first;
+        }
+        yield* hiddenContainer.publicInterfaces;
+      } else {
+        assert(
+            false,
+            'Can not handle intermediate non-public interfaces '
+            'created by ModelElements that are not classes or mixins:  '
+            '$fullyQualifiedName contains an interface {$i}, '
+            'defined by ${i.modelElement}');
+        continue;
+      }
+    }
+  }
+
+  bool get hasPublicImplementors => publicImplementors.isNotEmpty;
+
+  /// Returns all the "immediate" public implementors of this
+  /// [TypeInterfaces].  For a [Mixin], this is actually the mixin
+  /// applications using the [Mixin].
+  ///
+  /// If this [InheritingContainer] has a private implementor, then that is
+  /// counted as a proxy for any public implementors of that private container.
+  Iterable<TypeInterfaces> get publicImplementors {
+    var result = <TypeInterfaces>{};
+    var seen = <TypeInterfaces>{};
+
+    // Recursively adds [implementor] if public, or the implementors of
+    // [implementor] if not.
+    void addToResult(TypeInterfaces implementor) {
+      if (seen.contains(implementor)) return;
+      seen.add(implementor);
+      if (implementor.isPublicAndPackageDocumented) {
+        result.add(implementor);
+      } else {
+        model_utils
+            .findCanonicalFor(packageGraph.implementors[implementor] ?? [])
+            .forEach(addToResult);
+      }
+    }
+
+    model_utils
+        .findCanonicalFor(packageGraph.implementors[this] ?? [])
+        .forEach(addToResult);
+    return result;
+  }
+
+  List<TypeInterfaces> _publicImplementorsSorted;
+
+  Iterable<TypeInterfaces> get publicImplementorsSorted =>
+      _publicImplementorsSorted ??= publicImplementors.toList()..sort(byName);
+}
 
 /// A [Container] that participates in inheritance in Dart.
 ///
@@ -21,10 +217,14 @@ import 'package:dartdoc/src/quiver.dart' as quiver;
 abstract class InheritingContainer extends Container
     with ExtensionTarget
     implements EnclosedElement {
+  @override
+
+  /// [ClassElement] is analogous to [InheritingContainer].
+  ClassElement get element => super.element;
+
   // TODO(srawlins): To make final, remove public getter, setter, rename to be
   // public, and add `final` modifier.
   DefinedElementType _supertype;
-
   DefinedElementType get supertype => _supertype;
 
   @Deprecated('Field intended to be final; setter will be removed as early as '
@@ -67,43 +267,6 @@ abstract class InheritingContainer extends Container
     return _allModelElements;
   }
 
-  bool get hasPublicImplementors => publicImplementors.isNotEmpty;
-
-  /// Returns all the "immediate" public implementors of this
-  /// [InheritingContainer].  For a [Mixin], this is actually the mixin
-  /// applications using the [Mixin].
-  ///
-  /// If this [InheritingContainer] has a private implementor, then that is
-  /// counted as a proxy for any public implementors of that private container.
-  Iterable<InheritingContainer> get publicImplementors {
-    var result = <InheritingContainer>{};
-    var seen = <InheritingContainer>{};
-
-    // Recursively adds [implementor] if public, or the implementors of
-    // [implementor] if not.
-    void addToResult(InheritingContainer implementor) {
-      if (seen.contains(implementor)) return;
-      seen.add(implementor);
-      if (implementor.isPublicAndPackageDocumented) {
-        result.add(implementor);
-      } else {
-        model_utils
-            .findCanonicalFor(packageGraph.implementors[implementor] ?? [])
-            .forEach(addToResult);
-      }
-    }
-
-    model_utils
-        .findCanonicalFor(packageGraph.implementors[this] ?? [])
-        .forEach(addToResult);
-    return result;
-  }
-
-  List<InheritingContainer> _publicImplementorsSorted;
-
-  Iterable<InheritingContainer> get publicImplementorsSorted =>
-      _publicImplementorsSorted ??= publicImplementors.toList()..sort(byName);
-
   /// Returns the [InheritingContainer] with the library in which [element] is defined.
   InheritingContainer get definingContainer =>
       ModelElement.from(element, definingLibrary, packageGraph);
@@ -112,21 +275,15 @@ abstract class InheritingContainer extends Container
   @override
   ModelElement get enclosingElement => library;
 
-  @override
-  ClassElement get element => super.element;
-
   @override
   String get filePath => '${library.dirName}/$fileName';
 
   String get fullkind => kind;
 
-  bool get hasPublicInterfaces => publicInterfaces.isNotEmpty;
-
   @override
   bool get hasModifiers =>
       hasAnnotations ||
       hasPublicSuperChainReversed ||
-      hasPublicInterfaces ||
       hasPotentiallyApplicableExtensions;
 
   bool get hasPublicSuperChainReversed => publicSuperChainReversed.isNotEmpty;
diff --git a/lib/src/model/mixin.dart b/lib/src/model/mixin.dart
index 961f2ecf51..0e19890d04 100644
--- a/lib/src/model/mixin.dart
+++ b/lib/src/model/mixin.dart
@@ -11,19 +11,22 @@ import 'package:dartdoc/src/model_utils.dart' as model_utils;
 import 'package:dartdoc/src/special_elements.dart';
 
 /// Implements the Dart 2.1 "mixin" style of mixin declarations.
-class Mixin extends InheritingContainer {
+class Mixin extends InheritingContainer with TypeInterfaces {
   Mixin(ClassElement element, Library library, PackageGraph packageGraph)
-      : super(element, library, packageGraph) {
-    assert(element.interfaces.isEmpty);
-  }
+      : super(element, library, packageGraph);
+
   List<ParameterizedElementType> _superclassConstraints;
 
   /// Returns a list of superclass constraints for this mixin.
   Iterable<ParameterizedElementType> get superclassConstraints {
-    _superclassConstraints ??= element.superclassConstraints
-        .map<ParameterizedElementType>(
-            (InterfaceType i) => ElementType.from(i, library, packageGraph))
-        .toList();
+    _superclassConstraints ??= [
+      ...element.superclassConstraints
+          .map<ParameterizedElementType>(
+              (InterfaceType i) => ElementType.from(i, library, packageGraph))
+          .where((t) =>
+              t.modelElement !=
+              packageGraph.specialClasses[SpecialClass.object])
+    ];
     return _superclassConstraints;
   }
 
@@ -51,11 +54,9 @@ class Mixin extends InheritingContainer {
       _inheritanceChain.add(this);
 
       // Mix-in interfaces come before other interfaces.
-      _inheritanceChain.addAll(superclassConstraints
-          .expand((ParameterizedElementType i) =>
-              (i.modelElement as InheritingContainer).inheritanceChain)
-          .where((InheritingContainer c) =>
-              c != packageGraph.specialClasses[SpecialClass.object]));
+      _inheritanceChain.addAll(superclassConstraints.expand(
+          (ParameterizedElementType i) =>
+              (i.modelElement as InheritingContainer).inheritanceChain));
     }
     return _inheritanceChain.toList(growable: false);
   }
diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart
index e0c878e43e..e977606272 100644
--- a/lib/src/model/package_graph.dart
+++ b/lib/src/model/package_graph.dart
@@ -182,7 +182,7 @@ class PackageGraph with CommentReferable, Nameable {
   /// is true.
   bool allExtensionsAdded = false;
 
-  Map<InheritingContainer, List<InheritingContainer>> get implementors {
+  Map<TypeInterfaces, List<TypeInterfaces>> get implementors {
     assert(allImplementorsAdded);
     return _implementors;
   }
@@ -220,12 +220,10 @@ class PackageGraph with CommentReferable, Nameable {
       HashMap<Tuple2<Element, Library>, Set<ModelElement>>();
 
   /// A mapping of the list of classes which implement each class.
-  final _implementors =
-      LinkedHashMap<InheritingContainer, List<InheritingContainer>>(
-          equals: (InheritingContainer a, InheritingContainer b) =>
-              a.definingContainer == b.definingContainer,
-          hashCode: (InheritingContainer clazz) =>
-              clazz.definingContainer.hashCode);
+  final _implementors = LinkedHashMap<TypeInterfaces, List<TypeInterfaces>>(
+      equals: (TypeInterfaces a, TypeInterfaces b) =>
+          a.definingContainer == b.definingContainer,
+      hashCode: (TypeInterfaces clazz) => clazz.definingContainer.hashCode);
 
   /// A list of extensions that exist in the package graph.
   final List<Extension> _extensions = [];
diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart
index 5bc5d9c01c..dc58e2ed83 100644
--- a/lib/src/model_utils.dart
+++ b/lib/src/model_utils.dart
@@ -11,7 +11,9 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
-import 'package:dartdoc/dartdoc.dart';
+import 'package:dartdoc/dartdoc.dart' show DartdocFailure;
+import 'package:dartdoc/src/model/inheriting_container.dart';
+import 'package:dartdoc/src/model/model.dart';
 import 'package:glob/glob.dart';
 import 'package:path/path.dart' as path;
 
@@ -91,10 +93,11 @@ Iterable<T> filterNonPublic<T extends Privacy>(Iterable<T> privacyItems) {
 
 /// Finds canonical classes for all classes in the iterable, if possible.
 /// If a canonical class can not be found, returns the original class.
-Iterable<InheritingContainer> findCanonicalFor(
-    Iterable<InheritingContainer> containers) {
+Iterable<TypeInterfaces> findCanonicalFor(Iterable<TypeInterfaces> containers) {
   return containers.map((c) =>
-      c.packageGraph.findCanonicalModelElementFor(c.element) as Class ?? c);
+      c.packageGraph.findCanonicalModelElementFor(c.element)
+          as TypeInterfaces ??
+      c);
 }
 
 /// Uses direct file access to get the contents of a file.  Cached.
diff --git a/lib/templates/html/enum.html b/lib/templates/html/enum.html
index c463b0fd9d..c65aa96503 100644
--- a/lib/templates/html/enum.html
+++ b/lib/templates/html/enum.html
@@ -22,26 +22,6 @@
         </ul></dd>
         {{/hasPublicSuperChainReversed}}
 
-        {{#hasPublicInterfaces}}
-        <dt>Implemented types</dt>
-        <dd>
-          <ul class="comma-separated eNum-relationships">
-            {{#publicInterfaces}}
-            <li>{{{linkedName}}}</li>
-            {{/publicInterfaces}}
-          </ul>
-        </dd>
-        {{/hasPublicInterfaces}}
-
-        {{#hasPublicImplementors}}
-        <dt>Implementers</dt>
-        <dd><ul class="comma-separated eNum-relationships">
-          {{#publicImplementorsSorted}}
-          <li>{{{linkedName}}}</li>
-          {{/publicImplementorsSorted}}
-        </ul></dd>
-        {{/hasPublicImplementors}}
-
         {{#hasAnnotations}}
         <dt>Annotations</dt>
         <dd><ul class="annotation-list eNum-relationships">
diff --git a/lib/templates/md/enum.md b/lib/templates/md/enum.md
index 0e8e097606..34094941d0 100644
--- a/lib/templates/md/enum.md
+++ b/lib/templates/md/enum.md
@@ -21,22 +21,6 @@
 - {{{name}}}
 {{/hasPublicSuperChainReversed}}
 
-{{#hasPublicInterfaces}}
-**Implemented types**
-
-{{#publicInterfaces}}
-- {{{linkedName}}}
-{{/publicInterfaces}}
-{{/hasPublicInterfaces}}
-
-{{#hasPublicImplementors}}
-**Implementers**
-
-{{#publicImplementorsSorted}}
-- {{{linkedName}}}
-{{/publicImplementorsSorted}}
-{{/hasPublicImplementors}}
-
 {{#hasAnnotations}}
 **Annotations**
 
diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart
index 43f1d0d67d..80019df082 100644
--- a/test/end2end/model_test.dart
+++ b/test/end2end/model_test.dart
@@ -1849,6 +1849,30 @@ void main() {
           .firstWhere((f) => f.name == 'overrideByModifierClass');
     });
 
+    test('computes interfaces and implementors correctly', () {
+      var ThingToImplementInMixin = fakeLibrary.publicClasses
+          .firstWhere((c) => c.name == 'ThingToImplementInMixin');
+      var MixedInImplementation = fakeLibrary.publicClasses
+          .firstWhere((c) => c.name == 'MixedInImplementation');
+      var MixInImplementation =
+          fakeLibrary.mixins.firstWhere((m) => m.name == 'MixInImplementation');
+      var mixinGetter = MixInImplementation.allFields
+          .firstWhere((f) => f.name == 'mixinGetter');
+
+      expect(ThingToImplementInMixin.hasModifiers, isTrue);
+      expect(MixInImplementation.hasModifiers, isTrue);
+      expect(MixedInImplementation.hasModifiers, isTrue);
+      expect(ThingToImplementInMixin.publicImplementors,
+          orderedEquals([MixInImplementation]));
+      expect(MixInImplementation.publicImplementors,
+          orderedEquals([MixedInImplementation]));
+      expect(
+          MixedInImplementation.allFields
+              .firstWhere((f) => f.name == 'mixinGetter')
+              .canonicalModelElement,
+          equals(mixinGetter));
+    });
+
     test('does have a line number and column', () {
       expect(GenericMixin.characterLocation, isNotNull);
     });
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index d6f62ae07a..02a7a3f956 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -472,6 +472,17 @@ class ABaseClass {}
 
 class ATypeTakingClassMixedIn extends ABaseClass with ATypeTakingClass<void> {}
 
+abstract class ThingToImplementInMixin {
+  bool get mixinGetter;
+}
+
+mixin MixInImplementation implements ThingToImplementInMixin {
+  @override
+  bool get mixinGetter => true;
+}
+
+class MixedInImplementation with MixInImplementation {}
+
 /// Names are actually wrong in this class, but when we extend it,
 /// they are correct.
 class ImplicitProperties {

From ce3eaffc1d7c85ec69bd51134a8b27a0449e05b8 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 2 Sep 2021 12:02:13 -0700
Subject: [PATCH 05/19] exposing mixin types seems bad

---
 lib/src/generator/templates.dart                  |  3 ---
 .../generator/templates.runtime_renderers.dart    | 15 ++++-----------
 lib/src/model/inheriting_container.dart           | 12 ++++++------
 lib/src/model/package_graph.dart                  | 12 +++++++-----
 lib/src/model_utils.dart                          |  5 +++--
 5 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/lib/src/generator/templates.dart b/lib/src/generator/templates.dart
index 4a53662b7e..9ce0ef7fc2 100644
--- a/lib/src/generator/templates.dart
+++ b/lib/src/generator/templates.dart
@@ -50,7 +50,6 @@ const _visibleTypes = {
   Category,
   Class,
   Constructor,
-  Constructable,
   DefinedElementType,
   Documentable,
   ElementType,
@@ -63,13 +62,11 @@ const _visibleTypes = {
   Library,
   LibraryContainer,
   Method,
-  MixedInTypes,
   ModelElement,
   Package,
   // For getters like `isNotEmpty`; perhaps a smell, but currently in use.
   String,
   TopLevelVariable,
-  TypeInterfaces,
   TypeParameter,
 };
 
diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
index d6c1786270..fc676daa00 100644
--- a/lib/src/generator/templates.runtime_renderers.dart
+++ b/lib/src/generator/templates.runtime_renderers.dart
@@ -14009,13 +14009,6 @@ class _Renderer_TopLevelVariable extends RendererBase<TopLevelVariable> {
   }
 }
 
-void _render_TypeInterfaces(TypeInterfaces context, List<MustachioNode> ast,
-    Template template, StringSink sink,
-    {RendererBase<Object> parent}) {
-  var renderer = _Renderer_TypeInterfaces(context, parent, template, sink);
-  renderer.renderBlock(ast);
-}
-
 class _Renderer_TypeInterfaces extends RendererBase<TypeInterfaces> {
   static final Map<Type, Object> _propertyMapCache = {};
   static Map<String, Property<CT_>> propertyMap<CT_ extends TypeInterfaces>() =>
@@ -14074,11 +14067,11 @@ class _Renderer_TypeInterfaces extends RendererBase<TypeInterfaces> {
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
                       self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<TypeInterfaces>'),
+                          c, remainingNames, 'Iterable<InheritingContainer>'),
                   renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
                     return c.publicImplementors.map((e) =>
-                        _render_TypeInterfaces(e, ast, r.template, sink,
+                        _render_InheritingContainer(e, ast, r.template, sink,
                             parent: r));
                   },
                 ),
@@ -14087,11 +14080,11 @@ class _Renderer_TypeInterfaces extends RendererBase<TypeInterfaces> {
                   renderVariable: (CT_ c, Property<CT_> self,
                           List<String> remainingNames) =>
                       self.renderSimpleVariable(
-                          c, remainingNames, 'Iterable<TypeInterfaces>'),
+                          c, remainingNames, 'Iterable<InheritingContainer>'),
                   renderIterable: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
                     return c.publicImplementorsSorted.map((e) =>
-                        _render_TypeInterfaces(e, ast, r.template, sink,
+                        _render_InheritingContainer(e, ast, r.template, sink,
                             parent: r));
                   },
                 ),
diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
index 68e6b9bf07..be9f00c22b 100644
--- a/lib/src/model/inheriting_container.dart
+++ b/lib/src/model/inheriting_container.dart
@@ -177,13 +177,13 @@ mixin TypeInterfaces on InheritingContainer {
   ///
   /// If this [InheritingContainer] has a private implementor, then that is
   /// counted as a proxy for any public implementors of that private container.
-  Iterable<TypeInterfaces> get publicImplementors {
-    var result = <TypeInterfaces>{};
-    var seen = <TypeInterfaces>{};
+  Iterable<InheritingContainer> get publicImplementors {
+    var result = <InheritingContainer>{};
+    var seen = <InheritingContainer>{};
 
     // Recursively adds [implementor] if public, or the implementors of
     // [implementor] if not.
-    void addToResult(TypeInterfaces implementor) {
+    void addToResult(InheritingContainer implementor) {
       if (seen.contains(implementor)) return;
       seen.add(implementor);
       if (implementor.isPublicAndPackageDocumented) {
@@ -201,9 +201,9 @@ mixin TypeInterfaces on InheritingContainer {
     return result;
   }
 
-  List<TypeInterfaces> _publicImplementorsSorted;
+  List<InheritingContainer> _publicImplementorsSorted;
 
-  Iterable<TypeInterfaces> get publicImplementorsSorted =>
+  Iterable<InheritingContainer> get publicImplementorsSorted =>
       _publicImplementorsSorted ??= publicImplementors.toList()..sort(byName);
 }
 
diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart
index e977606272..e0c878e43e 100644
--- a/lib/src/model/package_graph.dart
+++ b/lib/src/model/package_graph.dart
@@ -182,7 +182,7 @@ class PackageGraph with CommentReferable, Nameable {
   /// is true.
   bool allExtensionsAdded = false;
 
-  Map<TypeInterfaces, List<TypeInterfaces>> get implementors {
+  Map<InheritingContainer, List<InheritingContainer>> get implementors {
     assert(allImplementorsAdded);
     return _implementors;
   }
@@ -220,10 +220,12 @@ class PackageGraph with CommentReferable, Nameable {
       HashMap<Tuple2<Element, Library>, Set<ModelElement>>();
 
   /// A mapping of the list of classes which implement each class.
-  final _implementors = LinkedHashMap<TypeInterfaces, List<TypeInterfaces>>(
-      equals: (TypeInterfaces a, TypeInterfaces b) =>
-          a.definingContainer == b.definingContainer,
-      hashCode: (TypeInterfaces clazz) => clazz.definingContainer.hashCode);
+  final _implementors =
+      LinkedHashMap<InheritingContainer, List<InheritingContainer>>(
+          equals: (InheritingContainer a, InheritingContainer b) =>
+              a.definingContainer == b.definingContainer,
+          hashCode: (InheritingContainer clazz) =>
+              clazz.definingContainer.hashCode);
 
   /// A list of extensions that exist in the package graph.
   final List<Extension> _extensions = [];
diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart
index dc58e2ed83..edde105053 100644
--- a/lib/src/model_utils.dart
+++ b/lib/src/model_utils.dart
@@ -93,10 +93,11 @@ Iterable<T> filterNonPublic<T extends Privacy>(Iterable<T> privacyItems) {
 
 /// Finds canonical classes for all classes in the iterable, if possible.
 /// If a canonical class can not be found, returns the original class.
-Iterable<TypeInterfaces> findCanonicalFor(Iterable<TypeInterfaces> containers) {
+Iterable<InheritingContainer> findCanonicalFor(
+    Iterable<InheritingContainer> containers) {
   return containers.map((c) =>
       c.packageGraph.findCanonicalModelElementFor(c.element)
-          as TypeInterfaces ??
+          as InheritingContainer ??
       c);
 }
 

From 2e815c0864ee24337b3a28ae4121d0149ba91cbb Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 2 Sep 2021 12:07:05 -0700
Subject: [PATCH 06/19] ok.  seriously, got it this time....

---
 .../templates.runtime_renderers.dart          | 19 ++++++++++---------
 lib/src/model/class.dart                      |  2 +-
 lib/src/model/inheriting_container.dart       |  4 ++--
 lib/src/model/mixin.dart                      |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
index fc676daa00..2cf98c9c6b 100644
--- a/lib/src/generator/templates.runtime_renderers.dart
+++ b/lib/src/generator/templates.runtime_renderers.dart
@@ -1577,7 +1577,7 @@ class _Renderer_Class extends RendererBase<Class> {
           () => {
                 ..._Renderer_InheritingContainer.propertyMap<CT_>(),
                 ..._Renderer_Constructable.propertyMap<CT_>(),
-                ..._Renderer_TypeInterfaces.propertyMap<CT_>(),
+                ..._Renderer_TypeImplementing.propertyMap<CT_>(),
                 ..._Renderer_MixedInTypes.propertyMap<CT_>(),
                 'allModelElements': Property(
                   getValue: (CT_ c) => c.allModelElements,
@@ -9050,7 +9050,7 @@ class _Renderer_Mixin extends RendererBase<Mixin> {
           CT_,
           () => {
                 ..._Renderer_InheritingContainer.propertyMap<CT_>(),
-                ..._Renderer_TypeInterfaces.propertyMap<CT_>(),
+                ..._Renderer_TypeImplementing.propertyMap<CT_>(),
                 'fileName': Property(
                   getValue: (CT_ c) => c.fileName,
                   renderVariable:
@@ -14009,9 +14009,10 @@ class _Renderer_TopLevelVariable extends RendererBase<TopLevelVariable> {
   }
 }
 
-class _Renderer_TypeInterfaces extends RendererBase<TypeInterfaces> {
+class _Renderer_TypeImplementing extends RendererBase<TypeImplementing> {
   static final Map<Type, Object> _propertyMapCache = {};
-  static Map<String, Property<CT_>> propertyMap<CT_ extends TypeInterfaces>() =>
+  static Map<String, Property<CT_>> propertyMap<
+          CT_ extends TypeImplementing>() =>
       _propertyMapCache.putIfAbsent(
           CT_,
           () => {
@@ -14103,14 +14104,14 @@ class _Renderer_TypeInterfaces extends RendererBase<TypeInterfaces> {
                 ),
               });
 
-  _Renderer_TypeInterfaces(TypeInterfaces context, RendererBase<Object> parent,
-      Template template, StringSink sink)
+  _Renderer_TypeImplementing(TypeImplementing context,
+      RendererBase<Object> parent, Template template, StringSink sink)
       : super(context, parent, template, sink);
 
   @override
-  Property<TypeInterfaces> getProperty(String key) {
-    if (propertyMap<TypeInterfaces>().containsKey(key)) {
-      return propertyMap<TypeInterfaces>()[key];
+  Property<TypeImplementing> getProperty(String key) {
+    if (propertyMap<TypeImplementing>().containsKey(key)) {
+      return propertyMap<TypeImplementing>()[key];
     } else {
       return null;
     }
diff --git a/lib/src/model/class.dart b/lib/src/model/class.dart
index a457483327..5e415b73d1 100644
--- a/lib/src/model/class.dart
+++ b/lib/src/model/class.dart
@@ -16,7 +16,7 @@ import 'comment_referable.dart';
 /// **instance**: As with [Container], but also includes inherited children.
 /// **inherited**: Filtered getters giving only inherited children.
 class Class extends InheritingContainer
-    with Constructable, TypeInterfaces, MixedInTypes {
+    with Constructable, TypeImplementing, MixedInTypes {
   Class(ClassElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph) {
     packageGraph.specialClasses.addSpecial(this);
diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
index be9f00c22b..2b8b7556ca 100644
--- a/lib/src/model/inheriting_container.dart
+++ b/lib/src/model/inheriting_container.dart
@@ -110,7 +110,7 @@ mixin MixedInTypes on InheritingContainer {
 
 /// Add the ability for an [InheritingContainer] to be implemented by other
 /// InheritingContainers and to reference what it itself implements.
-mixin TypeInterfaces on InheritingContainer {
+mixin TypeImplementing on InheritingContainer {
   List<DefinedElementType> _directInterfaces;
   List<DefinedElementType> get directInterfaces =>
       _directInterfaces ??
@@ -172,7 +172,7 @@ mixin TypeInterfaces on InheritingContainer {
   bool get hasPublicImplementors => publicImplementors.isNotEmpty;
 
   /// Returns all the "immediate" public implementors of this
-  /// [TypeInterfaces].  For a [Mixin], this is actually the mixin
+  /// [TypeImplementing].  For a [Mixin], this is actually the mixin
   /// applications using the [Mixin].
   ///
   /// If this [InheritingContainer] has a private implementor, then that is
diff --git a/lib/src/model/mixin.dart b/lib/src/model/mixin.dart
index 0e19890d04..2a1b7e8b9a 100644
--- a/lib/src/model/mixin.dart
+++ b/lib/src/model/mixin.dart
@@ -11,7 +11,7 @@ import 'package:dartdoc/src/model_utils.dart' as model_utils;
 import 'package:dartdoc/src/special_elements.dart';
 
 /// Implements the Dart 2.1 "mixin" style of mixin declarations.
-class Mixin extends InheritingContainer with TypeInterfaces {
+class Mixin extends InheritingContainer with TypeImplementing {
   Mixin(ClassElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph);
 

From f483a1ac9381d0c6d8162e62e0bd845849f2196b Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 2 Sep 2021 12:45:45 -0700
Subject: [PATCH 07/19] correct some mixin edge cases

---
 lib/src/model/accessor.dart    |  6 +++---
 lib/src/model/inheritable.dart |  3 +++
 lib/src/model/mixin.dart       | 10 ++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/src/model/accessor.dart b/lib/src/model/accessor.dart
index ddd7c9cd9a..6a926eb72b 100644
--- a/lib/src/model/accessor.dart
+++ b/lib/src/model/accessor.dart
@@ -228,11 +228,11 @@ class ContainerAccessor extends Accessor with ContainerMember, Inheritable {
               isGetter ? t.getGetter(element.name) : t.getSetter(element.name);
           if (accessor != null) {
             accessor = accessor.declaration;
-            Class parentClass =
+            InheritingContainer parentContainer =
                 ModelElement.fromElement(t.element, packageGraph);
             var possibleFields = <Field>[];
-            possibleFields.addAll(parentClass.instanceFields);
-            possibleFields.addAll(parentClass.staticFields);
+            possibleFields.addAll(parentContainer.instanceFields);
+            possibleFields.addAll(parentContainer.staticFields);
             var fieldName = accessor.name.replaceFirst('=', '');
             var foundField = possibleFields.firstWhere(
                 (f) => f.element.name == fieldName,
diff --git a/lib/src/model/inheritable.dart b/lib/src/model/inheritable.dart
index f93ada56db..3083030f7d 100644
--- a/lib/src/model/inheritable.dart
+++ b/lib/src/model/inheritable.dart
@@ -117,6 +117,9 @@ mixin Inheritable on ContainerMember {
     var object = packageGraph.specialClasses[SpecialClass.object];
     if (!inheritance.contains(definingEnclosingContainer) &&
         definingEnclosingContainer != null) {
+      if (definingEnclosingContainer != object) {
+        print('wtf');
+      }
       assert(definingEnclosingContainer == object);
     }
     // Unless the code explicitly extends dart-core's Object, we won't get
diff --git a/lib/src/model/mixin.dart b/lib/src/model/mixin.dart
index 2a1b7e8b9a..6f3e05c325 100644
--- a/lib/src/model/mixin.dart
+++ b/lib/src/model/mixin.dart
@@ -57,6 +57,16 @@ class Mixin extends InheritingContainer with TypeImplementing {
       _inheritanceChain.addAll(superclassConstraints.expand(
           (ParameterizedElementType i) =>
               (i.modelElement as InheritingContainer).inheritanceChain));
+
+      for (var c
+          in superChain.map((e) => (e.modelElement as InheritingContainer))) {
+        _inheritanceChain.addAll(c.inheritanceChain);
+      }
+
+      /// Interfaces need to come last, because classes in the superChain might
+      /// implement them even when they aren't mentioned.
+      _inheritanceChain.addAll(interfaces.expand(
+          (e) => (e.modelElement as InheritingContainer).inheritanceChain));
     }
     return _inheritanceChain.toList(growable: false);
   }

From 82c02e5b37a11da3441ddcc7635b0bea6ef0394f Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Fri, 3 Sep 2021 08:20:53 -0700
Subject: [PATCH 08/19] remove breakpoint helper

---
 lib/src/model/inheritable.dart | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/src/model/inheritable.dart b/lib/src/model/inheritable.dart
index 3083030f7d..f93ada56db 100644
--- a/lib/src/model/inheritable.dart
+++ b/lib/src/model/inheritable.dart
@@ -117,9 +117,6 @@ mixin Inheritable on ContainerMember {
     var object = packageGraph.specialClasses[SpecialClass.object];
     if (!inheritance.contains(definingEnclosingContainer) &&
         definingEnclosingContainer != null) {
-      if (definingEnclosingContainer != object) {
-        print('wtf');
-      }
       assert(definingEnclosingContainer == object);
     }
     // Unless the code explicitly extends dart-core's Object, we won't get

From 392310d47faa563eccaaf7bb47009a8bc801f406 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Fri, 3 Sep 2021 09:55:19 -0700
Subject: [PATCH 09/19] review comments

---
 lib/src/model/inheriting_container.dart | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
index 2b8b7556ca..b135e74b00 100644
--- a/lib/src/model/inheriting_container.dart
+++ b/lib/src/model/inheriting_container.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the Dart project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -13,17 +13,19 @@ import 'package:dartdoc/src/model_utils.dart' as model_utils;
 import 'package:dartdoc/src/quiver.dart' as quiver;
 import 'package:meta/meta.dart';
 
-/// An mixin to build an [InheritingContainer] capable of being constructed
+/// A mixin to build an [InheritingContainer] capable of being constructed
 /// with a direct call to a [Constructor] in Dart.
 ///
 /// Note that [Constructor]s are not considered to be modifiers so a
 /// [hasModifier] override is not necessary for this mixin.
 mixin Constructable on InheritingContainer {
-  Iterable<Constructor> get constructors => element.constructors
+  List<Constructor> _constructors;
+  Iterable<Constructor> get constructors => _constructors ??= element
+      .constructors
       .map((e) => ModelElement.from(e, library, packageGraph) as Constructor);
 
   @override
-  bool get hasPublicConstructors => publicConstructors.isNotEmpty;
+  bool get hasPublicConstructors => publicConstructorsSorted.isNotEmpty;
 
   @visibleForTesting
   Iterable<Constructor> get publicConstructors =>
@@ -222,18 +224,11 @@ abstract class InheritingContainer extends Container
   /// [ClassElement] is analogous to [InheritingContainer].
   ClassElement get element => super.element;
 
-  // TODO(srawlins): To make final, remove public getter, setter, rename to be
-  // public, and add `final` modifier.
-  DefinedElementType _supertype;
-  DefinedElementType get supertype => _supertype;
-
-  @Deprecated('Field intended to be final; setter will be removed as early as '
-      'Dartdoc 1.0.0')
-  set supertype(DefinedElementType value) => _supertype = value;
+  final DefinedElementType supertype;
 
   InheritingContainer(
       ClassElement element, Library library, PackageGraph packageGraph)
-      : _supertype = element.supertype?.element?.supertype == null
+      : supertype = element.supertype?.element?.supertype == null
             ? null
             : ElementType.from(element.supertype, library, packageGraph),
         super(element, library, packageGraph);
@@ -592,7 +587,6 @@ abstract class InheritingContainer extends Container
 
   List<TypeParameter> _typeParameters;
 
-  // a stronger hash?
   @override
   List<TypeParameter> get typeParameters {
     _typeParameters ??= element.typeParameters.map((f) {

From 5d098ef766d9cf9cf2b9caed3a847e1fb012bb2f Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Fri, 3 Sep 2021 10:02:05 -0700
Subject: [PATCH 10/19] forgot list construction

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

diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
index b135e74b00..d712efded2 100644
--- a/lib/src/model/inheriting_container.dart
+++ b/lib/src/model/inheriting_container.dart
@@ -20,9 +20,9 @@ import 'package:meta/meta.dart';
 /// [hasModifier] override is not necessary for this mixin.
 mixin Constructable on InheritingContainer {
   List<Constructor> _constructors;
-  Iterable<Constructor> get constructors => _constructors ??= element
+  Iterable<Constructor> get constructors => _constructors ??= [...element
       .constructors
-      .map((e) => ModelElement.from(e, library, packageGraph) as Constructor);
+      .map((e) => ModelElement.from(e, library, packageGraph) as Constructor)];
 
   @override
   bool get hasPublicConstructors => publicConstructorsSorted.isNotEmpty;

From 6ac63585e9b2e911a9f5fa03036adde19e55bfcf Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Fri, 3 Sep 2021 10:03:15 -0700
Subject: [PATCH 11/19] dartfmt

---
 lib/src/model/inheriting_container.dart | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
index d712efded2..445c5f4a89 100644
--- a/lib/src/model/inheriting_container.dart
+++ b/lib/src/model/inheriting_container.dart
@@ -20,9 +20,10 @@ import 'package:meta/meta.dart';
 /// [hasModifier] override is not necessary for this mixin.
 mixin Constructable on InheritingContainer {
   List<Constructor> _constructors;
-  Iterable<Constructor> get constructors => _constructors ??= [...element
-      .constructors
-      .map((e) => ModelElement.from(e, library, packageGraph) as Constructor)];
+  Iterable<Constructor> get constructors => _constructors ??= [
+        ...element.constructors.map(
+            (e) => ModelElement.from(e, library, packageGraph) as Constructor)
+      ];
 
   @override
   bool get hasPublicConstructors => publicConstructorsSorted.isNotEmpty;

From 895855a0f0dc124d28e5bd42efa1dc5d346764a9 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Fri, 3 Sep 2021 11:51:12 -0700
Subject: [PATCH 12/19] squash some merges out

---
 lib/src/comment_references/parser.dart     | 79 ++++++++++++++++++++--
 test/comment_referable/parser_test.dart    | 10 +++
 test/end2end/model_special_cases_test.dart | 16 +++++
 3 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/lib/src/comment_references/parser.dart b/lib/src/comment_references/parser.dart
index 6b09ccd308..502fdaf57f 100644
--- a/lib/src/comment_references/parser.dart
+++ b/lib/src/comment_references/parser.dart
@@ -93,7 +93,7 @@ class CommentReferenceParser {
   /// ```text
   ///   <rawCommentReference> ::= <prefix>?<commentReference><suffix>?
   ///
-  ///   <commentReference> ::= (<packageName> '.')? (<libraryName> '.')? <dartdocIdentifier> ('.' <identifier>)*
+  ///   <commentReference> ::= (<packageName> '.')? (<libraryName> '.')? <dartdocIdentifier> <typeParameters> ('.' <identifier> <typeParameters>)*
   /// ```
   List<CommentReferenceNode> _parseRawCommentReference() {
     var children = <CommentReferenceNode>[];
@@ -121,6 +121,17 @@ class CommentReferenceParser {
       } else if (identifierResult.type ==
           _IdentifierResultType.parsedIdentifier) {
         children.add(identifierResult.node);
+        var typeParametersResult = _parseTypeParameters();
+        if (typeParametersResult.type == _TypeParametersResultType.endOfFile) {
+          break;
+        } else if (typeParametersResult.type ==
+            _TypeParametersResultType.notTypeParameters) {
+          // Do nothing, _index has not moved.
+          ;
+        } else if (typeParametersResult.type ==
+            _TypeParametersResultType.parsedTypeParameters) {
+          children.add(typeParametersResult.node);
+        }
       }
       if (_atEnd || _thisChar != $dot) {
         break;
@@ -236,6 +247,22 @@ class CommentReferenceParser {
         IdentifierNode(codeRef.substring(startIndex, _index)));
   }
 
+  /// Parse a list of type parameters.
+  ///
+  /// Dartdoc isolates these where present and potentially valid, but we don't
+  /// break them down.
+  _TypeParametersParseResult _parseTypeParameters() {
+    if (_atEnd) {
+      return _TypeParametersParseResult.endOfFile;
+    }
+    var startIndex = _index;
+    if (_matchBraces($lt, $gt)) {
+      return _TypeParametersParseResult.ok(
+          TypeParametersNode(codeRef.substring(startIndex + 1, _index - 1)));
+    }
+    return _TypeParametersParseResult.notIdentifier;
+  }
+
   static const _callableHintSuffix = '()';
 
   /// ```text
@@ -267,7 +294,7 @@ class CommentReferenceParser {
     if ((_thisChar == $exclamation || _thisChar == $question) && _nextAtEnd) {
       return _SuffixParseResult.junk;
     }
-    if (_matchBraces($lparen, $rparen) || _matchBraces($lt, $gt)) {
+    if (_matchBraces($lparen, $rparen)) {
       return _SuffixParseResult.junk;
     }
 
@@ -331,8 +358,10 @@ class CommentReferenceParser {
     while (!_atEnd) {
       if (_thisChar == startChar) braceCount++;
       if (_thisChar == endChar) braceCount--;
-      ++_index;
-      if (braceCount == 0) return true;
+      _index++;
+      if (braceCount == 0) {
+        return true;
+      }
     }
     _index = startIndex;
     return false;
@@ -392,6 +421,32 @@ class _IdentifierParseResult {
       _IdentifierParseResult._(_IdentifierResultType.notIdentifier, null);
 }
 
+enum _TypeParametersResultType {
+  endOfFile, // Found end of file instead of the beginning of a list of type
+  // parameters.
+  notTypeParameters, // Found something, but it isn't type parameters.
+  parsedTypeParameters, // Found type parameters.
+}
+
+class _TypeParametersParseResult {
+  final _TypeParametersResultType type;
+
+  final TypeParametersNode node;
+
+  const _TypeParametersParseResult._(this.type, this.node);
+
+  factory _TypeParametersParseResult.ok(TypeParametersNode node) =>
+      _TypeParametersParseResult._(
+          _TypeParametersResultType.parsedTypeParameters, node);
+
+  static const _TypeParametersParseResult endOfFile =
+      _TypeParametersParseResult._(_TypeParametersResultType.endOfFile, null);
+
+  static const _TypeParametersParseResult notIdentifier =
+      _TypeParametersParseResult._(
+          _TypeParametersResultType.notTypeParameters, null);
+}
+
 enum _SuffixResultType {
   junk, // Found known types of junk it is OK to ignore.
   missing, // There is no suffix here.  Same as EOF as this is a suffix.
@@ -456,3 +511,19 @@ class IdentifierNode extends CommentReferenceNode {
   @override
   String toString() => 'Identifier["$text"]';
 }
+
+/// Represents one or more type parameters, may be
+/// comma separated.
+class TypeParametersNode extends CommentReferenceNode {
+  @override
+
+  /// Note that this will contain commas, spaces, and other text, as
+  /// generally type parameters are a form of junk that comment references
+  /// should ignore.
+  final String text;
+
+  TypeParametersNode(this.text);
+
+  @override
+  String toString() => 'TypeParametersNode["$text"]';
+}
diff --git a/test/comment_referable/parser_test.dart b/test/comment_referable/parser_test.dart
index b716408be7..49d5905633 100644
--- a/test/comment_referable/parser_test.dart
+++ b/test/comment_referable/parser_test.dart
@@ -81,6 +81,16 @@ void main() {
           ['ThisThingy', '[]', 'parameter']);
     });
 
+    test('Check that embedded types within tearoff-like constructs parse', () {
+      expectParseEquivalent('this<stuff>.isValid', ['this', 'isValid']);
+      expectParseEquivalent('this<stuff<that<is, real>, complicated>>.isValid',
+          ['this', 'isValid']);
+      expectParseError('this<stuff.isntValid');
+      expectParseError('this<stuff>, notBeingValid>.isntValid');
+      expectParseError('(AndThisMayBeValidDart.butIt).isntValidInReferences');
+      expectParseError('<NotActually>.valid');
+    });
+
     test('Basic negative tests', () {
       expectParseError(r'.');
       expectParseError(r'');
diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart
index 50c4d54978..1cdf0f08df 100644
--- a/test/end2end/model_special_cases_test.dart
+++ b/test/end2end/model_special_cases_test.dart
@@ -203,6 +203,22 @@ void main() {
         expect(referenceLookup(constructorTearoffs, 'Ft.new'),
             equals(MatchingLinkResult(Fnew)));
       });
+
+      test('we can use (ignored) type parameters in references', () {
+        expect(referenceLookup(E, 'D<String>.new'),
+            equals(MatchingLinkResult(Dnew)));
+        expect(referenceLookup(constructorTearoffs, 'F<T>.new'),
+            equals(MatchingLinkResult(Fnew)));
+        expect(
+            referenceLookup(
+                constructorTearoffs, 'F<InvalidThings, DoNotMatterHere>.new'),
+            equals(MatchingLinkResult(Fnew)));
+      });
+
+      test('negative tests', () {
+        expect(referenceLookup(constructorTearoffs, 'M.new'),
+            equals(MatchingLinkResult(null)));
+      });
     }, skip: !_constructorTearoffsAllowed.allows(utils.platformVersion));
   });
 

From 2e1457e5def645aad9f68a2cad34f59aa12ce274 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Fri, 3 Sep 2021 13:45:14 -0700
Subject: [PATCH 13/19] Add a few more cases and update analyzer version

---
 pubspec.yaml                               | 2 +-
 test/end2end/model_special_cases_test.dart | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 93b0d4a543..1871f9354f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: '>=2.11.99 <3.0.0'
 
 dependencies:
-  analyzer: ^2.1.0
+  analyzer: ^2.2.0
   args: ^2.0.0
   charcode: ^1.2.0
   collection: ^1.2.0
diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart
index 1cdf0f08df..e953a06ee4 100644
--- a/test/end2end/model_special_cases_test.dart
+++ b/test/end2end/model_special_cases_test.dart
@@ -216,8 +216,17 @@ void main() {
       });
 
       test('negative tests', () {
+        // Mixins do not have constructors.
         expect(referenceLookup(constructorTearoffs, 'M.new'),
             equals(MatchingLinkResult(null)));
+        // These things aren't expressions, parentheses are still illegal.
+        expect(referenceLookup(constructorTearoffs, '(C).new'),
+            equals(MatchingLinkResult(null)));
+
+        // A bare new will still not work to reference constructors.
+        // TODO(jcollins-g): reconsider this if we remove "new" as a hint.
+        expect(referenceLookup(A, 'new'), equals(MatchingLinkResult(null)));
+        expect(referenceLookup(At, 'new'), equals(MatchingLinkResult(null)));
       });
     }, skip: !_constructorTearoffsAllowed.allows(utils.platformVersion));
   });

From 16f1eb5c191cdb96ab8af9657ccffd6e57d98716 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Fri, 3 Sep 2021 14:30:55 -0700
Subject: [PATCH 14/19] Update to dartdoc 3.0.0

---
 CHANGELOG.md         | 11 +++++++++++
 dartdoc_options.yaml |  2 +-
 lib/src/version.dart |  2 +-
 pubspec.yaml         |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e47033a8da..b4673a4736 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 3.0.0
+* BREAKING CHANGE: Refactor of Class, Enum, and Mixin types result in some
+  deleted interfaces in templates and a change in class hierarchy. (#2770)
+* The experimental 'constructor-tearoffs' feature has been partially
+  implemented in dartdoc and should mostly work except constant
+  rendering. (#2655, #2770, #2768, #2766, #2763).
+* BREAKING CHANGE: The old lookup code has been deleted, along with the
+  `--no-enhanced-reference-lookup` flag. (#2765)
+* Deprecated uses of pub have been removed. (#2764)
+* Some internal refactors to support NNBD migration.
+
 ## 2.0.0
 * BREAKING CHANGE: changes to dartdoc options API
   to prepare for NNBD migration (#2745, #2744).
diff --git a/dartdoc_options.yaml b/dartdoc_options.yaml
index 242689dbfc..5e293ce510 100644
--- a/dartdoc_options.yaml
+++ b/dartdoc_options.yaml
@@ -1,4 +1,4 @@
 dartdoc:
   linkToSource:
     root: '.'
-    uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v2.0.0/%f%#L%l%'
+    uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v3.0.0/%f%#L%l%'
diff --git a/lib/src/version.dart b/lib/src/version.dart
index 0e58df3934..0ed1620d7d 100644
--- a/lib/src/version.dart
+++ b/lib/src/version.dart
@@ -1,2 +1,2 @@
 // Generated code. Do not modify.
-const packageVersion = '2.0.0';
+const packageVersion = '3.0.0';
diff --git a/pubspec.yaml b/pubspec.yaml
index 93b0d4a543..d3785252dd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dartdoc
 # Run `grind build` after updating.
-version: 2.0.0
+version: 3.0.0
 description: A non-interactive HTML documentation generator for Dart source code.
 homepage: https://github.com/dart-lang/dartdoc
 environment:

From c9c65102dca80490f2ffe26fe248027f952d35dd Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Fri, 3 Sep 2021 14:32:12 -0700
Subject: [PATCH 15/19] assume #2772 will land

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4673a4736..05b8760a93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
   deleted interfaces in templates and a change in class hierarchy. (#2770)
 * The experimental 'constructor-tearoffs' feature has been partially
   implemented in dartdoc and should mostly work except constant
-  rendering. (#2655, #2770, #2768, #2766, #2763).
+  rendering. (#2655, #2772, #2770, #2768, #2766, #2763).
 * BREAKING CHANGE: The old lookup code has been deleted, along with the
   `--no-enhanced-reference-lookup` flag. (#2765)
 * Deprecated uses of pub have been removed. (#2764)

From 058044e4b9b3f244e8af2675d59a17190fe30efd Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 7 Sep 2021 08:41:11 -0700
Subject: [PATCH 16/19] punt on 2772 until next release

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05b8760a93..19d700216e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,8 @@
 * BREAKING CHANGE: Refactor of Class, Enum, and Mixin types result in some
   deleted interfaces in templates and a change in class hierarchy. (#2770)
 * The experimental 'constructor-tearoffs' feature has been partially
-  implemented in dartdoc and should mostly work except constant
-  rendering. (#2655, #2772, #2770, #2768, #2766, #2763).
+  implemented in dartdoc and should work in simple cases. (#2655, #2770,
+  #2768, #2766, #2763).
 * BREAKING CHANGE: The old lookup code has been deleted, along with the
   `--no-enhanced-reference-lookup` flag. (#2765)
 * Deprecated uses of pub have been removed. (#2764)

From 18a1d5795339fac0b36dd2cbaf7b54668cb97d41 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 7 Sep 2021 13:50:10 -0700
Subject: [PATCH 17/19] Forgot to clean up these bits in the markdown renderer

---
 .../templates.aot_renderers_for_md.dart       | 115 ++++++------------
 lib/templates/md/_mixin.md                    |   4 -
 lib/templates/md/library.md                   |   2 +-
 3 files changed, 38 insertions(+), 83 deletions(-)
 delete mode 100644 lib/templates/md/_mixin.md

diff --git a/lib/src/generator/templates.aot_renderers_for_md.dart b/lib/src/generator/templates.aot_renderers_for_md.dart
index 453fa71caf..df7b6352e3 100644
--- a/lib/src/generator/templates.aot_renderers_for_md.dart
+++ b/lib/src/generator/templates.aot_renderers_for_md.dart
@@ -2459,7 +2459,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context9 != null) {
           for (var context10 in context9) {
             buffer.writeln();
-            buffer.write(_renderLibrary_partial_mixin_6(
+            buffer.write(_renderLibrary_partial_container_5(
                 context10, context8, context7, context0));
             buffer.writeln();
           }
@@ -2481,7 +2481,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context13 != null) {
           for (var context14 in context13) {
             buffer.writeln();
-            buffer.write(_renderLibrary_partial_extension_7(
+            buffer.write(_renderLibrary_partial_extension_6(
                 context14, context12, context11, context0));
             buffer.writeln();
           }
@@ -2503,7 +2503,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context17 != null) {
           for (var context18 in context17) {
             buffer.writeln();
-            buffer.write(_renderLibrary_partial_constant_8(
+            buffer.write(_renderLibrary_partial_constant_7(
                 context18, context16, context15, context0));
             buffer.writeln();
           }
@@ -2525,7 +2525,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context21 != null) {
           for (var context22 in context21) {
             buffer.writeln();
-            buffer.write(_renderLibrary_partial_property_9(
+            buffer.write(_renderLibrary_partial_property_8(
                 context22, context20, context19, context0));
             buffer.writeln();
           }
@@ -2547,7 +2547,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context25 != null) {
           for (var context26 in context25) {
             buffer.writeln();
-            buffer.write(_renderLibrary_partial_callable_10(
+            buffer.write(_renderLibrary_partial_callable_9(
                 context26, context24, context23, context0));
             buffer.writeln();
           }
@@ -2591,7 +2591,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
         if (context33 != null) {
           for (var context34 in context33) {
             buffer.writeln();
-            buffer.write(_renderLibrary_partial_typedef_11(
+            buffer.write(_renderLibrary_partial_typedef_10(
                 context34, context32, context31, context0));
             buffer.writeln();
           }
@@ -2622,7 +2622,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
     }
   }
   buffer.write('\n\n');
-  buffer.write(_renderLibrary_partial_footer_12(context0));
+  buffer.write(_renderLibrary_partial_footer_11(context0));
   buffer.writeln();
 
   return buffer.toString();
@@ -2744,48 +2744,7 @@ Categories:''');
   return buffer.toString();
 }
 
-String _renderLibrary_partial_mixin_6(_i16.Mixin context3, _i3.Library context2,
-    _i3.Library context1, _i1.LibraryTemplateData context0) {
-  final buffer = StringBuffer();
-  buffer.write('''##### ''');
-  buffer.write(context3.linkedName.toString());
-  buffer.write(context3.linkedGenericParameters.toString());
-  buffer.writeln();
-  buffer.write(__renderLibrary_partial_mixin_6_partial_categorization_0(
-      context3, context2, context1, context0));
-  buffer.write('\n\n');
-  buffer.write(context3.oneLineDoc.toString());
-  buffer.write(' ');
-  buffer.write(context3.extendedDocLink.toString());
-  buffer.writeln();
-
-  return buffer.toString();
-}
-
-String __renderLibrary_partial_mixin_6_partial_categorization_0(
-    _i16.Mixin context3,
-    _i3.Library context2,
-    _i3.Library context1,
-    _i1.LibraryTemplateData context0) {
-  final buffer = StringBuffer();
-  if (context3.hasCategoryNames == true) {
-    buffer.writeln();
-    buffer.write('''
-Categories:''');
-    var context4 = context3.displayedCategories;
-    if (context4 != null) {
-      for (var context5 in context4) {
-        buffer.writeln();
-        buffer.write(context5.categoryLabel.toString());
-      }
-    }
-  }
-  buffer.writeln();
-
-  return buffer.toString();
-}
-
-String _renderLibrary_partial_extension_7(
+String _renderLibrary_partial_extension_6(
     _i13.Extension context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -2794,7 +2753,7 @@ String _renderLibrary_partial_extension_7(
   buffer.write('''##### ''');
   buffer.write(context3.linkedName.toString());
   buffer.writeln();
-  buffer.write(__renderLibrary_partial_extension_7_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_extension_6_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context3.oneLineDoc.toString());
@@ -2805,7 +2764,7 @@ String _renderLibrary_partial_extension_7(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_extension_7_partial_categorization_0(
+String __renderLibrary_partial_extension_6_partial_categorization_0(
     _i13.Extension context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -2828,7 +2787,7 @@ Categories:''');
   return buffer.toString();
 }
 
-String _renderLibrary_partial_constant_8(
+String _renderLibrary_partial_constant_7(
     _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -2839,7 +2798,7 @@ String _renderLibrary_partial_constant_8(
   buffer.write(''' const ''');
   buffer.write(context3.modelType.linkedName.toString());
   buffer.writeln();
-  buffer.write(__renderLibrary_partial_constant_8_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_constant_7_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context3.oneLineDoc.toString());
@@ -2847,14 +2806,14 @@ String _renderLibrary_partial_constant_8(
   buffer.write(context3.extendedDocLink.toString());
   buffer.write('  ');
   buffer.writeln();
-  buffer.write(__renderLibrary_partial_constant_8_partial_features_1(
+  buffer.write(__renderLibrary_partial_constant_7_partial_features_1(
       context3, context2, context1, context0));
   buffer.writeln();
 
   return buffer.toString();
 }
 
-String __renderLibrary_partial_constant_8_partial_categorization_0(
+String __renderLibrary_partial_constant_7_partial_categorization_0(
     _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -2877,7 +2836,7 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderLibrary_partial_constant_8_partial_features_1(
+String __renderLibrary_partial_constant_7_partial_features_1(
     _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -2893,7 +2852,7 @@ String __renderLibrary_partial_constant_8_partial_features_1(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_property_9(
+String _renderLibrary_partial_property_8(
     _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -2906,7 +2865,7 @@ String _renderLibrary_partial_property_9(
   buffer.write(' ');
   buffer.write(context3.modelType.linkedName.toString());
   buffer.writeln();
-  buffer.write(__renderLibrary_partial_property_9_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_property_8_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context3.oneLineDoc.toString());
@@ -2914,14 +2873,14 @@ String _renderLibrary_partial_property_9(
   buffer.write(context3.extendedDocLink.toString());
   buffer.write('  ');
   buffer.writeln();
-  buffer.write(__renderLibrary_partial_property_9_partial_features_1(
+  buffer.write(__renderLibrary_partial_property_8_partial_features_1(
       context3, context2, context1, context0));
   buffer.writeln();
 
   return buffer.toString();
 }
 
-String __renderLibrary_partial_property_9_partial_categorization_0(
+String __renderLibrary_partial_property_8_partial_categorization_0(
     _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -2944,7 +2903,7 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderLibrary_partial_property_9_partial_features_1(
+String __renderLibrary_partial_property_8_partial_features_1(
     _i5.TopLevelVariable context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -2960,7 +2919,7 @@ String __renderLibrary_partial_property_9_partial_features_1(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_callable_10(
+String _renderLibrary_partial_callable_9(
     _i6.ModelFunctionTyped context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -2974,7 +2933,7 @@ String _renderLibrary_partial_callable_10(
   buffer.write(''') ''');
   buffer.write(context3.modelType.returnType.linkedName.toString());
   buffer.writeln();
-  buffer.write(__renderLibrary_partial_callable_10_partial_categorization_0(
+  buffer.write(__renderLibrary_partial_callable_9_partial_categorization_0(
       context3, context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context3.oneLineDoc.toString());
@@ -2982,14 +2941,14 @@ String _renderLibrary_partial_callable_10(
   buffer.write(context3.extendedDocLink.toString());
   buffer.write('  ');
   buffer.writeln();
-  buffer.write(__renderLibrary_partial_callable_10_partial_features_1(
+  buffer.write(__renderLibrary_partial_callable_9_partial_features_1(
       context3, context2, context1, context0));
   buffer.writeln();
 
   return buffer.toString();
 }
 
-String __renderLibrary_partial_callable_10_partial_categorization_0(
+String __renderLibrary_partial_callable_9_partial_categorization_0(
     _i6.ModelFunctionTyped context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -3012,7 +2971,7 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderLibrary_partial_callable_10_partial_features_1(
+String __renderLibrary_partial_callable_9_partial_features_1(
     _i6.ModelFunctionTyped context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -3028,7 +2987,7 @@ String __renderLibrary_partial_callable_10_partial_features_1(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_typedef_11(
+String _renderLibrary_partial_typedef_10(
     _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -3045,7 +3004,7 @@ String _renderLibrary_partial_typedef_11(
       buffer.write(''' = ''');
       buffer.write(context4.modelType.linkedName.toString());
       buffer.write('\n    ');
-      buffer.write(__renderLibrary_partial_typedef_11_partial_categorization_0(
+      buffer.write(__renderLibrary_partial_typedef_10_partial_categorization_0(
           context4, context3, context2, context1, context0));
       buffer.write('\n\n    ');
       buffer.write(context4.oneLineDoc.toString());
@@ -3053,13 +3012,13 @@ String _renderLibrary_partial_typedef_11(
       buffer.write(context4.extendedDocLink.toString());
       buffer.write('  ');
       buffer.write('\n    ');
-      buffer.write(__renderLibrary_partial_typedef_11_partial_features_1(
+      buffer.write(__renderLibrary_partial_typedef_10_partial_features_1(
           context4, context3, context2, context1, context0));
     }
   }
   if (context3.isCallable != true) {
     buffer.write('\n  ');
-    buffer.write(__renderLibrary_partial_typedef_11_partial_type_2(
+    buffer.write(__renderLibrary_partial_typedef_10_partial_type_2(
         context3, context2, context1, context0));
   }
   buffer.writeln();
@@ -3067,7 +3026,7 @@ String _renderLibrary_partial_typedef_11(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_typedef_11_partial_categorization_0(
+String __renderLibrary_partial_typedef_10_partial_categorization_0(
     _i7.FunctionTypedef context4,
     _i7.Typedef context3,
     _i3.Library context2,
@@ -3091,7 +3050,7 @@ Categories:''');
   return buffer.toString();
 }
 
-String __renderLibrary_partial_typedef_11_partial_features_1(
+String __renderLibrary_partial_typedef_10_partial_features_1(
     _i7.FunctionTypedef context4,
     _i7.Typedef context3,
     _i3.Library context2,
@@ -3108,7 +3067,7 @@ String __renderLibrary_partial_typedef_11_partial_features_1(
   return buffer.toString();
 }
 
-String __renderLibrary_partial_typedef_11_partial_type_2(
+String __renderLibrary_partial_typedef_10_partial_type_2(
     _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -3121,7 +3080,7 @@ String __renderLibrary_partial_typedef_11_partial_type_2(
   buffer.write(context3.modelType.linkedName.toString());
   buffer.writeln();
   buffer.write(
-      ___renderLibrary_partial_typedef_11_partial_type_2_partial_categorization_0(
+      ___renderLibrary_partial_typedef_10_partial_type_2_partial_categorization_0(
           context3, context2, context1, context0));
   buffer.write('\n\n');
   buffer.write(context3.oneLineDoc.toString());
@@ -3130,7 +3089,7 @@ String __renderLibrary_partial_typedef_11_partial_type_2(
   buffer.write('  ');
   buffer.writeln();
   buffer.write(
-      ___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
+      ___renderLibrary_partial_typedef_10_partial_type_2_partial_features_1(
           context3, context2, context1, context0));
   buffer.writeln();
 
@@ -3138,7 +3097,7 @@ String __renderLibrary_partial_typedef_11_partial_type_2(
 }
 
 String
-    ___renderLibrary_partial_typedef_11_partial_type_2_partial_categorization_0(
+    ___renderLibrary_partial_typedef_10_partial_type_2_partial_categorization_0(
         _i7.Typedef context3,
         _i3.Library context2,
         _i3.Library context1,
@@ -3161,7 +3120,7 @@ Categories:''');
   return buffer.toString();
 }
 
-String ___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
+String ___renderLibrary_partial_typedef_10_partial_type_2_partial_features_1(
     _i7.Typedef context3,
     _i3.Library context2,
     _i3.Library context1,
@@ -3177,7 +3136,7 @@ String ___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
   return buffer.toString();
 }
 
-String _renderLibrary_partial_footer_12(_i1.LibraryTemplateData context0) {
+String _renderLibrary_partial_footer_11(_i1.LibraryTemplateData context0) {
   final buffer = StringBuffer();
   buffer.writeln();
   buffer.write(context0.customInnerFooter.toString());
diff --git a/lib/templates/md/_mixin.md b/lib/templates/md/_mixin.md
deleted file mode 100644
index e5dac11ac0..0000000000
--- a/lib/templates/md/_mixin.md
+++ /dev/null
@@ -1,4 +0,0 @@
-##### {{{linkedName}}}{{{linkedGenericParameters}}}
-{{>categorization}}
-
-{{{ oneLineDoc }}} {{{ extendedDocLink }}}
diff --git a/lib/templates/md/library.md b/lib/templates/md/library.md
index 0d4cee06a4..bb0f947525 100644
--- a/lib/templates/md/library.md
+++ b/lib/templates/md/library.md
@@ -25,7 +25,7 @@
 ## Mixins
 
 {{#library.publicMixinsSorted}}
-{{>mixin}}
+{{>container}}
 
 {{/library.publicMixinsSorted}}
 {{/library.hasPublicMixins}}

From a788c66bf9dddb8e8e809161c110f661e561b9bc Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 7 Sep 2021 15:42:00 -0700
Subject: [PATCH 18/19] review comments

---
 lib/src/comment_references/parser.dart  | 70 ++++++++++++-------------
 test/comment_referable/parser_test.dart |  2 +
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/lib/src/comment_references/parser.dart b/lib/src/comment_references/parser.dart
index 502fdaf57f..0f709823fe 100644
--- a/lib/src/comment_references/parser.dart
+++ b/lib/src/comment_references/parser.dart
@@ -93,7 +93,7 @@ class CommentReferenceParser {
   /// ```text
   ///   <rawCommentReference> ::= <prefix>?<commentReference><suffix>?
   ///
-  ///   <commentReference> ::= (<packageName> '.')? (<libraryName> '.')? <dartdocIdentifier> <typeParameters> ('.' <identifier> <typeParameters>)*
+  ///   <commentReference> ::= (<packageName> '.')? (<libraryName> '.')? <dartdocIdentifier> <typeArguments> ('.' <identifier> <typeArguments>)*
   /// ```
   List<CommentReferenceNode> _parseRawCommentReference() {
     var children = <CommentReferenceNode>[];
@@ -121,16 +121,16 @@ class CommentReferenceParser {
       } else if (identifierResult.type ==
           _IdentifierResultType.parsedIdentifier) {
         children.add(identifierResult.node);
-        var typeParametersResult = _parseTypeParameters();
-        if (typeParametersResult.type == _TypeParametersResultType.endOfFile) {
+        var typeVariablesResult = _parseTypeVariables();
+        if (typeVariablesResult.type == _TypeVariablesResultType.endOfFile) {
           break;
-        } else if (typeParametersResult.type ==
-            _TypeParametersResultType.notTypeParameters) {
+        } else if (typeVariablesResult.type ==
+            _TypeVariablesResultType.notTypeVariables) {
           // Do nothing, _index has not moved.
           ;
-        } else if (typeParametersResult.type ==
-            _TypeParametersResultType.parsedTypeParameters) {
-          children.add(typeParametersResult.node);
+        } else if (typeVariablesResult.type ==
+            _TypeVariablesResultType.parsedTypeVariables) {
+          children.add(typeVariablesResult.node);
         }
       }
       if (_atEnd || _thisChar != $dot) {
@@ -247,20 +247,20 @@ class CommentReferenceParser {
         IdentifierNode(codeRef.substring(startIndex, _index)));
   }
 
-  /// Parse a list of type parameters.
+  /// Parse a list of type variables (arguments or parameters).
   ///
   /// Dartdoc isolates these where present and potentially valid, but we don't
   /// break them down.
-  _TypeParametersParseResult _parseTypeParameters() {
+  _TypeVariablesParseResult _parseTypeVariables() {
     if (_atEnd) {
-      return _TypeParametersParseResult.endOfFile;
+      return _TypeVariablesParseResult.endOfFile;
     }
     var startIndex = _index;
     if (_matchBraces($lt, $gt)) {
-      return _TypeParametersParseResult.ok(
-          TypeParametersNode(codeRef.substring(startIndex + 1, _index - 1)));
+      return _TypeVariablesParseResult.ok(
+          TypeVariablesNode(codeRef.substring(startIndex + 1, _index - 1)));
     }
-    return _TypeParametersParseResult.notIdentifier;
+    return _TypeVariablesParseResult.notIdentifier;
   }
 
   static const _callableHintSuffix = '()';
@@ -421,30 +421,30 @@ class _IdentifierParseResult {
       _IdentifierParseResult._(_IdentifierResultType.notIdentifier, null);
 }
 
-enum _TypeParametersResultType {
+enum _TypeVariablesResultType {
   endOfFile, // Found end of file instead of the beginning of a list of type
-  // parameters.
-  notTypeParameters, // Found something, but it isn't type parameters.
-  parsedTypeParameters, // Found type parameters.
+  // variables.
+  notTypeVariables, // Found something, but it isn't type variables.
+  parsedTypeVariables, // Found type variables.
 }
 
-class _TypeParametersParseResult {
-  final _TypeParametersResultType type;
+class _TypeVariablesParseResult {
+  final _TypeVariablesResultType type;
 
-  final TypeParametersNode node;
+  final TypeVariablesNode node;
 
-  const _TypeParametersParseResult._(this.type, this.node);
+  const _TypeVariablesParseResult._(this.type, this.node);
 
-  factory _TypeParametersParseResult.ok(TypeParametersNode node) =>
-      _TypeParametersParseResult._(
-          _TypeParametersResultType.parsedTypeParameters, node);
+  factory _TypeVariablesParseResult.ok(TypeVariablesNode node) =>
+      _TypeVariablesParseResult._(
+          _TypeVariablesResultType.parsedTypeVariables, node);
 
-  static const _TypeParametersParseResult endOfFile =
-      _TypeParametersParseResult._(_TypeParametersResultType.endOfFile, null);
+  static const _TypeVariablesParseResult endOfFile =
+      _TypeVariablesParseResult._(_TypeVariablesResultType.endOfFile, null);
 
-  static const _TypeParametersParseResult notIdentifier =
-      _TypeParametersParseResult._(
-          _TypeParametersResultType.notTypeParameters, null);
+  static const _TypeVariablesParseResult notIdentifier =
+      _TypeVariablesParseResult._(
+          _TypeVariablesResultType.notTypeVariables, null);
 }
 
 enum _SuffixResultType {
@@ -512,18 +512,18 @@ class IdentifierNode extends CommentReferenceNode {
   String toString() => 'Identifier["$text"]';
 }
 
-/// Represents one or more type parameters, may be
+/// Represents one or more type variables, may be
 /// comma separated.
-class TypeParametersNode extends CommentReferenceNode {
+class TypeVariablesNode extends CommentReferenceNode {
   @override
 
   /// Note that this will contain commas, spaces, and other text, as
-  /// generally type parameters are a form of junk that comment references
+  /// generally type variables are a form of junk that comment references
   /// should ignore.
   final String text;
 
-  TypeParametersNode(this.text);
+  TypeVariablesNode(this.text);
 
   @override
-  String toString() => 'TypeParametersNode["$text"]';
+  String toString() => 'TypeVariablesNode["$text"]';
 }
diff --git a/test/comment_referable/parser_test.dart b/test/comment_referable/parser_test.dart
index 49d5905633..12d9b97c68 100644
--- a/test/comment_referable/parser_test.dart
+++ b/test/comment_referable/parser_test.dart
@@ -83,6 +83,8 @@ void main() {
 
     test('Check that embedded types within tearoff-like constructs parse', () {
       expectParseEquivalent('this<stuff>.isValid', ['this', 'isValid']);
+      expectParseEquivalent(
+          'this<stuff, is, also>.isValid', ['this', 'isValid']);
       expectParseEquivalent('this<stuff<that<is, real>, complicated>>.isValid',
           ['this', 'isValid']);
       expectParseError('this<stuff.isntValid');

From 2f11e3e844305472763179a6f778a9185a21f706 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 7 Sep 2021 17:12:33 -0700
Subject: [PATCH 19/19] opt-out for inheriting container

---
 lib/src/model/inheriting_container.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
index 445c5f4a89..39a202ed1a 100644
--- a/lib/src/model/inheriting_container.dart
+++ b/lib/src/model/inheriting_container.dart
@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// @dart=2.9
+
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:dartdoc/src/element_type.dart';