Merge pull request #1057 from keertip/analyzer

changes to upgrade to latest analzyer

Author: keertip

CHANGELOG.md

@@ -3,6 +3,7 @@
 * [bug] Fixed the display of deprecated properties.
 * [bug] show generics for typedefs
 * [bug] cleanly unzip docs on Mac
+* [health] upgrade to latest analyzer package
 
 ## 0.8.3
 * [enhancement] Added `--[no-]include-source` option.

lib/dartdoc.dart

@@ -149,6 +149,8 @@ class DartDoc {
 
     var options = new AnalysisOptionsImpl()..cacheSize = 512;
 
+    AnalysisEngine.instance.processRequiredPlugins();
+
     AnalysisContext context = AnalysisEngine.instance.createAnalysisContext()
       ..analysisOptions = options
       ..sourceFactory = sourceFactory;

lib/src/element_type.dart

@@ -28,10 +28,14 @@ class ElementType {
 
   DartType get _returnTypeCore => (_type as FunctionType).returnType;
 
-  // TODO: this is probably a bug. Apparently, EVERYTHING is a parameterized type?
-  bool get isParameterizedType =>
-      (_type is ParameterizedType) &&
-      (_type as ParameterizedType).typeArguments.isNotEmpty;
+  bool get isParameterizedType {
+    if (_type is FunctionType) {
+      return (_type as FunctionType).boundTypeParameters.isNotEmpty;
+    } else if (_type is ParameterizedType) {
+      return (_type as ParameterizedType).typeArguments.isNotEmpty;
+    }
+    return false;
+  }
 
   String get _returnTypeName => _returnTypeCore.name;
 
@@ -56,16 +60,29 @@ class ElementType {
     return (new ModelElement.from(e, lib));
   }
 
-  List<ElementType> get typeArguments =>
-      (_type as ParameterizedType).typeArguments.map((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);
-        }
-        return new ElementType(f, new ModelElement.from(f.element, lib));
-      }).toList();
+  List<ElementType> get typeArguments {
+    if (_type is FunctionType) {
+      return (_type as FunctionType)
+          .boundTypeParameters
+          .map((f) => _getElementTypeFrom(f))
+          .toList();
+    } else {
+      return (_type as ParameterizedType)
+          .typeArguments
+          .map((f) => _getElementTypeFrom(f))
+          .toList();
+    }
+  }
+
+  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);
+    }
+    return new ElementType(f, new ModelElement.from(f.element, lib));
+  }
 
   String get linkedName {
     if (_linkedName != null) return _linkedName;

pubspec.lock

@@ -4,7 +4,7 @@ packages:
   analyzer:
     description: analyzer
     source: hosted
-    version: "0.26.3"
+    version: "0.27.0"
   ansicolor:
     description: ansicolor
     source: hosted
@@ -184,7 +184,7 @@ packages:
   test:
     description: test
     source: hosted
-    version: "0.12.6"
+    version: "0.12.6+1"
   typed_data:
     description: typed_data
     source: hosted

pubspec.yaml

@@ -7,7 +7,7 @@ homepage: https://github.com/dart-lang/dartdoc
 environment:
   sdk: '>=1.12.0 <2.0.0'
 dependencies:
-  analyzer: '>=0.26.3 <0.27.0'
+  analyzer: '>=0.27.0 <0.28.0'
   args: ^0.13.0
   cli_util: ^0.0.1
   collection: ^1.2.0

test/src/utils.dart

@@ -69,6 +69,7 @@ class AnalyzerHelper {
     ];
 
     SourceFactory sourceFactory = new SourceFactory(resolvers);
+    AnalysisEngine.instance.processRequiredPlugins();
     context = AnalysisEngine.instance.createAnalysisContext();
     context.sourceFactory = sourceFactory;
   }