New analyzer snapshot.

pkg/analyzer/lib/src/generated/resolver.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.resolver;
 
 import 'dart:collection';
@@ skipping 134 matching lines @@
     }
     // no Element
     return null;
   }
 
   /**
    * Parses given selector text and returns [AngularSelectorElement]. May be `null` if
    * cannot parse.
    */
   static AngularSelectorElement parseSelector(int offset, String text) {
+    // [attribute]
     if (StringUtilities.startsWithChar(text, 0x5B) && StringUtilities.endsWithChar(text, 0x5D)) {
       int nameOffset = offset + "[".length;
       String attributeName = text.substring(1, text.length - 1);
       // TODO(scheglov) report warning if there are spaces between [ and identifier
       return new HasAttributeSelectorElementImpl(attributeName, nameOffset);
     }
+    // tag[attribute]
+    if (StringUtilities.endsWithChar(text, 0x5D)) {
+      int index = StringUtilities.indexOf1(text, 0, 0x5B);
+      if (index != -1) {
+        String tagName = text.substring(0, index);
+        String attributeName = text.substring(index + 1, text.length - 1);
+        if (StringUtilities.isTagName(tagName)) {
+          return new IsTagHasAttributeSelectorElementImpl(tagName, attributeName);
+        }
+      }
+    }
+    // tag
     if (StringUtilities.isTagName(text)) {
       return new IsTagSelectorElementImpl(text, offset);
     }
     return null;
   }
 
   /**
    * Adds [AngularElement] declared by the given top-level [Element].
    *
    * @param angularElements the list to fill with top-level [AngularElement]s
@@ skipping 220 matching lines @@
   }
 
   /**
    * Checks if [annotation] is an annotation with required name.
    */
   bool isAngularAnnotation2(String name) => isAngularAnnotation(_annotation, name);
 
   void parseNgComponent() {
     bool isValid = true;
     // publishAs
-    if (!hasStringArgument(_PUBLISH_AS)) {
-      reportErrorForAnnotation(AngularCode.MISSING_PUBLISH_AS, []);
-      isValid = false;
+    String name = null;
+    int nameOffset = -1;
+    if (hasStringArgument(_PUBLISH_AS)) {
+      name = getStringArgument(_PUBLISH_AS);
+      nameOffset = getStringArgumentOffset(_PUBLISH_AS);
     }
     // selector
     AngularSelectorElement selector = null;
     if (!hasStringArgument(_SELECTOR)) {
       reportErrorForAnnotation(AngularCode.MISSING_SELECTOR, []);
       isValid = false;
     } else {
       SimpleStringLiteral selectorLiteral = getStringLiteral(_SELECTOR);
       selector = parseSelector2(selectorLiteral);
       if (selector == null) {
         reportErrorForArgument(_SELECTOR, AngularCode.CANNOT_PARSE_SELECTOR, [selectorLiteral]);
         isValid = false;
       }
     }
     // templateUrl
-    if (!hasStringArgument(_TEMPLATE_URL)) {
-      reportErrorForAnnotation(AngularCode.MISSING_TEMPLATE_URL, []);
-      isValid = false;
+    String templateUri = null;
+    int templateUriOffset = -1;
+    if (hasStringArgument(_TEMPLATE_URL)) {
+      templateUri = getStringArgument(_TEMPLATE_URL);
+      templateUriOffset = getStringArgumentOffset(_TEMPLATE_URL);
     }
     // cssUrl
-    if (!hasStringArgument(_CSS_URL)) {
-      reportErrorForAnnotation(AngularCode.MISSING_CSS_URL, []);
-      isValid = false;
+    String styleUri = null;
+    int styleUriOffset = -1;
+    if (hasStringArgument(_CSS_URL)) {
+      styleUri = getStringArgument(_CSS_URL);
+      styleUriOffset = getStringArgumentOffset(_CSS_URL);
     }
     // create
     if (isValid) {
-      String name = getStringArgument(_PUBLISH_AS);
-      int nameOffset = getStringArgumentOffset(_PUBLISH_AS);
-      String templateUri = getStringArgument(_TEMPLATE_URL);
-      int templateUriOffset = getStringArgumentOffset(_TEMPLATE_URL);
-      String styleUri = getStringArgument(_CSS_URL);
-      int styleUriOffset = getStringArgumentOffset(_CSS_URL);
       AngularComponentElementImpl element = new AngularComponentElementImpl(name, nameOffset);
       element.selector = selector;
       element.templateUri = templateUri;
       element.templateUriOffset = templateUriOffset;
       // resolve template URI
       // TODO(scheglov) resolve to HtmlElement to allow F3 ?
-      {
+      if (templateUri != null) {
         try {
           parseUriWithException(templateUri);
           // TODO(scheglov) think if there is better solution
           if (templateUri.startsWith("packages/")) {
             templateUri = "package:${templateUri.substring("packages/".length)}";
           }
           Source templateSource = _context.sourceFactory.resolveUri(_source, templateUri);
           if (templateSource == null || !templateSource.exists()) {
+            templateSource = _context.sourceFactory.resolveUri(_source, "package:${templateUri}");
+          }
+          if (templateSource == null || !templateSource.exists()) {
             reportErrorForArgument(_TEMPLATE_URL, AngularCode.URI_DOES_NOT_EXIST, [templateUri]);
           }
-          element.templateSource = templateSource;
+          if (AnalysisEngine.isHtmlFileName(templateUri)) {
+            element.templateSource = templateSource;
+          }
         } on URISyntaxException catch (exception) {
           reportErrorForArgument(_TEMPLATE_URL, AngularCode.INVALID_URI, [templateUri]);
         }
       }
       element.styleUri = styleUri;
       element.styleUriOffset = styleUriOffset;
       element.properties = parseNgComponentProperties(true);
       _classToolkitObjects.add(element);
     }
   }
@@ skipping 100 matching lines @@
       } else if (StringUtilities.startsWith3(spec, 0, 0x3C, 0x3D, 0x3E)) {
         kind = AngularPropertyKind.TWO_WAY;
         fieldNameOffset = 3;
       } else {
         reportError(specLiteral, AngularCode.INVALID_PROPERTY_KIND, [spec]);
         continue;
       }
       String fieldName = spec.substring(fieldNameOffset);
       fieldNameOffset += specLiteral.valueOffset;
       // prepare field
-      FieldElement field = _classElement.getField(fieldName);
-      if (field == null) {
+      PropertyAccessorElement setter = _classElement.type.lookUpSetter(fieldName, _classElement.library);
+      if (setter == null) {
         reportError2(fieldNameOffset, fieldName.length, AngularCode.INVALID_PROPERTY_FIELD, [fieldName]);
         continue;
       }
+      FieldElement field = setter.variable as FieldElement;
       // add property
       AngularPropertyElementImpl property = new AngularPropertyElementImpl(name, nameOffset);
       property.field = field;
       property.propertyKind = kind;
       property.fieldNameOffset = fieldNameOffset;
       properties.add(property);
     }
   }
 
   void parseNgController() {
@@ skipping 7604 matching lines @@
   Source getSource(UriBasedDirective directive) {
     StringLiteral uriLiteral = directive.uri;
     if (uriLiteral is StringInterpolation) {
       _errorListener.onError(new AnalysisError.con2(librarySource, uriLiteral.offset, uriLiteral.length, CompileTimeErrorCode.URI_WITH_INTERPOLATION, []));
       return null;
     }
     String uriContent = uriLiteral.stringValue.trim();
     _directiveUris[directive] = uriContent;
     uriContent = Uri.encodeFull(uriContent);
     if (directive is ImportDirective && uriContent.startsWith(_DART_EXT_SCHEME)) {
-      String uriBase = uriContent.substring(_DART_EXT_SCHEME.length);
-      Source source = _analysisContext.sourceFactory.resolveUri(librarySource, "${uriBase}.dll");
-      if (source == null || !source.exists()) {
-        source = _analysisContext.sourceFactory.resolveUri(librarySource, "${uriBase}.so");
-        if (source == null || !source.exists()) {
-          source = _analysisContext.sourceFactory.resolveUri(librarySource, "${uriBase}.dylib");
-          if (source == null || !source.exists()) {
-            _errorListener.onError(new AnalysisError.con2(librarySource, uriLiteral.offset, uriLiteral.length, CompileTimeErrorCode.URI_DOES_NOT_EXIST, [uriContent]));
-          }
-        }
-      }
       _libraryElement.hasExtUri2 = true;
       return null;
     }
     try {
       parseUriWithException(uriContent);
       Source source = _analysisContext.sourceFactory.resolveUri(librarySource, uriContent);
       if (source == null || !source.exists()) {
         _errorListener.onError(new AnalysisError.con2(librarySource, uriLiteral.offset, uriLiteral.length, CompileTimeErrorCode.URI_DOES_NOT_EXIST, [uriContent]));
       }
       return source;
@@ skipping 2541 matching lines @@
 
   /**
    * Return the library element for the library containing the compilation unit being resolved.
    *
    * @return the library element for the library containing the compilation unit being resolved
    */
   LibraryElement get definingLibrary => _definingLibrary;
 
   /**
    * Replaces the current [Scope] with the enclosing [Scope].
+   *
+   * @return the enclosing [Scope].
    */
-  void popNameScope() {
+  Scope popNameScope() {
     _nameScope = _nameScope.enclosingScope;
+    return _nameScope;
   }
 
   /**
    * Pushes a new [Scope] into the visitor.
    *
    * @return the new [Scope].
    */
   Scope pushNameScope() {
     Scope newScope = new EnclosedScope(_nameScope);
     _nameScope = newScope;
-    return newScope;
+    return _nameScope;
   }
 
   /**
    * Report an error with the given analysis error.
    *
    * @param errorCode analysis error
    */
   void reportError(AnalysisError analysisError) {
     _errorListener.onError(analysisError);
   }
@@ skipping 10242 matching lines @@
    * @param correction the template used to create the correction to be displayed for the error
    */
   ResolverErrorCode.con2(String name, int ordinal, this.type, this.message, String correction) : super(name, ordinal) {
     this.correction9 = correction;
   }
 
   String get correction => correction9;
 
   ErrorSeverity get errorSeverity => type.severity;
 }