Introduce basic generic type alias support for dartdoc

lib/src/element_type.dart

@@ -273,7 +273,7 @@ abstract class DefinedElementType extends ElementType {
 
   @override
   List<Parameter> get parameters =>
-      element.canHaveParameters ? element.parameters : [];
+      element.isCallable ? element.parameters : [];
 
   ModelElement get returnElement => element;
   ElementType _returnType;

lib/src/generator/templates.dart

@@ -42,6 +42,10 @@ const _partials_html = <String>[
   'source_code',
   'source_link',
   'sidebar_for_library',
+  'type',
+  'type_multiline',
+  'typedef',
+  'typedef_multiline',
   'accessor_getter',
   'accessor_setter',
 ];
@@ -66,6 +70,10 @@ const _partials_md = <String>[
   'property',
   'source_code',
   'source_link',
+  'type',
+  'type_multiline',
+  'typedef',
+  'typedef_multiline',
 ];
 
 abstract class _TemplatesLoader {

lib/src/model/getter_setter_combo.dart

@@ -190,7 +190,7 @@ mixin GetterSetterCombo on ModelElement {
   }
 
   @override
-  bool get canHaveParameters => hasSetter;
+  bool get isCallable => hasSetter;
 
   @override
   List<Parameter> get parameters => setter.parameters;

lib/src/model/library.dart

@@ -104,9 +104,9 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
       compilationUnit.enums,
       compilationUnit.extensions,
       compilationUnit.functions,
-      compilationUnit.functionTypeAliases,
       compilationUnit.mixins,
       compilationUnit.topLevelVariables,
+      compilationUnit.typeAliases,
       compilationUnit.types,
     ]);
   }
@@ -493,7 +493,7 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
   @override
   List<Typedef> get typedefs {
     _typedefs ??= _exportedAndLocalElements
-        .whereType<FunctionTypeAliasElement>()
+        .whereType<TypeAliasElement>()
         .map((e) => ModelElement.from(e, this, packageGraph) as Typedef)
         .toList(growable: false);
     return _typedefs;

lib/src/model/model_element.dart

@@ -8,6 +8,7 @@ library dartdoc.models;
 import 'dart:convert';
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart' show FunctionType;
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/member.dart'
@@ -333,7 +334,10 @@ abstract class ModelElement extends Canonicalization
       assert(e.enclosingElement.name != '');
       return ModelFunctionTypedef(e, library, packageGraph);
     }
-    if (e is FunctionTypeAliasElement) {
+    if (e is TypeAliasElement) {
+      if (e.aliasedType is FunctionType) {
+        return FunctionTypedef(e, library, packageGraph);
+      }
       return Typedef(e, library, packageGraph);
     }
     if (e is ConstructorElement) {
@@ -543,10 +547,8 @@ abstract class ModelElement extends Canonicalization
     return allFeatures.join(', ');
   }
 
-  bool get canHaveParameters =>
-      element is ExecutableElement ||
-      element is FunctionTypedElement ||
-      element is FunctionTypeAliasElement;
+  bool get isCallable =>
+      element is FunctionTypedElement || element is FunctionTypeAliasElement;
 
   ModelElement buildCanonicalModelElement() {
     Container preferredClass;
@@ -998,9 +1000,9 @@ abstract class ModelElement extends Canonicalization
         }
       } else if (element is ClassElement) {
         _modelType = ElementType.from(element.thisType, library, packageGraph);
-      } else if (element is FunctionTypeAliasElement) {
+      } else if (element is TypeAliasElement) {
         _modelType =
-            ElementType.from(element.function.type, library, packageGraph);
+            ElementType.from(element.aliasedType, library, packageGraph);
       } else if (element is FunctionTypedElement) {
         _modelType = ElementType.from(element.type, library, packageGraph);
       } else if (element is ParameterElement) {
@@ -1050,7 +1052,7 @@ abstract class ModelElement extends Canonicalization
           (this as GetterSetterCombo).setter != null) {
         newParameters.addAll((this as GetterSetterCombo).setter.parameters);
       } else {
-        if (canHaveParameters) newParameters.addAll(parameters);
+        if (isCallable) newParameters.addAll(parameters);
       }
       while (newParameters.isNotEmpty) {
         recursedParameters.addAll(newParameters);
@@ -1070,7 +1072,7 @@ abstract class ModelElement extends Canonicalization
   path.Context get pathContext => packageGraph.resourceProvider.pathContext;
 
   List<Parameter> get parameters {
-    if (!canHaveParameters) {
+    if (!isCallable) {
       throw StateError('$element cannot have parameters');
     }
 

lib/src/model/typedef.dart

@@ -3,17 +3,21 @@
 // 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:analyzer/dart/element/type.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/render/typedef_renderer.dart';
 
 class Typedef extends ModelElement
     with TypeParameters, Categorization
     implements EnclosedElement {
-  Typedef(FunctionTypeAliasElement element, Library library,
-      PackageGraph packageGraph)
+  Typedef(TypeAliasElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph);
 
+  DartType get aliasedType => element.aliasedType;
+
+  @override
+  TypeAliasElement get element => super.element;
+
   @override
   ModelElement get enclosingElement => library;
 
@@ -23,12 +27,8 @@ class Typedef extends ModelElement
   @override
   String get genericParameters => _renderer.renderGenericParameters(this);
 
-  List<TypeParameterElement> get genericTypeParameters {
-    if (element is FunctionTypeAliasElement) {
-      return (element as FunctionTypeAliasElement).function.typeParameters;
-    }
-    return Iterable<TypeParameterElement>.empty();
-  }
+  List<TypeParameterElement> get genericTypeParameters =>
+      element.typeParameters;
 
   @override
   String get filePath => '${library.dirName}/$fileName';
@@ -52,17 +52,31 @@ class Typedef extends ModelElement
   String get linkedReturnType => modelType.createLinkedReturnTypeName();
 
   @override
-  // TODO(jcollins-g): change to FunctionTypeElementType after analyzer 0.41
-  // ignore: unnecessary_overrides
-  ElementType get modelType => super.modelType;
-
-  FunctionTypeAliasElement get _typedef =>
-      (element as FunctionTypeAliasElement);
-
-  @override
-  List<TypeParameter> get typeParameters => _typedef.typeParameters.map((f) {
+  List<TypeParameter> get typeParameters => element.typeParameters.map((f) {
         return ModelElement.from(f, library, packageGraph) as TypeParameter;
       }).toList();
 
   TypedefRenderer get _renderer => packageGraph.rendererFactory.typedefRenderer;
 }
+
+/// A typedef referring to a function type.
+class FunctionTypedef extends Typedef {
+  FunctionTypedef(
+      TypeAliasElement element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph);
+
+  @override
+  FunctionType get aliasedType => super.aliasedType;
+
+  @override
+  List<TypeParameterElement> get genericTypeParameters {
+    var aliasedTypeElement = aliasedType.element;
+    if (aliasedTypeElement is FunctionTypedElement) {
+      return aliasedTypeElement.typeParameters;
+    }
+    if (aliasedType.typeFormals.isNotEmpty == true) {
+      return aliasedType.typeFormals;
+    }
+    return super.genericTypeParameters;
+  }
+}

lib/templates/html/_callable_multiline.html

@@ -7,5 +7,6 @@
   </ol>
 </div>
 {{/hasAnnotations}}
+
 <span class="returntype">{{{ linkedReturnType }}}</span>
 {{>name_summary}}{{{genericParameters}}}(<wbr>{{#hasParameters}}{{{linkedParamsLines}}}{{/hasParameters}})

lib/templates/html/_name_summary.html

@@ -1 +1 @@
-{{#isConst}}const {{/isConst}}<span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{name}}</span>
+{{#isConst}}const {{/isConst}}<span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{name}}</span>

lib/templates/html/_type.html

@@ -0,0 +1,11 @@
+<dt id="{{htmlId}}" class="{{ #isInherited }} inherited{{ /isInherited}}">
+  <span class="name{{#isDeprecated}} deprecated{{/isDeprecated}}">{{{linkedName}}}</span>{{{linkedGenericParameters}}}
+    = 
+    <span class="returntype parameter">{{{ linkedReturnType }}}</span>
+  </span>
+  {{>categorization}}
+</dt>
+<dd{{ #isInherited }} class="inherited"{{ /isInherited}}>
+  {{{ oneLineDoc }}} {{{ extendedDocLink }}}
+  {{>features}}
+</dd>

lib/templates/html/_type_multiline.html

@@ -0,0 +1,10 @@
+{{#hasAnnotations}}
+<div>
+  <ol class="annotation-list">
+    {{#annotations}}
+    <li>{{{.}}}</li>
+    {{/annotations}}
+  </ol>
+</div>
+{{/hasAnnotations}}
+{{>name_summary}}{{{genericParameters}}} = <span class="returntype"> {{{linkedReturnType}}}</span>

lib/templates/html/_typedef.html

@@ -0,0 +1,6 @@
+{{#isCallable}}
+  {{>callable}}
+{{/isCallable}}
+{{^isCallable}}
+  {{>type}}
+{{/isCallable}}

lib/templates/html/_typedef_multiline.html

@@ -0,0 +1,6 @@
+{{#isCallable}}
+  {{>callable_multiline}}
+{{/isCallable}}
+{{^isCallable}}
+  {{>type_multiline}}
+{{/isCallable}}

lib/templates/html/category.html

@@ -101,7 +101,7 @@ <h2>Typedefs</h2>
 
     <dl class="callables">
       {{#publicTypedefsSorted}}
-      {{>callable}}
+      {{>typedef}}
       {{/publicTypedefsSorted}}
     </dl>
   </section>
@@ -126,4 +126,4 @@ <h5>{{self.name}} {{self.kind}}</h5>
   {{>sidebar_for_category}}
 </div>
 <!--/sidebar-offcanvas-right-->
-{{>footer}}
+{{>footer}}

lib/templates/html/library.html

@@ -103,9 +103,9 @@ <h2>Enums</h2>
     <section class="summary offset-anchor" id="typedefs">
       <h2>Typedefs</h2>
 
-      <dl class="callables">
+      <dl>
         {{#library.publicTypedefsSorted}}
-        {{>callable}}
+          {{>typedef}}
         {{/library.publicTypedefsSorted}}
       </dl>
     </section>

lib/templates/html/typedef.html

@@ -13,7 +13,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
 
     <section class="multi-line-signature">
       {{#typeDef}}
-        {{>callable_multiline}}
+        {{>typedef_multiline}}
       {{/typeDef}}
     </section>
 

lib/templates/md/_type.md

@@ -0,0 +1,5 @@
+##### {{{linkedName}}}{{{linkedGenericParameters}}}({{{ linkedParamsNoMetadata }}}) {{{ linkedReturnType }}}
+{{>categorization}}
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}  {{!two spaces intentional}}
+{{>features}}

lib/templates/md/_type_multiline.md

@@ -0,0 +1,7 @@
+{{#hasAnnotations}}
+{{#annotations}}
+- {{{.}}}
+{{/annotations}}
+{{/hasAnnotations}}
+
+{{>name_summary}}{{{genericParameters}}} = {{{linkedReturnType}}}

lib/templates/md/_typedef.md

@@ -0,0 +1,6 @@
+{{#isCallable}}
+  {{>callable}}
+{{/isCallable}}
+{{^isCallable}}
+  {{>type}}
+{{/isCallable}}

lib/templates/md/_typedef_multiline.md

@@ -0,0 +1,6 @@
+{{#isCallable}}
+  {{>callable_multiline}}
+{{/isCallable}}
+{{^isCallable}}
+  {{>type_multiline}}
+{{/isCallable}}

lib/templates/md/category.md

@@ -72,7 +72,7 @@
 ## Typedefs
 
 {{#publicTypedefsSorted}}
-{{>callable}}
+{{>typedef}}
 
 {{/publicTypedefsSorted}}
 {{/hasPublicTypedefs}}

lib/templates/md/library.md

@@ -79,7 +79,7 @@
 ## Typedefs
 
 {{#library.publicTypedefsSorted}}
-{{>callable}}
+{{>typedef}}
 
 {{/library.publicTypedefsSorted}}
 {{/library.hasPublicTypedefs}}

lib/templates/md/typedef.md

@@ -9,7 +9,7 @@
 {{/self}}
 
 {{#typeDef}}
-{{>callable_multiline}}
+{{>typedef_multiline}}
 
 {{>documentation}}
 

pubspec.yaml

@@ -7,7 +7,7 @@ environment:
   sdk: '>=2.11.99 <3.0.0'
 
 dependencies:
-  analyzer: ^1.0.0
+  analyzer: ^1.1.0
   args: ^2.0.0
   charcode: ^1.2.0
   collection: ^1.2.0