fix(template_cache_generator): support traversal of partial files

Fixes #662
dart-archive · Mar 5, 2014 · f918d4d · f918d4d
1 parent 6fe5692
commit f918d4d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 26 deletions.
diff --git a/lib/tools/template_cache_generator.dart b/lib/tools/template_cache_generator.dart
@@ -118,7 +118,15 @@ class TemplateCollectingVisitor {
   TemplateCollectingVisitor(this.templates, this.blacklistedClasses,
       this.sourceCrawler);
 
-  call(CompilationUnitElement cue, String srcPath) {
+  void call(CompilationUnitElement cue, String srcPath) {
+    processDeclarations(cue, srcPath);
+
+    cue.enclosingElement.parts.forEach((CompilationUnitElement part) {
+      processDeclarations(part, srcPath);
+    });
+  }
+
+  void processDeclarations(CompilationUnitElement cue, String srcPath) {
     CompilationUnit cu = sourceCrawler.context
         .resolveCompilationUnit(cue.source, cue.library);
     cu.declarations.forEach((CompilationUnitMember declaration) {
@@ -166,8 +174,7 @@ class TemplateCollectingVisitor {
     });
   }
 
-  bool extractNgTemplateCache(
-      Annotation ann, List<String> cacheUris) {
+  bool extractNgTemplateCache(Annotation ann, List<String> cacheUris) {
     bool cache = true;
     ann.arguments.arguments.forEach((Expression arg) {
       if (arg is NamedExpression) {

diff --git a/test/io/test_files/templates/main.dart b/test/io/test_files/templates/main.dart
@@ -3,27 +3,7 @@ library test_files.main;
 import 'package:angular/core/module.dart';
 import 'package:angular/tools/template_cache_annotation.dart';
 
-@NgComponent(
-    selector: 'my-component',
-    templateUrl: '/test/io/test_files/templates/main.html')
-@NgTemplateCache()
-class MyComponent
-{
-}
+part 'partial.dart';
 
-@NgComponent(
-    selector: 'my-component2',
-    templateUrl: '/test/io/test_files/templates/dont.html')
-@NgTemplateCache(cache: false)
-class MyComponent2
-{
-}
-
-
-@NgComponent(
-    selector: 'my-component3',
-    templateUrl: '/test/io/test_files/templates/dont.html')
-@NgTemplateCache(cache: true)
-class MyComponent3
-{
-}
+class MainClass {
+}
diff --git a/test/io/test_files/templates/partial.dart b/test/io/test_files/templates/partial.dart
@@ -0,0 +1,26 @@
+part of 'main.dart';
+
+@NgComponent(
+    selector: 'my-component',
+    templateUrl: '/test/io/test_files/templates/main.html')
+@NgTemplateCache()
+class MyComponent
+{
+}
+
+@NgComponent(
+    selector: 'my-component2',
+    templateUrl: '/test/io/test_files/templates/dont.html')
+@NgTemplateCache(cache: false)
+class MyComponent2
+{
+}
+
+
+@NgComponent(
+    selector: 'my-component3',
+    templateUrl: '/test/io/test_files/templates/dont.html')
+@NgTemplateCache(cache: true)
+class MyComponent3
+{
+}