Skip to content

avoid computeNode calls #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 13, 2016
Merged

avoid computeNode calls #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8349353
avoid computeNode calls in annotation.dart
natebosch Sep 13, 2016
368eff8
Bump version and update changelog
natebosch Sep 13, 2016
0f59dda
Fix unnecessarily typed variable
natebosch Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
26 changes: 10 additions & 16 deletions lib/src/annotation.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: source_gen
version: 0.5.1+1
version: 0.5.1+2
author: Dart Team <misc@dartlang.org>
description: Automatic sourcecode generation for Dart
homepage: https://github.com/dart-lang/source_gen
Expand Down