Add AccessSemantics support for calling typenames.

pkg/analyzer2dart/lib/src/identifier_semantics.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.
 
 /**
  * Code for classifying the semantics of identifiers appearing in a Dart file.
  */
 library analyzer2dart.identifierSemantics;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/src/generated/element.dart';
 
+// TODO(johnniwinther,paulberry): This should be a constant.
+final AccessSemanticsVisitor ACCESS_SEMANTICS_VISITOR =
+    new AccessSemanticsVisitor();
+
 /**
  * Enum representing the different kinds of destinations which a property
  * access or method or function invocation might refer to.
  */
 class AccessKind {
   /**
    * The destination of the access is an instance method, property, or field
    * of a class, and thus must be determined dynamically.
    */
   static const AccessKind DYNAMIC = const AccessKind._('DYNAMIC');
@@ skipping 32 matching lines @@
    * The destination of the access is a property getter/setter that is defined
    * statically within a class, or at top level within a library.
    */
   static const AccessKind STATIC_PROPERTY =
       const AccessKind._('STATIC_PROPERTY');
 
   /**
    * The destination of the access is a toplevel class, function typedef, mixin
    * application, or the built-in type "dynamic".
    */
-  static const AccessKind TOPLEVEL_TYPE =
-      const AccessKind._('TOPLEVEL_TYPE');
+  static const AccessKind TOPLEVEL_TYPE = const AccessKind._('TOPLEVEL_TYPE');
 
   /**
    * The destination of the access is a type parameter of the enclosing class.
    */
-  static const AccessKind TYPE_PARAMETER =
-      const AccessKind._('TYPE_PARAMETER');
+  static const AccessKind TYPE_PARAMETER = const AccessKind._('TYPE_PARAMETER');
 
   final String name;
 
+  const AccessKind._(this.name);
+
   String toString() => name;
-
-  const AccessKind._(this.name);
 }
 
 /**
  * Data structure used to classify the semantics of a property access or method
  * or function invocation.
  */
 // TODO(paulberry,johnniwinther): Support index operations in AccessSemantics.
 class AccessSemantics {
   /**
    * The kind of access.
@@ skipping 72 matching lines @@
   AccessSemantics.staticMethod(this.identifier, this.element, this.classElement,
       {this.isInvoke: false})
       : kind = AccessKind.STATIC_METHOD,
         target = null;
 
   AccessSemantics.staticProperty(this.identifier, this.element,
       this.classElement, {this.isInvoke: false})
       : kind = AccessKind.STATIC_PROPERTY,
         target = null;
 
-  AccessSemantics.toplevelType(this.identifier, this.element)
+  AccessSemantics.toplevelType(this.identifier, this.element, {this.isInvoke:
+      false})
       : kind = AccessKind.TOPLEVEL_TYPE,
         classElement = null,
-        isInvoke = false,
         target = null;
 
-  AccessSemantics.typeParameter(this.identifier, this.element)
+  AccessSemantics.typeParameter(this.identifier, this.element, {this.isInvoke:
+      false})
       : kind = AccessKind.TYPE_PARAMETER,
         classElement = null,
-        isInvoke = false,
         target = null;
 
   /**
    * True if this is a read access to a property, or a method tear-off.  Note
    * that both [isRead] and [isWrite] will be true in the case of a
    * read-modify-write operation (e.g. "+=").
    */
   bool get isRead => !isInvoke && identifier.inGetterContext();
 
   /**
@@ skipping 28 matching lines @@
         sb.write('target=this.$identifier');
       } else {
         sb.write('target=$target.$identifier');
       }
     }
     sb.write(']');
     return sb.toString();
   }
 }
 
-// TODO(johnniwinther,paulberry): This should be a constant.
-final AccessSemanticsVisitor ACCESS_SEMANTICS_VISITOR =
-    new AccessSemanticsVisitor();
-
 // TODO(johnniwinther,paulberry): This should extend a non-recursive visitor.
 class AccessSemanticsVisitor extends RecursiveAstVisitor<AccessSemantics> {
   /**
    * Return the semantics for [node].
    */
   @override
   AccessSemantics visitMethodInvocation(MethodInvocation node) {
     Expression target = node.realTarget;
     Element staticElement = node.methodName.staticElement;
     if (target == null) {
@@ skipping 49 matching lines @@
       } else if (staticElement is LocalVariableElement) {
         return new AccessSemantics.localVariable(
             node.methodName,
             staticElement,
             isInvoke: true);
       } else if (staticElement is ParameterElement) {
         return new AccessSemantics.parameter(
             node.methodName,
             staticElement,
             isInvoke: true);
+      } else if (staticElement is TypeParameterElement) {
+        return new AccessSemantics.typeParameter(
+            node.methodName,
+            staticElement,
+            isInvoke: true);
+      } else if (staticElement is ClassElement ||
+          staticElement is FunctionTypeAliasElement ||
+          staticElement is DynamicElementImpl) {
+        return new AccessSemantics.toplevelType(
+            node.methodName,
+            staticElement,
+            isInvoke: true);
       }
     } else if (target is Identifier) {
       Element targetStaticElement = target.staticElement;
       if (targetStaticElement is PrefixElement) {
         if (staticElement == null) {
           return new AccessSemantics.dynamic(
               node.methodName,
               null,
               isInvoke: true);
         } else if (staticElement is PropertyAccessorElement) {
           if (staticElement.isSynthetic) {
             return new AccessSemantics.staticField(
                 node.methodName,
                 staticElement.variable,
                 null,
                 isInvoke: true);
           } else {
             return new AccessSemantics.staticProperty(
                 node.methodName,
                 staticElement,
                 null,
                 isInvoke: true);
           }
+        } else if (staticElement is TypeParameterElement) {
+          return new AccessSemantics.typeParameter(
+              node.methodName,
+              staticElement,
+              isInvoke: true);
+        } else if (staticElement is ClassElement ||
+            staticElement is FunctionTypeAliasElement) {
+          return new AccessSemantics.toplevelType(
+              node.methodName,
+              staticElement,
+              isInvoke: true);
         } else {
           return new AccessSemantics.staticMethod(
               node.methodName,
               staticElement,
               null,
               isInvoke: true);
         }
       } else if (targetStaticElement is ClassElement) {
         if (staticElement is PropertyAccessorElement) {
           if (staticElement.isSynthetic) {
@@ skipping 23 matching lines @@
 
   /**
    * Return the access semantics for [node].
    */
   @override
   AccessSemantics visitPrefixedIdentifier(PrefixedIdentifier node) {
     return _classifyPrefixed(node.prefix, node.identifier);
   }
 
   /**
-   * Helper function for classifying an expression of type
-   * Identifier.SimpleIdentifier.
-   */
-  AccessSemantics _classifyPrefixed(Identifier lhs, SimpleIdentifier rhs) {
-    Element lhsElement = lhs.staticElement;
-    Element rhsElement = rhs.staticElement;
-    if (lhsElement is PrefixElement) {
-      if (rhsElement is PropertyAccessorElement) {
-        if (rhsElement.isSynthetic) {
-          return new AccessSemantics.staticField(rhs, rhsElement.variable, null);
-        } else {
-          return new AccessSemantics.staticProperty(rhs, rhsElement, null);
-        }
-      } else if (rhsElement is FunctionElement) {
-        return new AccessSemantics.staticMethod(rhs, rhsElement, null);
-      } else if (rhsElement is ClassElement ||
-          rhsElement is FunctionTypeAliasElement) {
-        return new AccessSemantics.toplevelType(rhs, rhsElement);
-      } else {
-        return new AccessSemantics.dynamic(rhs, null);
-      }
-    } else if (lhsElement is ClassElement) {
-      if (rhsElement is PropertyAccessorElement && rhsElement.isSynthetic) {
-        return new AccessSemantics.staticField(
-            rhs,
-            rhsElement.variable,
-            lhsElement);
-      } else if (rhsElement is MethodElement) {
-        return new AccessSemantics.staticMethod(rhs, rhsElement, lhsElement);
-      } else {
-        return new AccessSemantics.staticProperty(rhs, rhsElement, lhsElement);
-      }
-    } else {
-      return new AccessSemantics.dynamic(rhs, lhs);
-    }
-  }
-
-  /**
    * Return the access semantics for [node].
    */
   @override
   AccessSemantics visitPropertyAccess(PropertyAccess node) {
     if (node.target is Identifier) {
       return _classifyPrefixed(node.target, node.propertyName);
     } else {
       return new AccessSemantics.dynamic(node.propertyName, node.realTarget);
     }
   }
@@ skipping 66 matching lines @@
           staticElement.enclosingElement);
     } else if (staticElement is TypeParameterElement) {
       return new AccessSemantics.typeParameter(node, staticElement);
     } else if (staticElement is ClassElement ||
         staticElement is FunctionTypeAliasElement ||
         staticElement is DynamicElementImpl) {
       return new AccessSemantics.toplevelType(node, staticElement);
     }
     return new AccessSemantics.dynamic(node, null);
   }
-}
+
+  /**
+   * Helper function for classifying an expression of type
+   * Identifier.SimpleIdentifier.
+   */
+  AccessSemantics _classifyPrefixed(Identifier lhs, SimpleIdentifier rhs) {
+    Element lhsElement = lhs.staticElement;
+    Element rhsElement = rhs.staticElement;
+    if (lhsElement is PrefixElement) {
+      if (rhsElement is PropertyAccessorElement) {
+        if (rhsElement.isSynthetic) {
+          return new AccessSemantics.staticField(
+              rhs,
+              rhsElement.variable,
+              null);
+        } else {
+          return new AccessSemantics.staticProperty(rhs, rhsElement, null);
+        }
+      } else if (rhsElement is FunctionElement) {
+        return new AccessSemantics.staticMethod(rhs, rhsElement, null);
+      } else if (rhsElement is ClassElement ||
+          rhsElement is FunctionTypeAliasElement) {
+        return new AccessSemantics.toplevelType(rhs, rhsElement);
+      } else {
+        return new AccessSemantics.dynamic(rhs, null);
+      }
+    } else if (lhsElement is ClassElement) {
+      if (rhsElement is PropertyAccessorElement && rhsElement.isSynthetic) {
+        return new AccessSemantics.staticField(
+            rhs,
+            rhsElement.variable,
+            lhsElement);
+      } else if (rhsElement is MethodElement) {
+        return new AccessSemantics.staticMethod(rhs, rhsElement, lhsElement);
+      } else {
+        return new AccessSemantics.staticProperty(rhs, rhsElement, lhsElement);
+      }
+    } else {
+      return new AccessSemantics.dynamic(rhs, lhs);
+    }
+  }
+}