avoid computeNode calls (#91)

* avoid computeNode calls in annotation.dart

Going through computeNode() and AST types is not guaranteed to work for
all Element sources. Instead go through only statically available
Element types.

- Avoid computeNode() on the ConstructorElement by reading parameters
  and names directly
- Avoid computedNode() on the PropertyAccessorElement.variable by
  checking if it is a ConstVariableElement with an available
  InstanceCreationExpression
- Update imports for Element classes to a non-deprecated library

* Bump version and update changelog

* Fix unnecessarily typed variable

Author: natebosch

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.1+2
+
+* Avoid calling `computeNode()` while instantiating annotation values
+
 ## 0.5.1+1
 
 * Support the latest version of `build` package.

lib/src/annotation.dart

@@ -10,9 +10,8 @@ import 'dart:mirrors';
 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/dart/element/element.dart';
 import 'package:analyzer/src/generated/constant.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;
@@ -32,11 +31,13 @@ dynamic instantiateAnnotation(ElementAnnotation annotation) {
   var element = annotation.element;
 
   if (element is PropertyAccessorElement) {
-    var initializer = ((element as PropertyAccessorElement)
-            .variable
-            .computeNode() as VariableDeclaration)
-        .initializer as InstanceCreationExpression;
-    element = initializer.staticElement;
+    var variable = (element as PropertyAccessorElement).variable;
+    if (variable is ConstVariableElement) {
+      var expression = (variable as ConstVariableElement).constantInitializer;
+      if (expression is InstanceCreationExpression) {
+        element = expression.staticElement;
+      }
+    }
   }
 
   if (element is ConstructorElement) {
@@ -136,11 +137,9 @@ final _cannotCreate = new Object();
 
 dynamic _createFromConstructor(
     ConstructorElementImpl ctor, DartObjectImpl obj) {
-  var ctorDeclaration = ctor.computeNode();
-
   var positionalArgs = [];
   var namedArgs = <Symbol, dynamic>{};
-  for (var p in ctorDeclaration.parameters.parameterElements) {
+  for (var p in ctor.parameters) {
     var paramName = p.name;
     String fieldName;
     if (p is FieldFormalParameterElement) {
@@ -178,12 +177,7 @@ dynamic _createFromConstructor(
     }
   }
 
-  Symbol ctorName;
-  if (ctorDeclaration.name == null) {
-    ctorName = const Symbol('');
-  } else {
-    ctorName = new Symbol(ctorDeclaration.name.name);
-  }
+  var ctorName = new Symbol(ctor.name ?? '');
 
   var declarationMirror =
       _getDeclarationMirrorFromType(ctor.enclosingElement.type) as ClassMirror;

pubspec.yaml

@@ -1,5 +1,5 @@
 name: source_gen
-version: 0.5.1+1
+version: 0.5.1+2
 author: Dart Team <[email protected]>
 description: Automatic sourcecode generation for Dart
 homepage: https://github.com/dart-lang/source_gen