Revert revision 33053

third_party/pkg/angular/lib/tools/html_extractor.dart

 library angular.html_parser;
 
 import 'package:html5lib/parser.dart';
 import 'package:html5lib/dom.dart';
 
 import 'package:angular/tools/selector.dart';
 import 'package:angular/tools/io.dart';
 import 'package:angular/tools/common.dart';
 
 typedef NodeVisitor(Node node);
 
 RegExp _MUSTACHE_REGEXP = new RegExp(r'{{([^}]*)}}');
 RegExp _NG_REPEAT_SYNTAX = new RegExp(r'^\s*(.+)\s+in\s+(.*?)\s*(\s+track\s+by\s+(.+)\s*)?$');
 
 class HtmlExpressionExtractor {
   List<DirectiveInfo> directiveInfos;
+  IoService ioService;
 
-  HtmlExpressionExtractor(this.directiveInfos) {
+  HtmlExpressionExtractor(this.directiveInfos, this.ioService);
+
+  Set<String> expressions = new Set<String>();
+
+  void crawl(root) {
+    ioService.visitFs(root, (String file) {
+      if (!file.endsWith('.html')) return;
+
+      _parseHtml(ioService.readAsStringSync(file));
+    });
     for (DirectiveInfo directiveInfo in directiveInfos) {
       expressions.addAll(directiveInfo.expressions);
       if (directiveInfo.template != null) {
-        parseHtml(directiveInfo.template);
+        _parseHtml(directiveInfo.template);
       }
     }
   }
 
-  Set<String> expressions = new Set<String>();
-
-  void crawl(String root, IoService ioService) {
-    ioService.visitFs(root, (String file) {
-      if (!file.endsWith('.html')) return;
-      parseHtml(ioService.readAsStringSync(file));
-    });
-  }
-
-  void parseHtml(String html) {
+  void _parseHtml(String html) {
     var document = parse(html);
     visitNodes([document], (Node node) {
       if (matchesNode(node, r'[*=/{{.*}}/]')) {
         node.attributes.forEach((attrName, attrValue) {
           _MUSTACHE_REGEXP.allMatches(attrValue).forEach((match) {
             expressions.add(match.group(1));
           });
         });
       }
       if (matchesNode(node, r':contains(/{{.*}}/)')) {
@@ skipping 22 matching lines @@
   visitNodes(List<Node> nodes, NodeVisitor visitor) {
     for (Node node in nodes) {
       visitor(node);
       if (node.nodes.length > 0) {
         visitNodes(node.nodes, visitor);
       }
     }
   }
 }