Fix for issue 1343

compiler/java/com/google/dart/compiler/resolver/Resolver.java

 // 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.
 
 package com.google.dart.compiler.resolver;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.dart.compiler.DartCompilationPhase;
 import com.google.dart.compiler.DartCompilerContext;
 import com.google.dart.compiler.ErrorCode;
 import com.google.dart.compiler.ast.DartArrayLiteral;
 import com.google.dart.compiler.ast.DartBinaryExpression;
 import com.google.dart.compiler.ast.DartBlock;
 import com.google.dart.compiler.ast.DartBooleanLiteral;
 import com.google.dart.compiler.ast.DartBreakStatement;
 import com.google.dart.compiler.ast.DartCatchBlock;
 import com.google.dart.compiler.ast.DartClass;
+import com.google.dart.compiler.ast.DartClassMember;
 import com.google.dart.compiler.ast.DartDoWhileStatement;
 import com.google.dart.compiler.ast.DartDoubleLiteral;
 import com.google.dart.compiler.ast.DartExpression;
 import com.google.dart.compiler.ast.DartField;
 import com.google.dart.compiler.ast.DartFieldDefinition;
 import com.google.dart.compiler.ast.DartForInStatement;
 import com.google.dart.compiler.ast.DartForStatement;
 import com.google.dart.compiler.ast.DartFunction;
 import com.google.dart.compiler.ast.DartFunctionExpression;
 import com.google.dart.compiler.ast.DartFunctionObjectInvocation;
@@ skipping 1657 matching lines @@
                                   originalTypeArgs.size(), 1);
           // fall through
         case 0:
           typeArgs.add(implicitKey);
           DartTypeNode implicitValue = new DartTypeNode(new DartIdentifier("Dynamic"));
           typeArgs.add(implicitValue);
           break;
       }
 
       InterfaceType type =
-          topLevelContext.instantiateParameterizedType(
+          context.instantiateParameterizedType(
               defaultLiteralMapType.getElement(),
               node,
               typeArgs,
-              inStaticContext(currentMethod),
+              inStaticContext(node),
               inFactoryContext(currentMethod),
               ResolverErrorCode.NO_SUCH_TYPE);
       // instantiateParametersType() will complain for wrong number of parameters (!=2)
+      if (node.isConst()) {
+        checkTypeArgumentsInConstLiteral(typeArgs, ResolverErrorCode.CONST_MAP_WITH_TYPE_VARIABLE);
+      }
       recordType(node, type);
       visit(node.getEntries());
       return null;
     }
 
     @Override
     public Element visitArrayLiteral(DartArrayLiteral node) {
       List<DartTypeNode> typeArgs = node.getTypeArguments();
       InterfaceType type =
-          topLevelContext.instantiateParameterizedType(
+          context.instantiateParameterizedType(
               rawArrayType.getElement(),
               node,
               typeArgs,
-              inStaticContext(currentMethod),
+              inStaticContext(node),
               inFactoryContext(currentMethod),
               ResolverErrorCode.NO_SUCH_TYPE);
       // instantiateParametersType() will complain for wrong number of parameters (!=1)
+      if (node.isConst()) {
+        checkTypeArgumentsInConstLiteral(typeArgs, ResolverErrorCode.CONST_ARRAY_WITH_TYPE_VARIABLE);
+      }
       recordType(node, type);
       visit(node.getExpressions());
       return null;
     }
 
+    private void checkTypeArgumentsInConstLiteral(List<DartTypeNode> typeArgs, ErrorCode errorCode) {
+      for (DartTypeNode typeNode : typeArgs) {
+        Type type = typeNode.getType();
+        if (type != null && type.getKind() == TypeKind.VARIABLE) {
+          onError(typeNode, errorCode);
+        }
+      }
+    }
+
     private ConstructorElement checkIsConstructor(DartNewExpression source, Element element) {
       if (!ElementKind.of(element).equals(ElementKind.CONSTRUCTOR)) {
         onError(source.getConstructor(), ResolverErrorCode.NEW_EXPRESSION_NOT_CONSTRUCTOR);
         return null;
       }
       return (ConstructorElement) element;
     }
 
     private void checkConstructor(DartMethodDefinition node,
                                   ConstructorElement superCall) {
@@ skipping 75 matching lines @@
     }
 
     private void onError(HasSourceInfo node, ErrorCode errorCode, Object... arguments) {
       context.onError(node, errorCode, arguments);
     }
 
     private void onError(SourceInfo node, ErrorCode errorCode, Object... arguments) {
       context.onError(node, errorCode, arguments);
     }
 
+    private boolean inStaticContext(DartNode node) {
+      DartNode anscestor = node;

[zundel, 2012/06/07 21:11:19]

typo: anscestor -> ancestor

[Brian Wilkerson, 2012/06/07 21:19:05]

Done

+      while (anscestor != null) {
+        if (anscestor instanceof DartClassMember<?>) {
+          return ((DartClassMember<?>) anscestor).getModifiers().isStatic();
+        }
+        anscestor = anscestor.getParent();
+      }
+      return true;
+    }
+
     private boolean inStaticContext(Element element) {
         return element == null || Elements.isTopLevel(element)
                 || element.getModifiers().isStatic() || element.getModifiers().isFactory();
     }
 
     private boolean inFactoryContext(Element element) {
       if (element != null) {
         return element.getModifiers().isFactory();
       }
       return false;
@@ skipping 64 matching lines @@
         ClassElement nextClass = (ClassElement) nextConstructorElement.getEnclosingElement();
         ClassElement currentClass = (ClassElement) constructor.getEnclosingElement();
         if (nextClass == currentClass) {
           return (ConstructorNodeElement) nextConstructorElement;
         }
       }
     }
     return null;
   }
 }