Change element type expectations for function aliases (#2380)

* Retype typedefs for FunctionTyped change in analyzer

* workaround for 0.40

* dartfmt

* fix hints

Author: jcollins-g

lib/src/element_type.dart

@@ -37,8 +37,11 @@ abstract class ElementType extends Privacy {
     } else {
       var element = ModelElement.fromElement(f.element, packageGraph);
       assert(f is ParameterizedType || f is TypeParameterType);
+      // TODO(jcollins-g): Remove reference to f.element.enclosingElement after
+      // analyzer 0.41.
       var isGenericTypeAlias =
-          f.element.enclosingElement is GenericTypeAliasElement;
+          f.element.enclosingElement is GenericTypeAliasElement ||
+              f.element is GenericTypeAliasElement;
       if (f is FunctionType) {
         assert(f is ParameterizedType);
         if (isGenericTypeAlias) {

lib/src/model/top_level_container.dart

@@ -68,6 +68,5 @@ abstract class TopLevelContainer implements Nameable {
   Iterable<TopLevelVariable> get publicProperties =>
       model_utils.filterNonPublic(properties);
 
-  Iterable<ModelFunctionTyped> get publicTypedefs =>
-      model_utils.filterNonPublic(typedefs);
+  Iterable<Typedef> get publicTypedefs => model_utils.filterNonPublic(typedefs);
 }

lib/src/model/typedef.dart

@@ -9,7 +9,7 @@ import 'package:dartdoc/src/render/typedef_renderer.dart';
 
 class Typedef extends ModelElement
     with TypeParameters, Categorization
-    implements EnclosedElement, ModelFunctionTyped {
+    implements EnclosedElement {
   Typedef(FunctionTypeAliasElement element, Library library,
       PackageGraph packageGraph)
       : super(element, library, packageGraph, null);
@@ -44,17 +44,17 @@ class Typedef extends ModelElement
   }
 
   // Food for mustache.
-  @override
   bool get isInherited => false;
 
   @override
   String get kind => 'typedef';
 
-  @override
   String get linkedReturnType => modelType.createLinkedReturnTypeName();
 
   @override
-  DefinedElementType get modelType => super.modelType;
+  // TODO(jcollins-g): change to FunctionTypeElementType after analyzer 0.41
+  // ignore: unnecessary_overrides
+  ElementType get modelType => super.modelType;
 
   FunctionTypeAliasElement get _typedef =>
       (element as FunctionTypeAliasElement);