Improved HTML parsing

editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/task/ParseHtmlTask.java

 /*
  * Copyright (c) 2013, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 package com.google.dart.engine.internal.task;
 
 import com.google.dart.engine.context.AnalysisException;
+import com.google.dart.engine.error.AnalysisError;
+import com.google.dart.engine.html.ast.HtmlScriptTagNode;
 import com.google.dart.engine.html.ast.HtmlUnit;
 import com.google.dart.engine.html.ast.XmlAttributeNode;
-import com.google.dart.engine.html.ast.XmlTagNode;
 import com.google.dart.engine.html.ast.visitor.RecursiveXmlVisitor;
 import com.google.dart.engine.html.parser.HtmlParseResult;
 import com.google.dart.engine.html.parser.HtmlParser;
 import com.google.dart.engine.html.scanner.HtmlScanResult;
 import com.google.dart.engine.html.scanner.HtmlScanner;
 import com.google.dart.engine.internal.context.InternalAnalysisContext;
+import com.google.dart.engine.internal.context.RecordingErrorListener;
 import com.google.dart.engine.source.Source;
 import com.google.dart.engine.utilities.source.LineInfo;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 
 /**
  * Instances of the class {@code ParseHtmlTask} parse a specific source as an HTML file.
  */
@@ skipping 12 matching lines @@
    * The line information that was produced.
    */
   private LineInfo lineInfo;
 
   /**
    * The HTML unit that was produced by parsing the source.
    */
   private HtmlUnit unit;
 
   /**
+   * The errors that were produced by scanning and parsing the source.
+   */
+  private AnalysisError[] errors = AnalysisError.NO_ERRORS;
+
+  /**
    * An array containing the sources of the libraries that are referenced within the HTML.
    */
   private Source[] referencedLibraries = Source.EMPTY_ARRAY;
 
   /**
    * The name of the 'src' attribute in a HTML tag.
    */
   private static final String ATTRIBUTE_SRC = "src";
 
   /**
@@ skipping 22 matching lines @@
     super(context);
     this.source = source;
   }
 
   @Override
   public <E> E accept(AnalysisTaskVisitor<E> visitor) throws AnalysisException {
     return visitor.visitParseHtmlTask(this);
   }
 
   /**
+   * Return the errors that were produced by scanning and parsing the source, or {@code null} if the
+   * task has not yet been performed or if an exception occurred.
+   * 
+   * @return the errors that were produced by scanning and parsing the source
+   */
+  public AnalysisError[] getErrors() {
+    return errors;
+  }
+
+  /**
    * Return the HTML unit that was produced by parsing the source.
    * 
    * @return the HTML unit that was produced by parsing the source
    */
   public HtmlUnit getHtmlUnit() {
     return unit;
   }
 
   /**
    * Return the line information that was produced, or {@code null} if the task has not yet been
@@ skipping 45 matching lines @@
   protected void internalPerform() throws AnalysisException {
     HtmlScanner scanner = new HtmlScanner(source);
     try {
       source.getContents(scanner);
     } catch (Exception exception) {
       throw new AnalysisException(exception);
     }
     HtmlScanResult scannerResult = scanner.getResult();
     modificationTime = scannerResult.getModificationTime();
     lineInfo = new LineInfo(scannerResult.getLineStarts());
-    HtmlParseResult result = new HtmlParser(source).parse(scannerResult);
+    final RecordingErrorListener errorListener = new RecordingErrorListener();
+    HtmlParseResult result = new HtmlParser(source, errorListener).parse(scannerResult);
     unit = result.getHtmlUnit();
+    errors = errorListener.getErrors(source);
     referencedLibraries = getLibrarySources();
   }
 
   /**
    * Return the sources of libraries that are referenced in the specified HTML file.
    * 
    * @return the sources of libraries that are referenced in the HTML file
    */
   private Source[] getLibrarySources() {
     final ArrayList<Source> libraries = new ArrayList<Source>();
     unit.accept(new RecursiveXmlVisitor<Void>() {
       @Override
-      public Void visitXmlTagNode(XmlTagNode node) {
-        if (node.getTag().getLexeme().equalsIgnoreCase(TAG_SCRIPT)) {
-          boolean isDartScript = false;
-          XmlAttributeNode scriptAttribute = null;
-          for (XmlAttributeNode attribute : node.getAttributes()) {
-            if (attribute.getName().getLexeme().equalsIgnoreCase(ATTRIBUTE_SRC)) {
-              scriptAttribute = attribute;
-            } else if (attribute.getName().getLexeme().equalsIgnoreCase(ATTRIBUTE_TYPE)) {
-              if (attribute.getText().equalsIgnoreCase(TYPE_DART)) {
-                isDartScript = true;
-              }
-            }
-          }
-          if (isDartScript && scriptAttribute != null) {
-            try {
-              URI uri = new URI(null, null, scriptAttribute.getText(), null);
-              String fileName = uri.getPath();
-              Source librarySource = getContext().getSourceFactory().resolveUri(source, fileName);
-              if (librarySource != null && librarySource.exists()) {
-                libraries.add(librarySource);
-              }
-            } catch (URISyntaxException e) {
-              // ignored - invalid URI reported during resolution phase
-            }
+      public Void visitHtmlScriptTagNode(HtmlScriptTagNode node) {
+        XmlAttributeNode scriptAttribute = null;
+        for (XmlAttributeNode attribute : node.getAttributes()) {
+          if (attribute.getName().getLexeme().equalsIgnoreCase(ATTRIBUTE_SRC)) {
+            scriptAttribute = attribute;
           }
         }
-        return super.visitXmlTagNode(node);
+        if (scriptAttribute != null) {
+          try {
+            URI uri = new URI(null, null, scriptAttribute.getText(), null);
+            String fileName = uri.getPath();
+            Source librarySource = getContext().getSourceFactory().resolveUri(source, fileName);
+            if (librarySource != null && librarySource.exists()) {
+              libraries.add(librarySource);
+            }
+          } catch (URISyntaxException e) {
+            // ignored - invalid URI reported during resolution phase
+          }
+        }
+        return super.visitHtmlScriptTagNode(node);
       }
     });
     if (libraries.isEmpty()) {
       return Source.EMPTY_ARRAY;
     }
     return libraries.toArray(new Source[libraries.size()]);
   }
 }