Add type arguments to constants.

sdk/lib/_internal/compiler/implementation/js_backend/constant_emitter.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.
 
 part of js_backend;
 
 class ConstantEmitter  {
   ConstantReferenceEmitter _referenceEmitter;
   ConstantInitializerEmitter _initializerEmitter;
 
@@ skipping 191 matching lines @@
   jsAst.Expression visitFalse(FalseConstant constant) {
     return _reference(constant);
   }
 
   jsAst.Expression visitString(StringConstant constant) {
     // TODO(sra): Some larger strings are worth sharing.
     return _reference(constant);
   }
 
   jsAst.Expression visitList(ListConstant constant) {
-    return new jsAst.Call(
+    jsAst.Expression value = new jsAst.Call(
         new jsAst.PropertyAccess.field(
             new jsAst.VariableUse(namer.isolateName),
             'makeConstantList'),
         [new jsAst.ArrayInitializer.from(_array(constant.entries))]);
+    return maybeAddTypeArguments(constant.type, value);
   }
 
   String getJsConstructor(ClassElement element) {
     return namer.isolateAccess(element);
   }
 
   jsAst.Expression visitMap(MapConstant constant) {
     jsAst.Expression jsMap() {
       List<jsAst.Property> properties = <jsAst.Property>[];
       int valueIndex = 0;
@@ skipping 42 matching lines @@
           }
           emittedArgumentCount++;
         },
         includeSuperAndInjectedMembers: true);
 
     if ((constant.protoValue == null && emittedArgumentCount != 3) ||
         (constant.protoValue != null && emittedArgumentCount != 4)) {
       badFieldCountError();
     }
 
-    return new jsAst.New(
+    jsAst.Expression value = new jsAst.New(
         new jsAst.VariableUse(getJsConstructor(classElement)),
         arguments);
+    return maybeAddTypeArguments(constant.type, value);
+  }
+
+  JavaScriptBackend get backend => compiler.backend;
+
+  jsAst.PropertyAccess getHelperProperty(Element helper) {
+    String helperName = backend.namer.getName(helper);
+    return new jsAst.PropertyAccess.field(
+        new jsAst.VariableUse(namer.CURRENT_ISOLATE),
+        helperName);
   }
 
   jsAst.Expression visitType(TypeConstant constant) {
-    JavaScriptBackend backend = compiler.backend;
-    Element helper = backend.getCreateRuntimeType();
-    String helperName = backend.namer.getName(helper);
     DartType type = constant.representedType;
     String name = namer.getRuntimeTypeName(type.element);
     jsAst.Expression typeName = new jsAst.LiteralString("'$name'");
-    return new jsAst.Call(
-        new jsAst.PropertyAccess.field(
-            new jsAst.VariableUse(namer.CURRENT_ISOLATE),
-            helperName),
-        [typeName]);
+    return new jsAst.Call(getHelperProperty(backend.getCreateRuntimeType()),
+                          [typeName]);
   }
 
   jsAst.Expression visitInterceptor(InterceptorConstant constant) {
     return new jsAst.PropertyAccess.field(
         new jsAst.VariableUse(
             getJsConstructor(constant.dispatchedType.element)),
         'prototype');
   }
 
   jsAst.Expression visitConstructed(ConstructedConstant constant) {
-    return new jsAst.New(
+    jsAst.New instantiation = new jsAst.New(
         new jsAst.VariableUse(getJsConstructor(constant.type.element)),
         _array(constant.fields));
+    return maybeAddTypeArguments(constant.type, instantiation);
   }
 
   List<jsAst.Expression> _array(List<Constant> values) {
     List<jsAst.Expression> valueList = <jsAst.Expression>[];
     for (int i = 0; i < values.length; i++) {
       valueList.add(_reference(values[i]));
     }
     return valueList;
   }
+
+  jsAst.Expression maybeAddTypeArguments(InterfaceType type,
+                                         jsAst.Expression value) {
+    if (type is InterfaceType && !type.isRaw &&

[ngeoffray, 2013/06/19 19:55:48]

nit: move && !type.isRaw to a new line.

[karlklose, 2013/06/20 09:25:23]

Why?

[ngeoffray, 2013/06/20 09:31:56]

http://www.dartlang.org/articles/style-guide/: DO place the operator on the
preceding line in a multi-line expression.

And I think Java follows the same.

Also, I think it's how we format it in our code base, so for consistency.

[karlklose, 2013/06/20 10:23:28]

But your comment was about moving every part expression on its own line, wasn't
it? Also I do place the operator at the end of the line before the break.

As for the code base and the position of the operator: we have both styles in
the code base but I prefer placing it at the end of the line.

[ngeoffray, 2013/06/20 10:32:07]

The guide does not explicitly say it, but if you look at the example, it's
breaking at every part. That's what I think Java style does.
 
That's fine, I wasn't talking about the place of the operator.

[karlklose, 2013/06/20 12:49:21]

Done.

+        backend.needsRti(type.element)) {
+      InterfaceType interface = type;
+      RuntimeTypes rti = backend.rti;
+      Iterable<String> arguments = interface.typeArguments
+          .toList(growable: false)
+          .map((DartType type) => rti.getTypeRepresentation(type, (_){}));
+      jsAst.Expression argumentList =
+          new jsAst.LiteralString('[${arguments.join(', ')}]');
+      return new jsAst.Call(getHelperProperty(backend.getSetRuntimeTypeInfo()),
+                            [value, argumentList]);
+    }
+    return value;
+  }
 }