Bring type variables into static scope, but produce compile-time error when they are used.

lib/compiler/implementation/resolver.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.
 
 abstract class TreeElements {
   Element operator[](Node node);
   Selector getSelector(Send send);
   DartType getType(TypeAnnotation annotation);
   bool isParameterChecked(Element element);
 }
@@ skipping 1158 matching lines @@
     return element;
   }
 
   Element useElement(Node node, Element element) {
     if (element === null) return null;
     return mapping[node] = element;
   }
 
   DartType useType(TypeAnnotation annotation, DartType type) {
     if (type !== null) {
+      if (type.element.isTypeVariable() && enclosingElement.inStaticContext()) {
+        error(annotation,
+              MessageKind.CANNOT_ACCESS_TYPE_VARIABLE_IN_STATIC_CONTEXT,
+              [type.name]);
+      }
       mapping.setType(annotation, type);
       useElement(annotation, type.element);
     }
     return type;
   }
 
   void setupFunction(FunctionExpression node, FunctionElement function) {
     // If [function] is the [enclosingElement], the [scope] has
     // already been set in the constructor of [ResolverVisitor].
     if (function != enclosingElement) scope = new MethodScope(scope, function);
@@ skipping 1624 matching lines @@
 
   Element lexicalLookup(SourceString name) {
     Element result = localLookup(name);
     if (result != null) return result;
     return parent.lexicalLookup(name);
   }
 
   abstract Element localLookup(SourceString name);
 }
 
-class VariableScope extends Scope {
-  VariableScope(parent, element) : super(parent, element);
-
-  Element add(Element newElement) {
-    throw "Cannot add element to VariableScope";
-  }
-
-  Element localLookup(SourceString name) => null;
-
-  String toString() => '$element > $parent';
-}
-
 /**
  * [TypeDeclarationScope] defines the outer scope of a type declaration in
  * which the declared type variables and the entities in the enclosing scope are
  * available but where declared and inherited members are not available. This
  * scope is only used for class/interface declarations during resolution of the
  * class hierarchy. In all other cases [ClassScope] is used.
  */
 class TypeDeclarationScope extends Scope {
   TypeDeclarationElement get element => super.element;
 
@@ skipping 49 matching lines @@
 
   String toString() => 'block${elements.getKeys()}';
 }
 
 /**
  * [ClassScope] defines the inner scope of a class/interface declaration in
  * which declared members, declared type variables, entities in the enclosing
  * scope and inherited members are available, in the given order.
  */
 class ClassScope extends TypeDeclarationScope {
-  bool inStaticContext = false;
-
   ClassScope(Scope parentScope, ClassElement element)
       : super(parentScope, element)  {
     assert(parent !== null);
   }
 
   Element localLookup(SourceString name) {
     ClassElement cls = element;
     Element result = cls.lookupLocalMember(name);
     if (result !== null) return result;
-    if (!inStaticContext) {
-      // If not in a static context, we can lookup in the
-      // TypeDeclaration scope, which contains the type variables of
-      // the class.
-      result = super.localLookup(name);
-    }
-    return result;
+    return super.localLookup(name);
   }
 
   Element lookup(SourceString name) {
     Element result = localLookup(name);
     if (result !== null) return result;
     result = parent.lookup(name);
     if (result !== null) return result;
     ClassElement cls = element;
     return cls.lookupSuperMember(name);
   }
@@ skipping 123 matching lines @@
     return result;
   }
   Element lookup(SourceString name) => localLookup(name);
   Element lexicalLookup(SourceString name) => localLookup(name);
 
   Element add(Element newElement) {
     throw "Cannot add an element in a patch library scope";
   }
   String toString() => 'PatchLibraryScope($origin,$patch)';
 }