Fix several problems with anonymous functions and type parameters (#1651

) * Have failure example now * Fix a number of anonymous function bugs. * dartfmt * Working * rebuild package docs * tweak style slightly for complicatedReturn * fix crash
dart-lang · Mar 29, 2018 · 865b502 · 865b502
1 parent b1c2a5d
commit 865b502
Show file tree

Hide file tree

Showing 316 changed files with 1,502 additions and 747 deletions.
diff --git a/lib/resources/styles.css b/lib/resources/styles.css
@@ -359,6 +359,15 @@ dl dt.callable .name {
   white-space: nowrap;
 }
 
+.type-parameter {
+  white-space: nowrap;
+}
+
+.multi-line-signature .type-parameter .parameter {
+  margin-left: 0px;
+  display: unset;
+}
+
 .signature {
   color: #727272;
 }

diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
@@ -29,18 +29,14 @@ abstract class ElementType extends Privacy {
       assert(f is ParameterizedType || f is TypeParameterType);
       bool isGenericTypeAlias =
           f.element.enclosingElement is GenericTypeAliasElement;
-      // can happen if element is dynamic
-      assert(f.element.library != null);
       if (f is FunctionType) {
         assert(f is ParameterizedType);
         if (isGenericTypeAlias) {
           assert(element is! ModelFunctionAnonymous);
           return new CallableGenericTypeAliasElementType(
               f, packageGraph, element, returnedFrom);
         } else {
-          if ((f.name ?? f.element.name) == '' ||
-              (f.name ?? f.element.name) == null) {
-            assert(element is ModelFunctionAnonymous);
+          if (element is ModelFunctionAnonymous) {
             return new CallableAnonymousElementType(
                 f, packageGraph, element, returnedFrom);
           } else {
@@ -129,9 +125,10 @@ class ParameterizedElementType extends DefinedElementType {
       if (!typeArguments.every((t) => t.name == 'dynamic') &&
           typeArguments.isNotEmpty) {
         buf.write('<span class="signature">');
-        buf.write('&lt;');
-        buf.writeAll(typeArguments.map((t) => t.linkedName), ', ');
-        buf.write('&gt;');
+        buf.write('&lt;<wbr><span class="type-parameter">');
+        buf.writeAll(typeArguments.map((t) => t.linkedName),
+            '</span>, <span class="type-parameter">');
+        buf.write('</span>&gt;');
         buf.write('</span>');
       }
 
@@ -150,9 +147,10 @@ class ParameterizedElementType extends DefinedElementType {
 
       if (!typeArguments.every((t) => t.name == 'dynamic') &&
           typeArguments.isNotEmpty) {
-        buf.write('&lt;');
-        buf.writeAll(typeArguments.map((t) => t.nameWithGenerics), ', ');
-        buf.write('&gt;');
+        buf.write('&lt;<wbr><span class="type-parameter">');
+        buf.writeAll(typeArguments.map((t) => t.nameWithGenerics),
+            '</span>, <span class="type-parameter">');
+        buf.write('</span>&gt;');
       }
       _nameWithGenerics = buf.toString();
     }
@@ -286,6 +284,12 @@ class CallableElementType extends ParameterizedElementType
   CallableElementType(FunctionType t, PackageGraph packageGraph,
       ModelElement element, ElementType returnedFrom)
       : super(t, packageGraph, element, returnedFrom);
+
+  @override
+  String get linkedName {
+    if (name != null && name.isNotEmpty) return super.linkedName;
+    return '${nameWithGenerics}(${element.linkedParams(showNames: false).trim()}) → ${returnType.linkedName}';
+  }
 }
 
 /// This is an anonymous function using the generic function syntax (declared
@@ -301,7 +305,7 @@ class CallableAnonymousElementType extends CallableElementType {
   String get linkedName {
     if (_linkedName == null) {
       _linkedName =
-          '${super.linkedName}<span class="signature">(${element.linkedParams()})</span>';
+          '${returnType.linkedName} ${super.linkedName}<span class="signature">(${element.linkedParams()})</span>';
     }
     return _linkedName;
   }

diff --git a/lib/src/markdown_processor.dart b/lib/src/markdown_processor.dart
@@ -565,8 +565,8 @@ ModelElement _findRefElementInLibrary(String codeRef, Warnable element,
   }
 
   if (results.length > 1) {
-    if (results.any((r) => r.library.packageName == library.packageName)) {
-      results.removeWhere((r) => r.library.packageName != library.packageName);
+    if (results.any((r) => r.library?.packageName == library.packageName)) {
+      results.removeWhere((r) => r.library?.packageName != library.packageName);
     }
   }