Summary integration

analyzer_plugin/lib/ast.dart

@@ -16,6 +16,12 @@ abstract class AngularAstNode {
 }
 
 abstract class AngularAstVisitor {
+  void visitDocumentInfo(DocumentInfo document) {
+    for (AngularAstNode child in document.childNodes) {
+      child.accept(this);
+    }
+  }
+
   void visitMustache(Mustache mustache) {}
 
   void visitTextAttr(TextAttribute textAttr) => _visitAllChildren(textAttr);
@@ -185,13 +191,21 @@ class Mustache extends AngularAstNode {
   Expression expression;
   final int offset;
   final int length;
+  final int exprBegin;
+  final int exprEnd;
 
   Map<String, LocalVariable> localVariables =
       new HashMap<String, LocalVariable>();
 
   List<AngularAstNode> get children => const <AngularAstNode>[];
 
-  Mustache(this.offset, this.length, this.expression);
+  Mustache(
+    this.offset,
+    this.length,
+    this.expression,
+    this.exprBegin,
+    this.exprEnd,
+  );
 
   void accept(AngularAstVisitor visitor) => visitor.visitMustache(this);
 }
@@ -287,6 +301,36 @@ class TextInfo extends NodeInfo {
   void accept(AngularAstVisitor visitor) => visitor.visitTextInfo(this);
 }
 
+/**
+ * A wrapper for a given HTML document or
+ * dart-angular inline HTML template.
+ */
+class DocumentInfo extends ElementInfo {
+  factory DocumentInfo() = DocumentInfo._;
+
+  DocumentInfo._()
+      : super(
+          '',
+          new SourceRange(0, 0),
+          new SourceRange(0, 0),
+          new SourceRange(0, 0),
+          new SourceRange(0, 0),
+          false,
+          [],
+          null,
+          null,
+        );
+
+  @override
+  bool get isSynthetic => false;
+
+  @override
+  List<AngularAstNode> get children => childNodes;
+
+  @override
+  void accept(AngularAstVisitor visitor) => visitor.visitDocumentInfo(this);
+}
+
 /**
  * An element in an HTML tree.
  */

analyzer_plugin/lib/src/angular_driver.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:async';
 import 'dart:collection';
 import 'package:analysis_server/src/analysis_server.dart';
+import 'package:analyzer/context/context_root.dart';
 import 'package:analyzer/src/dart/analysis/byte_store.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/generated/sdk.dart';
@@ -58,6 +59,8 @@ class AngularDriver
     _fileTracker = new FileTracker(this);
   }
 
+  ContextRoot get contextRoot => dartDriver.contextRoot;
+
   ApiSignature getUnitElementHash(String path) {
     return dartDriver.getUnitKeyByPath(path);
   }
@@ -277,13 +280,13 @@ class AngularDriver
           final tplParser = new TemplateParser();
 
           tplParser.parse(htmlContent, htmlSource);
-          final document = tplParser.document;
+          final document = tplParser.rawAst;
           final EmbeddedDartParser parser = new EmbeddedDartParser(
               htmlSource, tplErrorListener, errorReporter);
 
           template.ast =
               new HtmlTreeConverter(parser, htmlSource, tplErrorListener)
-                  .convert(firstElement(tplParser.document));
+                  .convertFromAstList(tplParser.rawAst);
           template.ast.accept(new NgContentRecorder(directive, errorReporter));
           setIgnoredErrors(template, document);
           final resolver = new TemplateResolver(
@@ -349,7 +352,7 @@ class AngularDriver
         new EmbeddedDartParser(source, tplErrorListener, errorReporter);
 
     final ast = new HtmlTreeConverter(parser, source, tplErrorListener)
-        .convert(firstElement(tplParser.document));
+        .convertFromAstList(tplParser.rawAst);
     final contents = <NgContent>[];
     ast.accept(new NgContentRecorder.forFile(contents, source, errorReporter));
 
@@ -387,8 +390,17 @@ class AngularDriver
 
   Future<DirectivesResult> resolveDart(String path,
       {bool withDirectives: false}) async {
-    final key =
-        (await dartDriver.getUnitElementSignature(path)) + '.ngresolved';
+    final baseKey = await dartDriver.getUnitElementSignature(path);
+
+    // This happens when the path is..."hidden by a generated file"..whch I
+    // don't understand, but, can protect against. Should not be analyzed.
+    // TODO detect this on file add rather than on file analyze.
+    if (baseKey == null) {
+      _dartFiles.remove(path);
+      return null;
+    }
+
+    final key = baseKey + '.ngresolved';
 
     if (lastSignatures[path] == key) {
       return null;
@@ -448,12 +460,12 @@ class AngularDriver
 
           tplParser.parse(view.templateText, source,
               offset: view.templateOffset);
-          final document = tplParser.document;
+          final document = tplParser.rawAst;
           final EmbeddedDartParser parser =
               new EmbeddedDartParser(source, tplErrorListener, errorReporter);
 
           template.ast = new HtmlTreeConverter(parser, source, tplErrorListener)
-              .convert(firstElement(tplParser.document));
+              .convertFromAstList(tplParser.rawAst);
           template.ast.accept(new NgContentRecorder(directive, errorReporter));
           setIgnoredErrors(template, document);
           final resolver = new TemplateResolver(
@@ -565,7 +577,7 @@ class AngularDriver
               new EmbeddedDartParser(source, tplErrorListener, errorReporter);
 
           template.ast = new HtmlTreeConverter(parser, source, tplErrorListener)
-              .convert(firstElement(tplParser.document));
+              .convertFromAstList(tplParser.rawAst);
           template.ast.accept(new NgContentRecorder(directive, errorReporter));
         }
       }