New analyzer snapshot.

pkg/analyzer/lib/src/generated/engine.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine;
 
 import 'java_core.dart';
@@ skipping 5329 matching lines @@
         _cache.put(source, dartCopy);
         dartEntry = dartCopy;
       } else {
         logInformation2("Generated errors discarded for ${debuggingString(source)}; sourceTime = ${sourceTime}, resultTime = ${resultTime}, cacheTime = ${dartEntry.modificationTime}", thrownException);
         DartEntryImpl dartCopy = dartEntry.writableCopy;
         if (thrownException == null || resultTime >= 0) {
           //
           // The analysis was performed on out-of-date sources. Mark the cache so that the source
           // will be re-verified using the up-to-date sources.
           //
-          dartCopy.setState2(DartEntry.VERIFICATION_ERRORS, librarySource, CacheState.INVALID);
+          //          dartCopy.setState(DartEntry.VERIFICATION_ERRORS, librarySource, CacheState.INVALID);
+          dartCopy.invalidateAllInformation();
+          dartCopy.modificationTime = sourceTime;
         } else {
           //
           // We could not determine whether the sources were up-to-date or out-of-date. Mark the
           // cache so that we won't attempt to re-verify the source until there's a good chance
           // that we'll be able to do so without error.
           //
           dartCopy.setState2(DartEntry.VERIFICATION_ERRORS, librarySource, CacheState.ERROR);
         }
         dartCopy.exception = thrownException;
         _cache.put(source, dartCopy);
@@ skipping 78 matching lines @@
           dartEntry = dartCopy;
         } else {
           logInformation2("Generated hints discarded for ${debuggingString(unitSource)}; sourceTime = ${sourceTime}, resultTime = ${resultTime}, cacheTime = ${dartEntry.modificationTime}", thrownException);
           if (identical(dartEntry.getState2(DartEntry.HINTS, librarySource), CacheState.IN_PROCESS)) {
             DartEntryImpl dartCopy = dartEntry.writableCopy;
             if (thrownException == null || resultTime >= 0) {
               //
               // The analysis was performed on out-of-date sources. Mark the cache so that the sources
               // will be re-analyzed using the up-to-date sources.
               //
-              dartCopy.setState2(DartEntry.HINTS, librarySource, CacheState.INVALID);
+              //              dartCopy.setState(DartEntry.HINTS, librarySource, CacheState.INVALID);
+              dartCopy.invalidateAllInformation();
+              dartCopy.modificationTime = sourceTime;
             } else {
               //
               // We could not determine whether the sources were up-to-date or out-of-date. Mark the
               // cache so that we won't attempt to re-analyze the sources until there's a good chance
               // that we'll be able to do so without error.
               //
               dartCopy.setState2(DartEntry.HINTS, librarySource, CacheState.ERROR);
             }
             dartCopy.exception = thrownException;
             _cache.put(unitSource, dartCopy);
@@ skipping 82 matching lines @@
         _cache.put(source, dartCopy);
         dartEntry = dartCopy;
       } else {
         logInformation2("Parse results discarded for ${debuggingString(source)}; sourceTime = ${sourceTime}, resultTime = ${resultTime}, cacheTime = ${dartEntry.modificationTime}", thrownException);
         DartEntryImpl dartCopy = dartEntry.writableCopy;
         if (thrownException == null || resultTime >= 0) {
           //
           // The analysis was performed on out-of-date sources. Mark the cache so that the sources
           // will be re-analyzed using the up-to-date sources.
           //
-          dartCopy.recordParseNotInProcess();
+          //          dartCopy.recordParseNotInProcess();
+          dartCopy.invalidateAllInformation();
+          dartCopy.modificationTime = sourceTime;
         } else {
           //
           // We could not determine whether the sources were up-to-date or out-of-date. Mark the
           // cache so that we won't attempt to re-analyze the sources until there's a good chance
           // that we'll be able to do so without error.
           //
           dartCopy.recordParseError();
         }
         dartCopy.exception = thrownException;
         _cache.put(source, dartCopy);
@@ skipping 55 matching lines @@
         _cache.put(source, htmlCopy);
         htmlEntry = htmlCopy;
       } else {
         logInformation2("Parse results discarded for ${debuggingString(source)}; sourceTime = ${sourceTime}, resultTime = ${resultTime}, cacheTime = ${htmlEntry.modificationTime}", thrownException);
         HtmlEntryImpl htmlCopy = (sourceEntry as HtmlEntry).writableCopy;
         if (thrownException == null || resultTime >= 0) {
           //
           // The analysis was performed on out-of-date sources. Mark the cache so that the sources
           // will be re-analyzed using the up-to-date sources.
           //
-          if (identical(htmlCopy.getState(SourceEntry.LINE_INFO), CacheState.IN_PROCESS)) {
-            htmlCopy.setState(SourceEntry.LINE_INFO, CacheState.INVALID);
-          }
-          if (identical(htmlCopy.getState(HtmlEntry.PARSED_UNIT), CacheState.IN_PROCESS)) {
-            htmlCopy.setState(HtmlEntry.PARSED_UNIT, CacheState.INVALID);
-          }
-          if (identical(htmlCopy.getState(HtmlEntry.REFERENCED_LIBRARIES), CacheState.IN_PROCESS)) {
-            htmlCopy.setState(HtmlEntry.REFERENCED_LIBRARIES, CacheState.INVALID);
-          }
+          //          if (htmlCopy.getState(SourceEntry.LINE_INFO) == CacheState.IN_PROCESS) {
+          //            htmlCopy.setState(SourceEntry.LINE_INFO, CacheState.INVALID);
+          //          }
+          //          if (htmlCopy.getState(HtmlEntry.PARSED_UNIT) == CacheState.IN_PROCESS) {
+          //            htmlCopy.setState(HtmlEntry.PARSED_UNIT, CacheState.INVALID);
+          //          }
+          //          if (htmlCopy.getState(HtmlEntry.REFERENCED_LIBRARIES) == CacheState.IN_PROCESS) {
+          //            htmlCopy.setState(HtmlEntry.REFERENCED_LIBRARIES, CacheState.INVALID);
+          //          }
+          htmlCopy.invalidateAllInformation();
+          htmlCopy.modificationTime = sourceTime;
         } else {
           //
           // We could not determine whether the sources were up-to-date or out-of-date. Mark the
           // cache so that we won't attempt to re-analyze the sources until there's a good chance
           // that we'll be able to do so without error.
           //
           htmlCopy.setState(SourceEntry.LINE_INFO, CacheState.ERROR);
           htmlCopy.setState(HtmlEntry.PARSED_UNIT, CacheState.ERROR);
           htmlCopy.setState(HtmlEntry.REFERENCED_LIBRARIES, CacheState.ERROR);
         }
@@ skipping 51 matching lines @@
         htmlCopy.exception = thrownException;
         _cache.put(source, htmlCopy);
         htmlEntry = htmlCopy;
       } else {
         HtmlEntryImpl htmlCopy = htmlEntry.writableCopy;
         if (thrownException == null || resultTime >= 0) {
           //
           // The analysis was performed on out-of-date sources. Mark the cache so that the sources
           // will be re-analyzed using the up-to-date sources.
           //
-          if (identical(htmlCopy.getState(HtmlEntry.ANGULAR_ERRORS), CacheState.IN_PROCESS)) {
-            htmlCopy.setState(HtmlEntry.ANGULAR_ERRORS, CacheState.INVALID);
-          }
-          if (identical(htmlCopy.getState(HtmlEntry.ELEMENT), CacheState.IN_PROCESS)) {
-            htmlCopy.setState(HtmlEntry.ELEMENT, CacheState.INVALID);
-          }
-          if (identical(htmlCopy.getState(HtmlEntry.RESOLUTION_ERRORS), CacheState.IN_PROCESS)) {
-            htmlCopy.setState(HtmlEntry.RESOLUTION_ERRORS, CacheState.INVALID);
-          }
+          //          if (htmlCopy.getState(HtmlEntry.ANGULAR_ERRORS) == CacheState.IN_PROCESS) {
+          //            htmlCopy.setState(HtmlEntry.ANGULAR_ERRORS, CacheState.INVALID);
+          //          }
+          //          if (htmlCopy.getState(HtmlEntry.ELEMENT) == CacheState.IN_PROCESS) {
+          //            htmlCopy.setState(HtmlEntry.ELEMENT, CacheState.INVALID);
+          //          }
+          //          if (htmlCopy.getState(HtmlEntry.RESOLUTION_ERRORS) == CacheState.IN_PROCESS) {
+          //            htmlCopy.setState(HtmlEntry.RESOLUTION_ERRORS, CacheState.INVALID);
+          //          }
+          htmlCopy.invalidateAllInformation();
+          htmlCopy.modificationTime = sourceTime;
         } else {
           //
           // We could not determine whether the sources were up-to-date or out-of-date. Mark the
           // cache so that we won't attempt to re-analyze the sources until there's a good chance
           // that we'll be able to do so without error.
           //
           htmlCopy.recordResolutionError();
         }
         htmlCopy.exception = thrownException;
         _cache.put(source, htmlCopy);
@@ skipping 50 matching lines @@
         _cache.put(source, dartCopy);
         dartEntry = dartCopy;
       } else {
         logInformation2("Dependency resolution results discarded for ${debuggingString(source)}; sourceTime = ${sourceTime}, resultTime = ${resultTime}, cacheTime = ${dartEntry.modificationTime}", thrownException);
         DartEntryImpl dartCopy = dartEntry.writableCopy;
         if (thrownException == null || resultTime >= 0) {
           //
           // The analysis was performed on out-of-date sources. Mark the cache so that the sources
           // will be re-analyzed using the up-to-date sources.
           //
-          dartCopy.recordDependencyNotInProcess();
+          //          dartCopy.recordDependencyNotInProcess();
+          dartCopy.invalidateAllInformation();
+          dartCopy.modificationTime = sourceTime;
         } else {
           //
           // We could not determine whether the sources were up-to-date or out-of-date. Mark the
           // cache so that we won't attempt to re-analyze the sources until there's a good chance
           // that we'll be able to do so without error.
           //
           dartCopy.setState(DartEntry.EXPORTED_LIBRARIES, CacheState.ERROR);
           dartCopy.setState(DartEntry.IMPORTED_LIBRARIES, CacheState.ERROR);
           dartCopy.setState(DartEntry.INCLUDED_PARTS, CacheState.ERROR);
         }
@@ skipping 51 matching lines @@
         _cache.put(unitSource, dartCopy);
         dartEntry = dartCopy;
       } else {
         logInformation2("Resolution results discarded for ${debuggingString(unitSource)}; sourceTime = ${sourceTime}, resultTime = ${resultTime}, cacheTime = ${dartEntry.modificationTime}", thrownException);
         DartEntryImpl dartCopy = dartEntry.writableCopy;
         if (thrownException == null || resultTime >= 0) {
           //
           // The analysis was performed on out-of-date sources. Mark the cache so that the sources
           // will be re-analyzed using the up-to-date sources.
           //
-          if (identical(dartCopy.getState(DartEntry.RESOLVED_UNIT), CacheState.IN_PROCESS)) {
-            dartCopy.setState2(DartEntry.RESOLVED_UNIT, librarySource, CacheState.INVALID);
-          }
+          //          if (dartCopy.getState(DartEntry.RESOLVED_UNIT) == CacheState.IN_PROCESS) {
+          //            dartCopy.setState(DartEntry.RESOLVED_UNIT, librarySource, CacheState.INVALID);
+          //          }
+          dartCopy.invalidateAllInformation();
+          dartCopy.modificationTime = sourceTime;
         } else {
           //
           // We could not determine whether the sources were up-to-date or out-of-date. Mark the
           // cache so that we won't attempt to re-analyze the sources until there's a good chance
           // that we'll be able to do so without error.
           //
           dartCopy.setState2(DartEntry.RESOLVED_UNIT, librarySource, CacheState.ERROR);
         }
         dartCopy.exception = thrownException;
         _cache.put(unitSource, dartCopy);
@@ skipping 52 matching lines @@
         _cache.put(source, htmlCopy);
         htmlEntry = htmlCopy;
       } else {
         logInformation2("Resolution results discarded for ${debuggingString(source)}; sourceTime = ${sourceTime}, resultTime = ${resultTime}, cacheTime = ${htmlEntry.modificationTime}", thrownException);
         HtmlEntryImpl htmlCopy = htmlEntry.writableCopy;
         if (thrownException == null || resultTime >= 0) {
           //
           // The analysis was performed on out-of-date sources. Mark the cache so that the sources
           // will be re-analyzed using the up-to-date sources.
           //
-          if (identical(htmlCopy.getState(HtmlEntry.ELEMENT), CacheState.IN_PROCESS)) {
-            htmlCopy.setState(HtmlEntry.ELEMENT, CacheState.INVALID);
-          }
-          if (identical(htmlCopy.getState(HtmlEntry.RESOLUTION_ERRORS), CacheState.IN_PROCESS)) {
-            htmlCopy.setState(HtmlEntry.RESOLUTION_ERRORS, CacheState.INVALID);
-          }
+          //          if (htmlCopy.getState(HtmlEntry.ELEMENT) == CacheState.IN_PROCESS) {
+          //            htmlCopy.setState(HtmlEntry.ELEMENT, CacheState.INVALID);
+          //          }
+          //          if (htmlCopy.getState(HtmlEntry.RESOLUTION_ERRORS) == CacheState.IN_PROCESS) {
+          //            htmlCopy.setState(HtmlEntry.RESOLUTION_ERRORS, CacheState.INVALID);
+          //          }
+          htmlCopy.invalidateAllInformation();
+          htmlCopy.modificationTime = sourceTime;
         } else {
           //
           // We could not determine whether the sources were up-to-date or out-of-date. Mark the
           // cache so that we won't attempt to re-analyze the sources until there's a good chance
           // that we'll be able to do so without error.
           //
           htmlCopy.recordResolutionError();
         }
         htmlCopy.exception = thrownException;
         _cache.put(source, htmlCopy);
@@ skipping 1920 matching lines @@
       // new Angular context
       if (node.getAttribute(_NG_APP) != null) {
         _isAngular = true;
         visitModelDirectives(node);
       }
       // not Angular
       if (!_isAngular) {
         return super.visitXmlTagNode(node);
       }
       // process node in separate name scope
-      _nameScope = _resolver.pushNameScope();
+      pushNameScope();
       try {
         parseEmbeddedExpressions3(node);
         // apply processors
         for (NgProcessor processor in _processors) {
           if (processor.canApply(node)) {
             processor.apply(this, node);
           }
         }
         // resolve expressions
         resolveExpressions(node.expressions);
         // process children
         return super.visitXmlTagNode(node);
       } finally {
-        _resolver.popNameScope();
+        popNameScope();
       }
     } finally {
       _isAngular = wasAngular;
     }
   }
 
   /**
    * Creates new [LocalVariableElementImpl] with given type and identifier.
    *
    * @param type the [Type] of the variable
@@ skipping 59 matching lines @@
    */
   Expression parseExpression(String contents, int offset) => parseExpression2(contents, 0, contents.length, offset);
 
   Expression parseExpression2(String contents, int startIndex, int endIndex, int offset) {
     Token token = scanDart(contents, startIndex, endIndex, offset);
     return parseExpression3(token);
   }
 
   Expression parseExpression3(Token token) => ht.HtmlParser.parseEmbeddedExpression(_source, token, _errorListener);
 
+  void popNameScope() {
+    _nameScope = _resolver.popNameScope();
+  }
+
+  void pushNameScope() {
+    _nameScope = _resolver.pushNameScope();
+  }
+
   /**
    * Reports given [ErrorCode] at the given [ASTNode].
    */
   void reportError(ASTNode node, ErrorCode errorCode, List<Object> arguments) {
     reportError7(node.offset, node.length, errorCode, arguments);
   }
 
   /**
    * Reports given [ErrorCode] at the given position.
    */
@@ skipping 48 matching lines @@
   }
 
   /**
    * Puts into [resolver] an [ResolverVisitor] to resolve [Expression]s in
    * [source].
    */
   void createResolver() {
     InheritanceManager inheritanceManager = new InheritanceManager(_libraryElement);
     _resolver = new ResolverVisitor.con2(_libraryElement, _source, _typeProvider, inheritanceManager, _errorListener);
     _topNameScope = _resolver.pushNameScope();
+    // add Scope variables - no type, no location, just to avoid warnings
+    {
+      Type2 type = _typeProvider.dynamicType;
+      _topNameScope.define(createLocalVariable2(type, "\$id"));
+      _topNameScope.define(createLocalVariable2(type, "\$parent"));
+      _topNameScope.define(createLocalVariable2(type, "\$root"));
+    }
   }
 
   /**
    * Returns the external Dart script [Source] referenced by the given [HtmlUnit].
    */
   Source getDartSource(ht.HtmlUnit unit) {
     for (HtmlScriptElement script in unit.element.scripts) {
       if (script is ExternalHtmlScriptElement) {
         Source scriptSource = script.scriptSource;
         if (scriptSource != null) {
@@ skipping 275 matching lines @@
         if (selector is HasAttributeSelectorElementImpl) {
           name = selector.name;
         }
       }
       // resolve attribute expression
       ht.XmlAttributeNode attribute = node.getAttribute(name);
       if (attribute != null) {
         attribute.element = property;
         // resolve if binding
         if (property.propertyKind != AngularPropertyKind.ATTR) {
-          Expression expression = parseExpression(resolver, attribute);
-          resolver.resolveNode(expression);
-          setExpression(attribute, expression);
+          resolver.pushNameScope();
+          try {
+            onNgEventDirective(resolver);
+            Expression expression = parseExpression(resolver, attribute);
+            resolver.resolveNode(expression);
+            setExpression(attribute, expression);
+          } finally {
+            resolver.popNameScope();
+          }
         }
       }
     }
   }
 
   bool canApply(ht.XmlTagNode node) => _element.selector.apply(node);
+
+  /**
+   * Support for <code>$event</code> variable in <code>NgEventDirective</code>.
+   */
+  void onNgEventDirective(AngularHtmlUnitResolver resolver) {
+    if (_element.isClass("NgEventDirective")) {
+      Type2 dynamicType = resolver.typeProvider.dynamicType;
+      resolver.defineVariable(resolver.createLocalVariable2(dynamicType, "\$event"));
+    }
+  }
 }
 
 /**
  * [NgDirectiveProcessor] describes any <code>NgDirective</code> annotation instance.
  */
 abstract class NgDirectiveProcessor extends NgProcessor {
   static ht.EmbeddedExpression newEmbeddedExpression(Expression e) => new ht.EmbeddedExpression(e.offset, e, e.end);
 
   Expression parseExpression(AngularHtmlUnitResolver resolver, ht.XmlAttributeNode attribute) {
     int offset = attribute.valueToken.offset + 1;
@@ skipping 1464 matching lines @@
 
   void logError3(Exception exception) {
   }
 
   void logInformation(String message) {
   }
 
   void logInformation3(String message, Exception exception) {
   }
 }