Support latest version of build, upgrade analyzer dev

kevmoo · kevmoo · commit 51c6aa421fa8 · 2016-04-28T16:32:16.000-07:00
Also stop using most deprecated analyzer APIs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.0+1
+
+* Support the latest version of `pkg/build`.
+
 ## 0.5.0
 
 * **Breaking**: Switch to the `build` package for running `Generator`s. This
diff --git a/lib/generators/json_literal_generator.dart b/lib/generators/json_literal_generator.dart
@@ -7,7 +7,7 @@ library source_gen.example.json_literal_generator;
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
 import 'package:path/path.dart' as p;
 import 'package:source_gen/source_gen.dart';
diff --git a/lib/generators/json_serializable_generator.dart b/lib/generators/json_serializable_generator.dart
@@ -5,12 +5,13 @@
 library source_gen.json_serial.generator;
 
 import 'dart:async';
-import 'package:analyzer/src/generated/element.dart';
-import 'package:analyzer/src/generated/utilities_dart.dart';
 
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:source_gen/source_gen.dart';
-import 'package:source_gen/src/utils.dart';
 import 'package:source_gen/src/annotation.dart';
+import 'package:source_gen/src/utils.dart';
 
 import 'json_serializable.dart';
 
@@ -260,7 +261,7 @@ bool _hasFromJsonCtor(DartType type) {
   return false;
 }
 
-DartType _getIterableGenericType(InterfaceTypeImpl type) {
+DartType _getIterableGenericType(InterfaceType type) {
   var iterableThing = _typeTest(type, _isDartIterable);
 
   return iterableThing.typeArguments.single;
diff --git a/lib/src/annotation.dart b/lib/src/annotation.dart
@@ -7,18 +7,20 @@ library source_gen.annotation;
 import 'dart:io';
 import 'dart:mirrors';
 
-import 'package:analyzer/src/generated/ast.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/generated/constant.dart';
-import 'package:analyzer/src/generated/element.dart';
-import 'package:analyzer/src/generated/utilities_dart.dart';
+import 'package:analyzer/src/generated/element.dart'
+    show ConstructorElementImpl;
 import 'package:analyzer/src/generated/resolver.dart';
+import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:path/path.dart' as p;
 
-dynamic instantiateAnnotation(ElementAnnotationImpl annotation) {
-  var annotationObjectImpl = annotation.evaluationResult.value;
+dynamic instantiateAnnotation(ElementAnnotation annotation) {
+  var annotationObject = annotation.constantValue;
   try {
-    return _getValue(
-        annotationObjectImpl, annotation.element.context.typeProvider);
+    return _getValue(annotationObject, annotation.element.context.typeProvider);
   } on CannotCreateFromAnnotationException catch (e) {
     if (e.innerException != null) {
       // If there was a issue creating a nested object, there's not much we
@@ -29,20 +31,19 @@ dynamic instantiateAnnotation(ElementAnnotationImpl annotation) {
 
   var element = annotation.element;
 
-  if (element is PropertyAccessorElementImpl) {
-    var initializer = ((element as PropertyAccessorElementImpl)
+  if (element is PropertyAccessorElement) {
+    var initializer = ((element as PropertyAccessorElement)
             .variable
             .computeNode() as VariableDeclaration)
         .initializer as InstanceCreationExpression;
     element = initializer.staticElement;
   }
 
-  if (element is ConstructorElementImpl) {
-    return _createFromConstructor(element, annotationObjectImpl);
+  if (element is ConstructorElement) {
+    return _createFromConstructor(element, annotationObject);
   }
 
-  var valueDeclaration =
-      _getDeclMirrorFromType(annotation.evaluationResult.value.type);
+  var valueDeclaration = _getDeclMirrorFromType(annotation.constantValue.type);
 
   throw "No clue how to create $valueDeclaration of type ${valueDeclaration.runtimeType}";
 }
@@ -75,7 +76,7 @@ dynamic _getValue(DartObject object, TypeProvider typeProvider) {
   if (object.type == typeProvider.typeType) {
     var typeData = object.toTypeValue();
 
-    if (typeData is InterfaceTypeImpl) {
+    if (typeData is InterfaceType) {
       var declarationMirror = _getDeclMirrorFromType(typeData) as ClassMirror;
 
       return declarationMirror.reflectedType;
@@ -140,12 +141,13 @@ dynamic _createFromConstructor(
   for (var p in ctorDecl.parameters.parameterElements) {
     var paramName = p.name;
     String fieldName;
-    if (p is FieldFormalParameterElementImpl) {
+    if (p is FieldFormalParameterElement) {
       fieldName = p.name;
     } else {
       // Trying to find the relationship between the ctor argument name and the
       // field assigned in the object. Then we can take the field value and
       // set it as the argument value
+
       var initializer = ctor.constantInitializers.singleWhere((ci) {
         var expression = (ci as ConstructorFieldInitializer).expression;
         if (expression is SimpleIdentifier) {
@@ -203,11 +205,11 @@ DeclarationMirror _getDeclMirrorFromType(InterfaceType type) {
   return libMirror.declarations[typeNameSymbol];
 }
 
-bool matchAnnotation(Type annotationType, ElementAnnotationImpl annotation) {
+bool matchAnnotation(Type annotationType, ElementAnnotation annotation) {
   var classMirror = reflectClass(annotationType);
   var classMirrorSymbol = classMirror.simpleName;
 
-  var annotationValueType = annotation.evaluationResult.value.type;
+  var annotationValueType = annotation.constantValue.type;
 
   var annTypeName = annotationValueType.name;
   var annotationTypeSymbol = new Symbol(annTypeName);
diff --git a/lib/src/builder.dart b/lib/src/builder.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 import 'dart:async';
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
 import 'package:dart_style/src/dart_formatter.dart';
 
diff --git a/lib/src/generated_output.dart b/lib/src/generated_output.dart
@@ -6,7 +6,7 @@ library source_gen.generated_output;
 
 import 'dart:convert';
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 
 import 'generator.dart';
 
diff --git a/lib/src/generator.dart b/lib/src/generator.dart
@@ -6,7 +6,7 @@ library source_gen.generator;
 
 import 'dart:async';
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
 
 abstract class Generator {
diff --git a/lib/src/generator_for_annotation.dart b/lib/src/generator_for_annotation.dart
@@ -6,7 +6,7 @@ library source_gen.generator_for_annotation;
 
 import 'dart:async';
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
 
 import 'annotation.dart';
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
@@ -8,19 +8,19 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:analyzer/analyzer.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart' hide File;
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/source/package_map_provider.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
 import 'package:analyzer/source/pub_package_map_provider.dart';
-import 'package:analyzer/src/generated/ast.dart';
-import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_io.dart';
-import 'package:analyzer/src/generated/sdk_io.dart' show DirectoryBasedDartSdk;
 import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
-import 'package:analyzer/src/generated/source_io.dart';
+import 'package:analyzer/src/generated/sdk_io.dart' show DirectoryBasedDartSdk;
 import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer/src/generated/source_io.dart';
 import 'package:cli_util/cli_util.dart' as cli;
 import 'package:path/path.dart' as p;
 
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,13 +1,13 @@
 name: source_gen
-version: 0.5.0
+version: 0.5.0+1
 author: Dart Team <misc@dartlang.org>
 description: Automatic sourcecode generation for Dart
 homepage: https://github.com/dart-lang/source_gen
 environment:
   sdk: '>=1.12.0 <2.0.0'
 dependencies:
-  analyzer: '^0.27.3-alpha.1'
-  build: ^0.2.1
+  analyzer: '^0.27.3'
+  build: '>=0.2.1 <0.4.0'
   cli_util: ^0.0.1
   dart_style: '>=0.1.7 <0.3.0'
   path: ^1.3.2
diff --git a/test/annotation_test.dart b/test/annotation_test.dart
@@ -7,20 +7,21 @@ library source_gen.test.annotation_test;
 
 import 'dart:async';
 
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+
 import 'package:analyzer/src/generated/constant.dart';
-import 'package:analyzer/src/generated/element.dart';
+//import 'package:analyzer/src/generated/element.dart' show ElementAnnotationImpl;
 import 'package:analyzer/src/generated/source.dart';
 import 'package:mockito/mockito.dart';
 import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
 import 'package:source_gen/generators/json_serializable.dart';
 import 'package:source_gen/src/annotation.dart';
 import 'package:source_gen/src/utils.dart';
-
-import 'test_files/annotations.dart' as defs;
+import 'package:test/test.dart';
 
 import 'src/io.dart';
+import 'test_files/annotations.dart' as defs;
 import 'test_utils.dart';
 
 void main() {
@@ -238,16 +239,14 @@ ClassElement _getAnnotatedClass(LibraryElement lib, String className) =>
 /// Returns a mock [ElementAnnotationImpl] whose
 /// `evaluationResult.value.type.element.library.source` is `libraryUri` and
 /// whose `evaluationResult.value.type.name` is `typeName`.
-ElementAnnotationImpl _mockElementAnnotation(String typeName, Uri libraryUri) {
-  var annotation = new MockElementAnnotationImpl();
-  var result = new MockEvaluationResultImpl();
-  var value = new MockDartObjectImpl();
+ElementAnnotation _mockElementAnnotation(String typeName, Uri libraryUri) {
+  var annotation = new MockElementAnnotation();
+  var value = new MockDartObject();
   var type = new MockParameterizedType();
   var element = new MockElement();
   var library = new MockLibraryElement();
   var source = new MockSource();
-  when(annotation.evaluationResult).thenReturn(result);
-  when(result.value).thenReturn(value);
+  when(annotation.constantValue).thenReturn(value);
   when(value.type).thenReturn(type);
   when(type.name).thenReturn(typeName);
   when(type.element).thenReturn(element);
@@ -257,11 +256,9 @@ ElementAnnotationImpl _mockElementAnnotation(String typeName, Uri libraryUri) {
   return annotation;
 }
 
-class MockElementAnnotationImpl extends Mock implements ElementAnnotationImpl {}
-
-class MockEvaluationResultImpl extends Mock implements EvaluationResultImpl {}
+class MockElementAnnotation extends Mock implements ElementAnnotation {}
 
-class MockDartObjectImpl extends Mock implements DartObjectImpl {}
+class MockDartObject extends Mock implements DartObject {}
 
 class MockParameterizedType extends Mock implements ParameterizedType {}
 
diff --git a/test/builder_test.dart b/test/builder_test.dart
@@ -4,12 +4,11 @@
 @TestOn('vm')
 import 'dart:async';
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
-import 'package:test/test.dart';
-
 import 'package:source_gen/builder.dart';
 import 'package:source_gen/source_gen.dart';
+import 'package:test/test.dart';
 
 import 'src/comment_generator.dart';
 import 'src/test_phases.dart';
diff --git a/test/json_serializable_test.dart b/test/json_serializable_test.dart
@@ -7,16 +7,15 @@ library source_gen.test.json_generator_test;
 
 import 'dart:async';
 
-import 'package:analyzer/src/generated/ast.dart';
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/string_source.dart';
 import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
-import 'package:source_gen/src/utils.dart';
 import 'package:source_gen/generators/json_serializable_generator.dart';
+import 'package:source_gen/src/utils.dart';
+import 'package:test/test.dart';
 
 import 'src/io.dart';
 import 'test_utils.dart';
diff --git a/test/src/comment_generator.dart b/test/src/comment_generator.dart
@@ -2,7 +2,7 @@ library source_gen.test.comment_generator;
 
 import 'dart:async';
 
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:source_gen/source_gen.dart';
 
 /// Generates a single-line comment for each class
diff --git a/test/src/test_phases.dart b/test/src/test_phases.dart
@@ -6,10 +6,9 @@
 
 import 'dart:async';
 
-import 'package:test/test.dart';
-
 import 'package:build/build.dart';
 import 'package:logging/logging.dart';
+import 'package:test/test.dart';
 
 import 'in_memory_reader.dart';
 import 'in_memory_writer.dart';
@@ -32,7 +31,7 @@ Future testPhases(PhaseGroup phases, String rootPackage,
       packageGraph: packageGraph,
       logLevel: Level.OFF);
 
-  expect(result.status, BuildStatus.Success,
+  expect(result.status, BuildStatus.success,
       reason: 'Exception:\n${result.exception}\n'
           'Stack Trace:\n${result.stackTrace}');
 
