[kernel] Few more tweaks to ast_to_text for Constant nodes.

mraleph · mraleph · commit cbaf890f887a · 2019-07-12T11:41:33.000Z
- Change formatting of Set/Map/List constants to match Dart literals - Add formatting methods for TearOff and PartialInstantiation constants Change-Id: Ie7deac3ee6b5a60e0bcc8088bab2c819a1d3788a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108808 Reviewed-by: Jens Johansen <jensj@google.com> Commit-Queue: Vyacheslav Egorov <vegorov@google.com>
diff --git a/pkg/kernel/lib/text/ast_to_text.dart b/pkg/kernel/lib/text/ast_to_text.dart
@@ -2020,33 +2020,31 @@ class Printer extends Visitor<Null> {
     writeIndentation();
     writeConstantReference(node);
     writeSpaced('=');
-    writeWord('ListConstant');
     writeSymbol('<');
     writeType(node.typeArgument);
-    writeSymbol('>(');
+    writeSymbol('>[');
     writeList(node.entries, writeConstantReference);
-    endLine(')');
+    endLine(']');
   }
 
   visitSetConstant(SetConstant node) {
     writeIndentation();
     writeConstantReference(node);
     writeSpaced('=');
-    write('SetConstant<');
     writeSymbol('<');
     writeType(node.typeArgument);
-    writeSymbol('>(');
+    writeSymbol('>{');
     writeList(node.entries, writeConstantReference);
-    endLine(')');
+    endLine('}');
   }
 
   visitMapConstant(MapConstant node) {
     writeIndentation();
     writeConstantReference(node);
     writeSpaced('=');
-    write('MapConstant<');
+    writeSymbol('<');
     writeList([node.keyType, node.valueType], writeType);
-    writeSymbol('>(');
+    writeSymbol('>{');
     writeList(node.entries, (entry) {
       writeConstantReference(entry.key);
       writeSymbol(':');
@@ -2074,20 +2072,45 @@ class Printer extends Visitor<Null> {
     endLine('}');
   }
 
+  visitPartialInstantiationConstant(PartialInstantiationConstant node) {
+    writeIndentation();
+    writeConstantReference(node);
+    writeSpaced('=');
+    writeWord('partial-instantiation');
+    writeSpace();
+    writeMemberReferenceFromReference(node.tearOffConstant.procedureReference);
+    writeSpace();
+    writeSymbol('<');
+    writeList(node.types, writeType);
+    writeSymbol('>');
+    endLine();
+  }
+
   visitStringConstant(StringConstant node) {
     writeIndentation();
     writeConstantReference(node);
     writeSpaced('=');
     endLine('"${escapeString(node.value)}"');
   }
 
+  visitTearOffConstant(TearOffConstant node) {
+    writeIndentation();
+    writeConstantReference(node);
+    writeSpaced('=');
+    writeWord('tearoff');
+    writeSpace();
+    writeMemberReferenceFromReference(node.procedureReference);
+    endLine();
+  }
+
   visitUnevaluatedConstant(UnevaluatedConstant node) {
     writeIndentation();
     writeConstantReference(node);
     writeSpaced('=');
-    writeSymbol('(');
+    writeSymbol('eval');
+    writeSpace();
     writeExpression(node.expression);
-    endLine(')');
+    endLine();
   }
 
   defaultNode(Node node) {
