Substitute type parameters when evaluating const literal maps/lists.

pkg/analyzer/lib/src/generated/constant.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.constant;
 
 import 'dart:collection';
@@ skipping 1109 matching lines @@
       DartObjectImpl elementResult = element.accept(this);
       if (elementResult == null) {
         errorOccurred = true;
       } else {
         elements.add(elementResult);
       }
     }
     if (errorOccurred) {
       return null;
     }
-    return new DartObjectImpl(_typeProvider.listType, new ListState(new List.from(elements)));
+    DartType elementType = _typeProvider.dynamicType;
+    if (node.typeArguments != null && node.typeArguments.arguments.length == 1) {
+      DartType type = node.typeArguments.arguments[0].type;
+      if (type != null) {
+        elementType = type;
+      }
+    }
+    InterfaceType listType = _typeProvider.listType.substitute4([elementType]);
+    return new DartObjectImpl(listType, new ListState(new List.from(elements)));
   }
 
   @override
   DartObjectImpl visitMapLiteral(MapLiteral node) {
     if (node.constKeyword == null) {
       _errorReporter.reportErrorForNode(CompileTimeErrorCode.MISSING_CONST_IN_MAP_LITERAL, node, []);
       return null;
     }
     bool errorOccurred = false;
     HashMap<DartObjectImpl, DartObjectImpl> map = new HashMap<DartObjectImpl, DartObjectImpl>();
     for (MapLiteralEntry entry in node.entries) {
       DartObjectImpl keyResult = entry.key.accept(this);
       DartObjectImpl valueResult = entry.value.accept(this);
       if (keyResult == null || valueResult == null) {
         errorOccurred = true;
       } else {
         map[keyResult] = valueResult;
       }
     }
     if (errorOccurred) {
       return null;
     }
-    return new DartObjectImpl(_typeProvider.mapType, new MapState(map));
+    DartType keyType = _typeProvider.dynamicType;
+    DartType valueType = _typeProvider.dynamicType;
+    if (node.typeArguments != null && node.typeArguments.arguments.length == 2) {
+      DartType keyTypeCandidate = node.typeArguments.arguments[0].type;
+      if (keyTypeCandidate != null) {
+        keyType = keyTypeCandidate;
+      }
+      DartType valueTypeCandidate = node.typeArguments.arguments[1].type;
+      if (valueTypeCandidate != null) {
+        valueType = valueTypeCandidate;
+      }
+    }
+    InterfaceType mapType = _typeProvider.mapType.substitute4(
+        [keyType, valueType]);
+    return new DartObjectImpl(mapType, new MapState(map));
   }
 
   @override
   DartObjectImpl visitMethodInvocation(MethodInvocation node) {
     Element element = node.methodName.staticElement;
     if (element is FunctionElement) {
       FunctionElement function = element;
       if (function.name == "identical") {
         NodeList<Expression> arguments = node.argumentList.arguments;
         if (arguments.length == 2) {
@@ skipping 3428 matching lines @@
 
   @override
   String get typeName => "Type";
 
   @override
   int get hashCode => _element == null ? 0 : _element.hashCode;
 
   @override
   String toString() => _element == null ? "-unknown-" : _element.name;
 }