Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

Commit 1360d19

Browse files
Pete Bloistravis@travis-ci.org
authored andcommitted
fix(transformer): Fixing some analyzer warnings
A couple appear to have crept in, found when integrating into Dart's repo. Closes #955
1 parent 1df0f64 commit 1360d19

File tree

5 files changed

+8
-16
lines changed

5 files changed

+8
-16
lines changed

lib/tools/transformer/metadata_extractor.dart

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:code_transformers/resolver.dart';
1010

1111
class AnnotatedType {
1212
final ClassElement type;
13-
Iterable<Annotation> annotations;
13+
List<Annotation> annotations;
1414

1515
AnnotatedType(this.type);
1616

@@ -269,19 +269,17 @@ class AnnotationExtractor {
269269
.where((Annotation annotation) {
270270
var element = annotation.element;
271271
if (element != null && !element.isPublic) {
272-
warn('Annotation $annotation is not public.',
273-
annotation.parent.element);
272+
warn('Annotation $annotation is not public.', cls);
274273
return false;
275274
}
276275
if (element is! ConstructorElement) {
277276
// Only keeping constructor elements.
278277
return false;
279278
}
280279
ConstructorElement ctor = element;
281-
var cls = ctor.enclosingElement;
282-
if (!cls.isPublic) {
283-
warn('Annotation $annotation is not public.',
284-
annotation.parent.element);
280+
var annotationClass = ctor.enclosingElement;
281+
if (!annotationClass.isPublic) {
282+
warn('Annotation $annotation is not public.', cls);
285283
return false;
286284
}
287285
return element.enclosingElement.type.isAssignableTo(directiveType.type) ||

lib/tools/transformer/metadata_generator.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
library angular.tools.transformer.metadata_generator;
22

3-
import 'dart:async';
43
import 'package:analyzer/src/generated/element.dart';
54
import 'package:angular/tools/transformer/options.dart';
65
import 'package:barback/barback.dart';

lib/tools/transformer/options.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
library angular.tools.transformer.options;
22

3-
import 'dart:async';
4-
5-
import 'package:barback/barback.dart';
6-
import 'package:code_transformers/resolver.dart';
73
import 'package:di/transformer/options.dart' as di;
84

95
/** Options used by Angular transformers */

lib/tools/transformer/static_angular_generator.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
library angular.tools.transformer.static_angular_generator;
22

3-
import 'dart:async';
43
import 'package:analyzer/src/generated/ast.dart';
54
import 'package:analyzer/src/generated/element.dart';
65
import 'package:angular/tools/transformer/options.dart';

lib/transformer.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:angular/tools/transformer/html_dart_references_generator.dart';
99
import 'package:angular/tools/transformer/options.dart';
1010
import 'package:barback/barback.dart';
1111
import 'package:code_transformers/resolver.dart';
12-
import 'package:di/transformer/injector_generator.dart' as di;
12+
import 'package:di/transformer/injector_generator.dart' show InjectorGenerator;
1313
import 'package:di/transformer/options.dart' as di;
1414
import 'package:path/path.dart' as path;
1515

@@ -126,7 +126,7 @@ List<List<Transformer>> _createPhases(TransformOptions options) {
126126
[new HtmlDartReferencesGenerator(options)],
127127
[new _SerialTransformer([
128128
new ExpressionGenerator(options, resolvers),
129-
new di.InjectorGenerator(options.diOptions, resolvers),
129+
new InjectorGenerator(options.diOptions, resolvers),
130130
new MetadataGenerator(options, resolvers),
131131
new StaticAngularGenerator(options, resolvers)
132132
])]
@@ -145,7 +145,7 @@ class _SerialTransformer extends Transformer {
145145
final Iterable<Transformer> _transformers;
146146
_SerialTransformer(this._transformers);
147147

148-
Future<bool> isPrimary(Asset input) =>
148+
Future<bool> isPrimary(input) =>
149149
Future.wait(_transformers.map((t) => t.isPrimary(input)))
150150
.then((l) => l.any((result) => result));
151151

0 commit comments

Comments
 (0)