Merge pull request #581 from kevmoo/polymer

lib/src/analyzer.dart

Index: lib/src/analyzer.dart
diff --git a/lib/src/analyzer.dart b/lib/src/analyzer.dart
index 49f4826b06fa93adcda58db921cb59371dbd6349..add6a2d0e09f95f38e5f7e8e434e66055ecbca15 100644
--- a/lib/src/analyzer.dart
+++ b/lib/src/analyzer.dart
@@ -8,20 +8,16 @@
  */
 library analyzer;
 
-import 'package:csslib/parser.dart' as css;
-import 'package:csslib/visitor.dart' show StyleSheet, treeToDebugString, Visitor, Expressions, VarDefinition;
 import 'package:html5lib/dom.dart';
 import 'package:html5lib/dom_parsing.dart';
 import 'package:source_maps/span.dart' hide SourceFile;
 
 import 'custom_tag_name.dart';
-import 'dart_parser.dart';
+import 'dart_parser.dart' show parseDartCode;
 import 'files.dart';
-import 'html_css_fixup.dart';
 import 'info.dart';
 import 'messages.dart';
 import 'summary.dart';
-import 'utils.dart';
 
 /**
  * Finds custom elements in this file and the list of referenced files with
@@ -40,21 +36,6 @@ FileInfo analyzeDefinitions(GlobalInfo global, UrlInfo inputUrl,
 }
 
 /**
- * Extract relevant information from [source] and it's children.
- * Used for testing.
- *
- * Adds emitted error/warning messages to [messages], if [messages] is
- * supplied.
- */
-FileInfo analyzeNodeForTesting(Node source, Messages messages,
-    {String filepath: 'mock_testing_file.html'}) {
-  var result = new FileInfo(new UrlInfo(filepath, filepath, null));
-  new _Analyzer(result, new IntIterator(), new GlobalInfo(), messages)
-      .visit(source);
-  return result;
-}
-
-/**
  *  Extract relevant information from all files found from the root document.
  *
  *  Adds emitted error/warning messages to [messages], if [messages] is
@@ -62,9 +43,10 @@ FileInfo analyzeNodeForTesting(Node source, Messages messages,
  */
 void analyzeFile(SourceFile file, Map<String, FileInfo> info,
                  Iterator<int> uniqueIds, GlobalInfo global,
-                 Messages messages) {
+                 Messages messages, emulateScopedCss) {
   var fileInfo = info[file.path];
-  var analyzer = new _Analyzer(fileInfo, uniqueIds, global, messages);
+  var analyzer = new _Analyzer(fileInfo, uniqueIds, global, messages,
+      emulateScopedCss);
   analyzer._normalize(fileInfo, info);
   analyzer.visit(file.document);
 }
@@ -90,7 +72,10 @@ class _Analyzer extends TreeVisitor {
    */
   bool _keepIndentationSpaces = true;
 
-  _Analyzer(this._fileInfo, this._uniqueIds, this._global, this._messages) {
+  final bool _emulateScopedCss;
+
+  _Analyzer(this._fileInfo, this._uniqueIds, this._global, this._messages,
+      this._emulateScopedCss) {
     _currentInfo = _fileInfo;
   }
 
@@ -103,7 +88,7 @@ class _Analyzer extends TreeVisitor {
     if (node.tagName == 'style') {
       // We've already parsed the CSS.
       // If this is a component remove the style node.
-      if (_currentInfo is ComponentInfo) node.remove();
+      if (_currentInfo is ComponentInfo && _emulateScopedCss) node.remove();
       return;
     }
 
@@ -438,7 +423,6 @@ class _ElementLoader extends TreeVisitor {
 
     var tagName = node.attributes['name'];
     var extendsTag = node.attributes['extends'];
-    var templateNodes = node.nodes.where((n) => n.tagName == 'template');
 
     if (tagName == null) {
       _messages.error('Missing tag name of the component. Please include an '
@@ -563,7 +547,7 @@ class _ElementLoader extends TreeVisitor {
           'file.', node.sourceSpan);
     } else {
       _currentInfo.inlinedCode = parseDartCode(
-          _currentInfo.dartCodeUrl.resolvedPath, text.value, _messages,
+          _currentInfo.dartCodeUrl.resolvedPath, text.value,
           text.sourceSpan.start);
       if (_currentInfo.userCode.partOf != null) {
         _messages.error('expected a library, not a part.',
@@ -580,153 +564,3 @@ class _ElementLoader extends TreeVisitor {
         node.sourceSpan);
   }
 }
-
-
-void analyzeCss(String packageRoot, List<SourceFile> files,
-                Map<String, FileInfo> info, Map<String, String> pseudoElements,
-                Messages messages, {warningsAsErrors: false}) {
-  var analyzer = new _AnalyzerCss(packageRoot, info, pseudoElements, messages,
-      warningsAsErrors);
-  for (var file in files) analyzer.process(file);
-  analyzer.normalize();
-}
-
-class _AnalyzerCss {
-  final String packageRoot;
-  final Map<String, FileInfo> info;
-  final Map<String, String> _pseudoElements;
-  final Messages _messages;
-  final bool _warningsAsErrors;
-
-  Set<StyleSheet> allStyleSheets = new Set<StyleSheet>();
-
-  /**
-   * [_pseudoElements] list of known pseudo attributes found in HTML, any
-   * CSS pseudo-elements 'name::custom-element' is mapped to the manged name
-   * associated with the pseudo-element key.
-   */
-  _AnalyzerCss(this.packageRoot, this.info, this._pseudoElements,
-               this._messages, this._warningsAsErrors);
-
-  /**
-   * Run the analyzer on every file that is a style sheet or any component that
-   * has a style tag.
-   */
-  void process(SourceFile file) {
-    var fileInfo = info[file.path];
-    if (file.isStyleSheet || fileInfo.styleSheets.length > 0) {
-      var styleSheets = processVars(fileInfo);
-
-      // Add to list of all style sheets analyzed.
-      allStyleSheets.addAll(styleSheets);
-    }
-
-    // Process any components.
-    for (var component in fileInfo.declaredComponents) {
-      var all = processVars(component);
-
-      // Add to list of all style sheets analyzed.
-      allStyleSheets.addAll(all);
-    }
-
-    processCustomPseudoElements();
-  }
-
-  void normalize() {
-    // Remove all var definitions for all style sheets analyzed.
-    for (var tree in allStyleSheets) new RemoveVarDefinitions().visitTree(tree);
-  }
-
-  List<StyleSheet> processVars(var libraryInfo) {
-    // Get list of all stylesheet(s) dependencies referenced from this file.
-    var styleSheets = _dependencies(libraryInfo).toList();
-
-    var errors = [];
-    css.analyze(styleSheets, errors: errors, options:
-      [_warningsAsErrors ? '--warnings_as_errors' : '', 'memory']);
-
-    // Print errors as warnings.
-    for (var e in errors) {
-      _messages.warning(e.message, e.span);
-    }
-
-    // Build list of all var definitions.
-    Map varDefs = new Map();
-    for (var tree in styleSheets) {
-      var allDefs = (new VarDefinitions()..visitTree(tree)).found;
-      allDefs.forEach((key, value) {
-        varDefs[key] = value;
-      });
-    }
-
-    // Resolve all definitions to a non-VarUsage (terminal expression).
-    varDefs.forEach((key, value) {
-      for (var expr in (value.expression as Expressions).expressions) {
-        var def = findTerminalVarDefinition(varDefs, value);
-        varDefs[key] = def;
-      }
-    });
-
-    // Resolve all var usages.
-    for (var tree in styleSheets) new ResolveVarUsages(varDefs).visitTree(tree);
-
-    return styleSheets;
-  }
-
-  processCustomPseudoElements() {
-    var polyFiller = new PseudoElementExpander(_pseudoElements);
-    for (var tree in allStyleSheets) {
-      polyFiller.visitTree(tree);
-    }
-  }
-
-  /**
-   * Given a component or file check if any stylesheets referenced.  If so then
-   * return a list of all referenced stylesheet dependencies (@imports or <link
-   * rel="stylesheet" ..>).
-   */
-  Set<StyleSheet> _dependencies(var libraryInfo, {Set<StyleSheet> seen}) {
-    if (seen == null) seen = new Set();
-
-    // Used to resolve all pathing information.
-    var inputUrl = libraryInfo is FileInfo
-        ? libraryInfo.inputUrl
-        : (libraryInfo as ComponentInfo).declaringFile.inputUrl;
-
-    for (var styleSheet in libraryInfo.styleSheets) {
-      if (!seen.contains(styleSheet)) {
-        // TODO(terry): VM uses expandos to implement hashes.  Currently, it's a
-        //              linear (not constant) time cost (see dartbug.com/5746).
-        //              If this bug isn't fixed and performance show's this a
-        //              a problem we'll need to implement our own hashCode or
-        //              use a different key for better perf.
-        // Add the stylesheet.
-        seen.add(styleSheet);
-
-        // Any other imports in this stylesheet?
-        var urlInfos = findImportsInStyleSheet(styleSheet, packageRoot,
-            inputUrl, _messages);
-
-        // Process other imports in this stylesheets.
-        for (var importSS in urlInfos) {
-          var importInfo = info[importSS.resolvedPath];
-          if (importInfo != null) {
-            // Add all known stylesheets processed.
-            seen.addAll(importInfo.styleSheets);
-            // Find dependencies for stylesheet referenced with a
-            // @import
-            for (var ss in importInfo.styleSheets) {
-              var urls = findImportsInStyleSheet(ss, packageRoot, inputUrl,
-                  _messages);
-              for (var url in urls) {
-                _dependencies(info[url.resolvedPath], seen: seen);
-              }
-            }
-          }
-        }
-      }
-    }
-
-    return seen;
-  }
-}