Remove processing of dart code, summary.dart, simplified info.dart

pkg/polymer/lib/src/analyzer.dart

Index: pkg/polymer/lib/src/analyzer.dart
diff --git a/pkg/polymer/lib/src/analyzer.dart b/pkg/polymer/lib/src/analyzer.dart
index 176b30a872f9012a955a65b1b6be69d334d4bfb7..2abcf7cea04fb21e55127def58254a7babef431d 100644
--- a/pkg/polymer/lib/src/analyzer.dart
+++ b/pkg/polymer/lib/src/analyzer.dart
@@ -10,14 +10,11 @@ library analyzer;
 
 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' show parseDartCode;
 import 'files.dart';
 import 'info.dart';
 import 'messages.dart';
-import 'summary.dart';
 
 /**
  * Finds custom elements in this file and the list of referenced files with
@@ -27,8 +24,8 @@ import 'summary.dart';
  * supplied.
  */
 FileInfo analyzeDefinitions(GlobalInfo global, UrlInfo inputUrl,
-    Document document, Messages messages, {bool isEntryPoint: false}) {
-  var result = new FileInfo(inputUrl, isEntryPoint);
+    Document document, Messages messages) {

[terry, 2013/08/28 21:41:52]

I we plan of only running in pub deploy should Messages change to the Transform
logger?

[Jennifer Messerly, 2013/08/28 22:10:25]

+1 ... please kill Messages :)

[Siggi Cherem (dart-lang), 2013/08/29 00:34:15]

I'll keep it in mind, but I wont do it just yet. What happens is that the
analyzer code is separate from the deploy code. So far I was not planning on
using barback to run the analzyer, but we could switch to that in the future.
Meanwhile, we need to keep messages. I'll make it simpler though =).

+  var result = new FileInfo(inputUrl);
   var loader = new _ElementLoader(global, result, messages);
   loader.visit(document);
   return result;
@@ -138,10 +135,6 @@ class _Analyzer extends TreeVisitor {
 
     _keepIndentationSpaces = keepSpaces;
     _currentInfo = lastInfo;
-
-    if (node.tagName == 'body' || node.parent == null) {
-      _fileInfo.body = node;
-    }
   }
 
   void _analyzeComponent(ComponentInfo component) {
@@ -153,10 +146,6 @@ class _Analyzer extends TreeVisitor {
           'custom element with tag name ${component.extendsTag} not found.',
           component.element.sourceSpan);
     }
-
-    // Now that the component's code has been loaded, we can validate that the
-    // class exists.
-    component.findClassDeclaration(_messages);
   }
 
   void _bindCustomElement(Element node) {
@@ -181,10 +170,6 @@ class _Analyzer extends TreeVisitor {
     }
 
     if (component != null) {
-      if (!component.hasConflict) {
-        _currentInfo.usedComponents[component] = true;
-      }
-
       var baseTag = component.baseExtendsTag;
       var nodeTag = node.tagName;
       var hasIsAttribute = node.attributes.containsKey('is');
@@ -270,15 +255,10 @@ class _Analyzer extends TreeVisitor {
    *   * we scan all [info.componentLinks] and import their
    *     [info.declaredComponents], using [files] to map the href to the file
    *     info. Names in [info] will shadow names from imported files.
-   *   * we fill [LibraryInfo.externalCode] on each component declared in
-   *     [info].
    */
   void _normalize(FileInfo info, Map<String, FileInfo> files) {
-    _attachExtenalScript(info, files);
-
     for (var component in info.declaredComponents) {
       _addComponent(info, component);
-      _attachExtenalScript(component, files);
     }
 
     for (var link in info.componentLinks) {
@@ -289,20 +269,8 @@ class _Analyzer extends TreeVisitor {
     }
   }
 
-  /**
-   * Stores a direct reference in [info] to a dart source file that was loaded
-   * in a script tag with the 'src' attribute.
-   */
-  void _attachExtenalScript(LibraryInfo info, Map<String, FileInfo> files) {
-    var externalFile = info.externalFile;
-    if (externalFile != null) {
-      info.externalCode = files[externalFile.resolvedPath];
-      if (info.externalCode != null) info.externalCode.htmlFile = info;
-    }
-  }
-
   /** Adds a component's tag name to the names in scope for [fileInfo]. */
-  void _addComponent(FileInfo fileInfo, ComponentSummary component) {
+  void _addComponent(FileInfo fileInfo, ComponentInfo component) {
     var existing = fileInfo.components[component.tagName];
     if (existing != null) {
       if (existing == component) {
@@ -436,7 +404,7 @@ class _ElementLoader extends TreeVisitor {
       return;
     }
 
-    var component = new ComponentInfo(node, _fileInfo, tagName, extendsTag);
+    var component = new ComponentInfo(node, tagName, extendsTag);
     _fileInfo.declaredComponents.add(component);
     _addComponent(component);
 
@@ -493,20 +461,7 @@ class _ElementLoader extends TreeVisitor {
       return;
     }
 
-    if (scriptType != 'application/dart') {
-      if (_currentInfo is ComponentInfo) {
-        // TODO(jmesserly): this warning should not be here, but our compiler
-        // does the wrong thing and it could cause surprising behavior, so let
-        // the user know! See issue #340 for more info.
-        // What we should be doing: leave JS component untouched by compiler.
-        _messages.warning('our custom element implementation does not support '
-            'JavaScript components yet. If this is affecting you please let us '
-            'know at https://github.com/dart-lang/web-ui/issues/340.',
-            node.sourceSpan);
-      }
-
-      return;
-    }
+    if (scriptType != 'application/dart') return;
 
     if (src != null) {
       if (!src.endsWith('.dart')) {
@@ -519,45 +474,6 @@ class _ElementLoader extends TreeVisitor {
         _messages.error('script tag has "src" attribute and also has script '
             'text.', node.sourceSpan);
       }
-
-      if (_currentInfo.codeAttached) {
-        _tooManyScriptsError(node);
-      } else {
-        _currentInfo.externalFile = UrlInfo.resolve(src, _fileInfo.inputUrl,
-            node.sourceSpan, _messages);
-      }
-      return;
     }
-
-    if (node.nodes.length == 0) return;
-
-    // I don't think the html5 parser will emit a tree with more than
-    // one child of <script>
-    assert(node.nodes.length == 1);
-    Text text = node.nodes[0];
-
-    if (_currentInfo.codeAttached) {
-      _tooManyScriptsError(node);
-    } else if (_currentInfo == _fileInfo && !_fileInfo.isEntryPoint) {
-      _messages.warning('top-level dart code is ignored on '
-          ' HTML pages that define components, but are not the entry HTML '
-          'file.', node.sourceSpan);
-    } else {
-      _currentInfo.inlinedCode = parseDartCode(
-          _currentInfo.dartCodeUrl.resolvedPath, text.value,
-          text.sourceSpan.start);
-      if (_currentInfo.userCode.partOf != null) {
-        _messages.error('expected a library, not a part.',
-            node.sourceSpan);
-      }
-    }
-  }
-
-  void _tooManyScriptsError(Node node) {
-    var location = _currentInfo is ComponentInfo ?
-        'a custom element declaration' : 'the top-level HTML page';
-
-    _messages.error('there should be only one dart script tag in $location.',
-        node.sourceSpan);
   }
 }