fix(transformer): Fix annotation_matcher for NgForm directive.

The NgForm directive imports Directive from a previously unlisted import.
angular · Jun 26, 2015 · 9c76850 · 9c76850
1 parent b50edfd
commit 9c76850
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/modules/angular2/src/transform/common/annotation_matcher.dart b/modules/angular2/src/transform/common/annotation_matcher.dart
@@ -24,6 +24,8 @@ const INJECTABLES = const [
 const DIRECTIVES = const [
   const AnnotationDescriptor('Directive',
       'package:angular2/src/core/annotations/annotations.dart', 'Injectable'),
+  const AnnotationDescriptor('Directive',
+      'package:angular2/src/core/annotations/decorators.dart', 'Injectable'),
   const AnnotationDescriptor('Directive',
       'package:angular2/src/core/annotations_impl/annotations.dart',
       'Injectable'),
@@ -38,6 +40,8 @@ const DIRECTIVES = const [
 const COMPONENTS = const [
   const AnnotationDescriptor('Component',
       'package:angular2/src/core/annotations/annotations.dart', 'Directive'),
+  const AnnotationDescriptor('Component',
+      'package:angular2/src/core/annotations/decorators.dart', 'Directive'),
   const AnnotationDescriptor('Component',
       'package:angular2/src/core/annotations_impl/annotations.dart',
       'Directive'),

diff --git a/modules/angular2/src/transform/template_compiler/change_detector_codegen.dart b/modules/angular2/src/transform/template_compiler/change_detector_codegen.dart
@@ -222,8 +222,7 @@ class _CodegenState {
 
   List<String> _getNonNullPipeNames() {
     return _records
-        .where((r) =>
-            r.mode == RecordType.PIPE)
+        .where((r) => r.mode == RecordType.PIPE)
         .map((r) => _pipeNames[r.selfIndex])
         .toList();
   }

diff --git a/modules/angular2/src/transform/template_compiler/generator.dart b/modules/angular2/src/transform/template_compiler/generator.dart
@@ -85,7 +85,6 @@ class _TemplateExtractor {
 
   _TemplateExtractor(XHR xhr)
       : _factory = new CompileStepFactory(new ng.Parser(new ng.Lexer())) {
-
     var urlResolver = new UrlResolver();
     var styleUrlResolver = new StyleUrlResolver(urlResolver);
     var styleInliner = new StyleInliner(xhr, styleUrlResolver, urlResolver);
@@ -110,8 +109,7 @@ class _TemplateExtractor {
 
     var compileElements =
         pipeline.process(templateEl, ViewType.COMPONENT, viewDef.componentId);
-    var protoViewDto = compileElements[0].inheritedProtoView
-        .build();
+    var protoViewDto = compileElements[0].inheritedProtoView.build();
 
     reflector.reflectionCapabilities = savedReflectionCapabilities;
 

diff --git a/modules/angular2/test/transform/directive_processor/all_tests.dart b/modules/angular2/test/transform/directive_processor/all_tests.dart
@@ -49,8 +49,8 @@ void allTests() {
       readFile(
           'directive_processor/absolute_url_expression_files/template.css'));
   _testNgDeps('should inline `templateUrl` and `styleUrls` values expressed as'
-      ' absolute urls.',
-      'absolute_url_expression_files/hello.dart', reader: absoluteReader);
+      ' absolute urls.', 'absolute_url_expression_files/hello.dart',
+      reader: absoluteReader);
 
   _testNgDeps(
       'should inline multiple `styleUrls` values expressed as absolute urls.',