Add support for GenericFunctionTypeElementImpl

lib/src/model.dart

@@ -1394,16 +1394,26 @@ abstract class GetterSetterCombo implements ModelElement {
 
     if (hasGetter && !getter.element.isSynthetic) {
       assert(getter.documentationFrom.length == 1);
-      String docs = getter.documentationFrom.first.computeDocumentationComment;
-      if (docs != null) buffer.write(docs);
+      // We have to check against dropTextList here since documentationFrom
+      // doesn't yield the real elements for GetterSetterCombos.
+      if (!config.dropTextFrom
+          .contains(getter.documentationFrom.first.element.library.name)) {
+        String docs =
+            getter.documentationFrom.first.computeDocumentationComment;
+        if (docs != null) buffer.write(docs);
+      }
     }
 
     if (hasSetter && !setter.element.isSynthetic) {
       assert(setter.documentationFrom.length == 1);
-      String docs = setter.documentationFrom.first.computeDocumentationComment;
-      if (docs != null) {
-        if (buffer.isNotEmpty) buffer.write('\n\n');
-        buffer.write(docs);
+      if (!config.dropTextFrom
+          .contains(setter.documentationFrom.first.element.library.name)) {
+        String docs =
+            setter.documentationFrom.first.computeDocumentationComment;
+        if (docs != null) {
+          if (buffer.isNotEmpty) buffer.write('\n\n');
+          buffer.write(docs);
+        }
       }
     }
     return buffer.toString();
@@ -2225,6 +2235,10 @@ abstract class ModelElement extends Nameable
         newModelElement = new Parameter(e, library);
       }
     }
+    // TODO(jcollins-g): Consider subclass for ModelFunctionTyped.
+    if (e is GenericFunctionTypeElement) {
+      newModelElement = new ModelFunctionTyped(e, library);
+    }
     if (newModelElement == null) throw "Unknown type ${e.runtimeType}";
     if (enclosingClass != null) assert(newModelElement is Inheritable);
     if (library != null) {
@@ -2333,7 +2347,8 @@ abstract class ModelElement extends Nameable
     return md.map((dynamic a) {
       String annotation = (const HtmlEscape()).convert(a.toSource());
       // a.element can be null if the element can't be resolved.
-      var me = package.findCanonicalModelElementFor(a.element?.enclosingElement);
+      var me =
+          package.findCanonicalModelElementFor(a.element?.enclosingElement);
       if (me != null)
         annotation = annotation.replaceFirst(me.name, me.linkedName);
       return annotation;
@@ -2363,7 +2378,7 @@ abstract class ModelElement extends Nameable
   }
 
   bool get canHaveParameters =>
-      element is ExecutableElement || element is FunctionTypeAliasElement;
+      element is ExecutableElement || element is FunctionTypedElement;
 
   List<ModelElement> _documentationFrom;
   // TODO(jcollins-g): untangle when mixins can call super
@@ -2762,13 +2777,8 @@ abstract class ModelElement extends Nameable
 
     List<ParameterElement> params;
 
-    if (element is ExecutableElement) {
-      // the as check silences the warning
-      params = (element as ExecutableElement).parameters;
-    }
-
-    if (element is FunctionTypeAliasElement) {
-      params = (element as FunctionTypeAliasElement).parameters;
+    if (element is FunctionTypedElement) {
+      params = (element as FunctionTypedElement).parameters;
     }
 
     _parameters = new UnmodifiableListView<Parameter>(params
@@ -3127,12 +3137,25 @@ abstract class ModelElement extends Nameable
   }
 }
 
-class ModelFunction extends ModelElement
+class ModelFunction extends ModelFunctionTyped {
+  ModelFunction(FunctionElement element, Library library)
+      : super(element, library);
+
+  @override
+  bool get isStatic {
+    return _func.isStatic;
+  }
+
+  @override
+  FunctionElement get _func => (element as FunctionElement);
+}
+
+class ModelFunctionTyped extends ModelElement
     with SourceCodeMixin
     implements EnclosedElement {
   List<TypeParameter> typeParameters = [];
 
-  ModelFunction(FunctionElement element, Library library)
+  ModelFunctionTyped(FunctionTypedElement element, Library library)
       : super(element, library) {
     _modelType = new ElementType(_func.type, this);
     _calcTypeParameters();
@@ -3162,9 +3185,6 @@ class ModelFunction extends ModelElement
     return '${canonicalLibrary.dirName}/$fileName';
   }
 
-  @override
-  bool get isStatic => _func.isStatic;
-
   @override
   String get kind => 'function';
 
@@ -3182,7 +3202,7 @@ class ModelFunction extends ModelElement
     return '&lt;${typeParameters.map((t) => t.name).join(', ')}&gt;';
   }
 
-  FunctionElement get _func => (element as FunctionElement);
+  FunctionTypedElement get _func => (element as FunctionTypedElement);
 }
 
 /// Something that has a name.
@@ -4229,7 +4249,14 @@ class Parameter extends ModelElement implements EnclosedElement {
   }
 
   @override
-  String get htmlId => '${_parameter.enclosingElement.name}-param-${name}';
+  String get htmlId {
+    String enclosingName = _parameter.enclosingElement.name;
+    if (_parameter.enclosingElement is GenericFunctionTypeElement) {
+      // TODO(jcollins-g): Drop when GenericFunctionTypeElement populates name.
+      enclosingName = _parameter.enclosingElement.enclosingElement.name;
+    }
+    return '${enclosingName}-param-${name}';
+  }
 
   bool get isOptional => _parameter.parameterKind.isOptional;
 

pubspec.lock

@@ -6,7 +6,7 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.30.0"
+    version: "0.31.0-alpha.1"
   ansicolor:
     description:
       name: ansicolor
@@ -48,7 +48,7 @@ packages:
       name: cli_util
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+2"
+    version: "0.1.2"
   collection:
     description:
       name: collection
@@ -66,7 +66,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   csslib:
     description:
       name: csslib
@@ -78,7 +78,7 @@ packages:
       name: front_end
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0-alpha.4"
+    version: "0.1.0-alpha.6"
   glob:
     description:
       name: glob
@@ -121,12 +121,18 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
+  js:
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.1"
   kernel:
     description:
       name: kernel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0-alpha.1"
+    version: "0.3.0-alpha.3"
   logging:
     description:
       name: logging
@@ -150,7 +156,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.1"
   mime:
     description:
       name: mime
@@ -169,12 +175,18 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  node_preamble:
+    description:
+      name: node_preamble
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.0"
   package_config:
     description:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   package_resolver:
     description:
       name: package_resolver
@@ -294,7 +306,7 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.20+13"
+    version: "0.12.24+2"
   tuple:
     description:
       name: tuple
@@ -331,23 +343,11 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
-  when:
-    description:
-      name: when
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.0"
-  which:
-    description:
-      name: which
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.3"
   yaml:
     description:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.12"
 sdks:
-  dart: ">=1.23.0-dev.11.5 <2.0.0"
+  dart: ">=1.24.2 <2.0.0-dev.infinity"

pubspec.yaml

@@ -5,9 +5,9 @@ author: Dart Team <[email protected]>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc
 environment:
-  sdk: '>=1.23.0-dev.11.5 <2.0.0-dev.infinity'
+  sdk: '>=1.24.2 <2.0.0-dev.infinity'
 dependencies:
-  analyzer: ^0.30.0
+  analyzer: '>=0.31.0-alpha.0 <0.32.0'
   args: ^0.13.0
   collection: ^1.2.0
   html: '>=0.12.1 <0.14.0'

test/model_test.dart

@@ -1207,6 +1207,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     Field sFromApple, mFromApple, mInB, autoCompress;
     Field isEmpty;
     Field implicitGetterExplicitSetter, explicitGetterImplicitSetter;
+    Field ExtraSpecialListLength;
 
     setUp(() {
       c = exLibrary.classes.firstWhere((c) => c.name == 'Apple');
@@ -1252,6 +1253,13 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .firstWhere((c) => c.name == 'B')
           .allInstanceProperties
           .firstWhere((p) => p.name == 'autoCompress');
+      ExtraSpecialListLength =
+          fakeLibrary.classes.firstWhere((c) => c.name == 'SpecialList').allInstanceProperties.firstWhere((f) => f.name == 'length');
+    });
+
+    test('inheritance of docs from SDK works for getter/setter combos', () {
+      expect(ExtraSpecialListLength.getter.documentationFrom.first.element.library.name == 'dart.core', isTrue);
+      expect(ExtraSpecialListLength.oneLineDoc == '', isFalse);
     });
 
     test('split inheritance with explicit setter works', () {

testing/test_package_docs/fake/NewGenericTypedef.html

@@ -120,7 +120,7 @@ <h5>library fake</h5>
 
     <section class="multi-line-signature">
         <span class="returntype">List&lt;S&gt;</span>
-        <span class="name ">NewGenericTypedef</span>&lt;S&gt;(<wbr><span class="parameter" id="-param-"><span class="type-annotation">T</span></span> <span class="parameter" id="-param-"><span class="type-annotation">T</span></span> <span class="parameter" id="-param-"><span class="type-annotation">T</span></span>)
+        <span class="name ">NewGenericTypedef</span>&lt;S&gt;(<wbr><span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span></span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span></span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span></span>)
     </section>
 
     <section class="desc markdown">

testing/test_package_docs/fake/fake-library.html

@@ -602,7 +602,7 @@ <h2>Typedefs</h2>
 
 </dd>
         <dt id="NewGenericTypedef" class="callable">
-          <span class="name"><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></span><span class="signature">&lt;S&gt;(<wbr><span class="parameter" id="-param-"><span class="type-annotation">T</span></span> <span class="parameter" id="-param-"><span class="type-annotation">T</span></span> <span class="parameter" id="-param-"><span class="type-annotation">T</span></span>)
+          <span class="name"><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></span><span class="signature">&lt;S&gt;(<wbr><span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span></span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span></span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span></span>)
             <span class="returntype parameter">&#8594; List&lt;S&gt;</span>
           </span>
         </dt>

testing/test_package_docs/index.json

@@ -4996,7 +4996,7 @@
   "qualifiedName": "fake.SpecialList.[]",
   "href": "fake/SpecialList/operator_get.html",
   "type": "method",
-  "overriddenDepth": 0,
+  "overriddenDepth": 1,
   "enclosedBy": {
    "name": "SpecialList",
    "type": "class"
@@ -5007,7 +5007,7 @@
   "qualifiedName": "fake.SpecialList.[]=",
   "href": "fake/SpecialList/operator_put.html",
   "type": "method",
-  "overriddenDepth": 0,
+  "overriddenDepth": 1,
   "enclosedBy": {
    "name": "SpecialList",
    "type": "class"