Merge branch 'master' of github.com:dart-lang/dartdoc into strong-mode-future-or

Author: matanlurey

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 [future_or]: https://github.com/dart-lang/sdk/blob/master/CHANGELOG.md#1240---12-06-2017
 
+## 0.14.1
+* Add better support for GenericFunctionTypeElementImpl (#1506, #1509)
+* Fix up dartdoc so it can be used with the head analyzer again (#1509)
+* SDK constraint fixed (#1503)
+
 ## 0.14.0
 * Fix multiple issues with properties and top level variables in cases
 of split inheritance (#1394, #1116)

appveyor.yml

@@ -9,6 +9,11 @@ install:
   - set PATH=%PATH%;C:\tools\dart-sdk\bin
   - set PATH=%PATH%;%APPDATA%\Pub\Cache\bin
   - pub get
+  - cmd: cd testing
+  - cmd: cd test_package
+  - cmd: pub get
+  - cmd: cd ..
+  - cmd: cd ..
 
 build: off
 

lib/src/element_type.dart

@@ -21,42 +21,38 @@ class ElementType {
 
   bool get isFunctionType => (_type is FunctionType);
 
-  bool get isParameterizedType {
-    if (_type is FunctionType) {
-      return typeArguments.isNotEmpty;
-    } else if (_type is ParameterizedType) {
-      return (_type as ParameterizedType).typeArguments.isNotEmpty;
-    }
-    return false;
-  }
+  bool get isParameterizedType => (_type is ParameterizedType);
 
   bool get isParameterType => (_type is TypeParameterType);
 
   String get linkedName {
-    if (_linkedName != null) return _linkedName;
+    if (_linkedName == null) {
+      StringBuffer buf = new StringBuffer();
 
-    StringBuffer buf = new StringBuffer();
-
-    if (isParameterType) {
-      buf.write(name);
-    } else {
-      buf.write(element.linkedName);
-    }
-
-    // not TypeParameterType or Void or Union type
-    if (isParameterizedType) {
-      if (typeArguments.every((t) => t.linkedName == 'dynamic')) {
-        _linkedName = buf.toString();
-        return _linkedName;
+      if (isParameterType) {
+        buf.write(name);
+      } else {
+        buf.write(element.linkedName);
       }
-      if (typeArguments.isNotEmpty) {
-        buf.write('<');
-        buf.writeAll(typeArguments.map((t) => t.linkedName), ', ');
-        buf.write('>');
+
+      // not TypeParameterType or Void or Union type
+      if (isParameterizedType) {
+        if (!typeArguments.every((t) => t.linkedName == 'dynamic') &&
+            typeArguments.isNotEmpty) {
+          buf.write('<');
+          buf.writeAll(typeArguments.map((t) => t.linkedName), ', ');
+          buf.write('>');
+        }
+        // Hide parameters if there's a an explicit typedef behind this
+        // element, but if there is no typedef, be explicit.
+        if (element is ModelFunctionAnonymous) {
+          buf.write('(');
+          buf.write(element.linkedParams());
+          buf.write(')');
+        }
       }
+      _linkedName = buf.toString();
     }
-    _linkedName = buf.toString();
-
     return _linkedName;
   }
 
@@ -71,22 +67,17 @@ class ElementType {
     if (e == null || e.library == null) {
       return null;
     }
-    Library lib = element.package.findLibraryFor(e);
-    if (lib == null) {
-      lib = new Library(e.library, element.package);
-    }
+    Library lib = new ModelElement.from(e.library, element.library);
     return (new ModelElement.from(e, lib));
   }
 
   List<ElementType> get typeArguments {
     var type = _type;
     if (type is FunctionType) {
       Iterable<DartType> typeArguments;
-      if (type.element is FunctionTypeAliasElement &&
-          type.typeFormals.isEmpty) {
-        // TODO(jmesserly): simplify check above; we should have a way
-        // to find instantiated typedefs without consulting the element.
-        // Also, it will not work if we support typedefs declared inside classes.
+      if (element is! ModelFunctionAnonymous && type.typeFormals.isEmpty) {
+        // TODO(jcollins-g): replace with if (FunctionType.isInstantiated) once
+        // that's reliable and revealed through the interface.
         typeArguments = type.typeArguments;
       } else {
         typeArguments = type.typeFormals.map((f) => f.type);
@@ -104,7 +95,7 @@ class ElementType {
     var rt = _returnTypeCore;
     Library lib = element.package.findLibraryFor(rt.element);
     if (lib == null) {
-      lib = new Library(rt.element.library, element.package);
+      lib = new ModelElement.from(rt.element.library, element.library);
     }
     return new ElementType(rt, new ModelElement.from(rt.element, lib));
   }
@@ -136,9 +127,8 @@ class ElementType {
   ElementType _getElementTypeFrom(DartType f) {
     Library lib;
     // can happen if element is dynamic
-    lib = element.package.findLibraryFor(f.element);
-    if (lib == null && f.element.library != null) {
-      lib = new Library(f.element.library, element.package);
+    if (f.element.library != null) {
+      lib = new ModelElement.from(f.element.library, element.library);
     }
     return new ElementType(f, new ModelElement.from(f.element, lib));
   }

lib/src/model.dart

@@ -769,7 +769,7 @@ class Class extends ModelElement implements EnclosedElement {
 
   @override
   String get nameWithGenerics {
-    if (!modelType.isParameterizedType) return name;
+    if (!modelType.isParameterizedType || _typeParameters.isEmpty) return name;
     return '$name<${_typeParameters.map((t) => t.name).join(', ')}>';
   }
 
@@ -2216,6 +2216,19 @@ abstract class ModelElement extends Nameable
         }
         if (e is FunctionElement) {
           newModelElement = new ModelFunction(e, library);
+        } else if (e is GenericFunctionTypeElement) {
+          if (e is FunctionTypeAliasElement) {
+            assert(e.name != '');
+            newModelElement = new ModelFunctionTypedef(e, library);
+          } else {
+            if (e.enclosingElement is GenericTypeAliasElement) {
+              assert(e.enclosingElement.name != '');
+              newModelElement = new ModelFunctionTypedef(e, library);
+            } else {
+              assert(e.name == '');
+              newModelElement = new ModelFunctionAnonymous(e, library);
+            }
+          }
         }
         if (e is FunctionTypeAliasElement) {
           newModelElement = new Typedef(e, library);
@@ -2285,10 +2298,6 @@ abstract class ModelElement extends Nameable
         }
       }
     }
-    // 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);
@@ -2897,7 +2906,8 @@ abstract class ModelElement extends Nameable
       }
       if (param.modelType.isFunctionType) {
         var returnTypeName;
-        bool isTypedef = param.modelType.element is Typedef;
+        bool isTypedef = (param.modelType.element is Typedef ||
+            param.modelType.element is ModelFunctionTypedef);
         if (isTypedef) {
           returnTypeName = param.modelType.linkedName;
         } else {
@@ -3203,6 +3213,7 @@ abstract class ModelElement extends Nameable
   }
 }
 
+/// A [ModelElement] for a [FunctionElement] that isn't part of a type definition.
 class ModelFunction extends ModelFunctionTyped {
   ModelFunction(FunctionElement element, Library library)
       : super(element, library);
@@ -3216,6 +3227,42 @@ class ModelFunction extends ModelFunctionTyped {
   FunctionElement get _func => (element as FunctionElement);
 }
 
+/// A [ModelElement] for a [GenericModelFunctionElement] that is an
+/// explicit typedef.
+///
+/// Distinct from ModelFunctionTypedef in that it doesn't
+/// have a name, but we document it as "Function" to match how these are
+/// written in declarations.
+class ModelFunctionAnonymous extends ModelFunctionTyped {
+  ModelFunctionAnonymous(FunctionTypedElement element, Library library)
+      : super(element, library) {}
+
+  @override
+  String get name => 'Function';
+
+  @override
+  bool get isPublic => false;
+}
+
+/// A [ModelElement] for a [GenericModelFunctionElement] that is part of an
+/// explicit typedef.
+class ModelFunctionTypedef extends ModelFunctionTyped {
+  ModelFunctionTypedef(FunctionTypedElement element, Library library)
+      : super(element, library);
+
+  @override
+  String get name {
+    Element e = element;
+    while (e != null) {
+      if (e is FunctionTypeAliasElement || e is GenericTypeAliasElement)
+        return e.name;
+      e = e.enclosingElement;
+    }
+    assert(false);
+    return super.name;
+  }
+}
+
 class ModelFunctionTyped extends ModelElement
     with SourceCodeMixin
     implements EnclosedElement {
@@ -3238,13 +3285,6 @@ class ModelFunctionTyped extends ModelElement
 
   String get fileName => "$name.html";
 
-  @override
-  String get name {
-    if (element.enclosingElement is ParameterElement && super.name.isEmpty)
-      return element.enclosingElement.name;
-    return super.name;
-  }
-
   @override
   String get href {
     if (canonicalLibrary == null) return null;
@@ -4590,7 +4630,7 @@ class Typedef extends ModelElement
 
   @override
   String get nameWithGenerics {
-    if (!modelType.isParameterizedType) return name;
+    if (!modelType.isParameterizedType || _typeParameters.isEmpty) return name;
     return '$name<${_typeParameters.map((t) => t.name).join(', ')}>';
   }
 

lib/src/model_utils.dart

@@ -54,10 +54,12 @@ bool isInExportedLibraries(
 
 final RegExp slashes = new RegExp('[\/]');
 bool hasPrivateName(Element e) {
-  if (e.name.startsWith('_') ||
-      (e is LibraryElement &&
-          (e.identifier == 'dart:_internal' ||
-              e.identifier == 'dart:nativewrappers'))) {
+  if (e.name.startsWith('_')) {
+    return true;
+  }
+  if (e is LibraryElement &&
+      (e.identifier.startsWith('dart:_') ||
+          ['dart:nativewrappers'].contains(e.identifier))) {
     return true;
   }
   if (e is LibraryElement) {

pubspec.lock

@@ -121,6 +121,12 @@ 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
@@ -169,6 +175,12 @@ 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
@@ -294,7 +306,7 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.20+13"
+    version: "0.12.24+6"
   tuple:
     description:
       name: tuple
@@ -350,4 +362,4 @@ packages:
     source: hosted
     version: "2.1.12"
 sdks:
-  dart: ">=1.23.0-dev.11.5 <2.0.0"
+  dart: ">=1.23.0 <=2.0.0-dev.2.0"

pubspec.yaml

@@ -28,6 +28,6 @@ dev_dependencies:
   http: ^0.11.0
   meta: ^1.0.0
   pub_semver: ^1.0.0
-  test: ^0.12.0
+  test: '^0.12.24'
 executables:
   dartdoc: null