Fix resolution of type parameters in static context, and the use of type parameters in closures.

lib/compiler/implementation/elements/elements.dart

 // Copyright (c) 2012, 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.
 
 #library('elements');
 
 #import('dart:uri');
 
 #import('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
@@ skipping 630 matching lines @@
     }
     listener.cancel('internal error: could not find $name', node: variables);
   }
 
   DartType computeType(Compiler compiler) {
     return variables.computeType(compiler);
   }
 
   DartType get type => variables.type;
 
-  bool isInstanceMember() {
-    return isMember() && !modifiers.isStatic();
-  }
+  bool isInstanceMember() => variables.isInstanceMember();
 
   // Note: cachedNode.getBeginToken() will not be correct in all
   // cases, for example, for function typed parameters.
   Token position() => findMyName(variables.position());
 
   VariableElement cloneTo(Element enclosing, DiagnosticListener listener) {
     VariableListElement clonedVariables =
         variables.cloneTo(enclosing, listener);
     VariableElement result = new VariableElement(
         name, clonedVariables, kind, enclosing, cachedNode);
@@ skipping 88 matching lines @@
 
   VariableListElement cloneTo(Element enclosing, DiagnosticListener listener) {
     VariableListElement result;
     if (cachedNode !== null) {
       result = new VariableListElement.node(cachedNode, kind, enclosing);
     } else {
       result = new VariableListElement(kind, modifiers, enclosing);
     }
     return result;
   }
+
+  bool isInstanceMember() {
+    return isMember() && !modifiers.isStatic();
+  }
+
+  Scope buildScope() {
+    Scope result = new VariableScope(enclosingElement.buildScope(), this);
+    if (enclosingElement.isClass()) {
+      ClassScope clsScope = result.parent;
+      clsScope.inStaticContext = !isInstanceMember();
+    }
+    return result;
+  }
 }
 
 class ForeignElement extends Element {
   ForeignElement(SourceString name, ContainerElement enclosingElement)
     : super(name, ElementKind.FOREIGN, enclosingElement);
 
   DartType computeType(Compiler compiler) {
     return compiler.types.dynamicType;
   }
 
@@ skipping 206 matching lines @@
 
   FunctionElement asFunctionElement() => this;
 
   FunctionElement cloneTo(Element enclosing, DiagnosticListener listener) {
     FunctionElement result = new FunctionElement.tooMuchOverloading(
         name, cachedNode, kind, modifiers, enclosing, functionSignature);
     result.defaultImplementation = defaultImplementation;
     result.type = type;
     return result;
   }
+
+  Scope buildScope() {
+    Scope result = new MethodScope(enclosingElement.buildScope(), this);
+    if (enclosingElement.isClass()) {
+      ClassScope clsScope = result.parent;
+      clsScope.inStaticContext = !isInstanceMember() && !isConstructor();
+    }
+    return result;
+  }
 }
 
 
 class ConstructorBodyElement extends FunctionElement {
   FunctionElement constructor;
 
   ConstructorBodyElement(FunctionElement constructor)
       : this.constructor = constructor,
         super(constructor.name,
               ElementKind.GENERATIVE_CONSTRUCTOR_BODY,
@@ skipping 654 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }