[kernel] Fix text serialization for Constant nodes

Make sure to use Printer methods when formatting class references
instead of going through TreeNode.toString which uses globalNames
instead of Printer's own syntheticNames.

Change-Id: I3107a1b4d5d6d2b26a9f0001f846bd74b85853df
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108803
Reviewed-by: Jens Johansen <[email protected]>
Commit-Queue: Vyacheslav Egorov <[email protected]>
Auto-Submit: Vyacheslav Egorov <[email protected]>

Author: mraleph

pkg/kernel/lib/text/ast_to_text.dart

@@ -1303,19 +1303,20 @@ class Printer extends Visitor<Null> {
   }
 
   visitInstanceCreation(InstanceCreation node) {
-    write('${node.classNode}');
+    writeClassReferenceFromReference(node.classReference);
     if (node.typeArguments.isNotEmpty) {
       writeSymbol('<');
       writeList(node.typeArguments, writeType);
       writeSymbol('>');
     }
-    write(' {');
+    writeSymbol('{');
     bool first = true;
     node.fieldValues.forEach((Reference fieldRef, Expression value) {
       if (!first) {
         writeComma();
       }
-      write('${fieldRef.asField.name}: ');
+      writeWord('${fieldRef.asField.name.name}');
+      writeSymbol(':');
       writeExpression(value);
       first = false;
     });
@@ -1339,8 +1340,7 @@ class Printer extends Visitor<Null> {
       writeExpression(unusedArgument);
       first = false;
     }
-
-    write('}');
+    writeSymbol('}');
   }
 
   visitIsExpression(IsExpression node) {
@@ -2001,77 +2001,91 @@ class Printer extends Visitor<Null> {
     }
   }
 
+  void writeConstantReference(Constant node) {
+    writeWord(syntheticNames.nameConstant(node));
+  }
+
   visitConstantExpression(ConstantExpression node) {
-    writeWord(syntheticNames.nameConstant(node.constant));
+    writeConstantReference(node.constant);
   }
 
   defaultConstant(Constant node) {
-    final String name = syntheticNames.nameConstant(node);
-    endLine('  $name = $node');
+    writeIndentation();
+    writeConstantReference(node);
+    writeSpaced('=');
+    endLine('$node');
   }
 
   visitListConstant(ListConstant node) {
-    final String name = syntheticNames.nameConstant(node);
-    write('  $name = ');
-    final String entries = node.entries.map((Constant constant) {
-      return syntheticNames.nameConstant(constant);
-    }).join(', ');
-    endLine('${node.runtimeType}<${node.typeArgument}>($entries)');
+    writeIndentation();
+    writeConstantReference(node);
+    writeSpaced('=');
+    writeWord('ListConstant');
+    writeSymbol('<');
+    writeType(node.typeArgument);
+    writeSymbol('>(');
+    writeList(node.entries, writeConstantReference);
+    endLine(')');
   }
 
   visitSetConstant(SetConstant node) {
-    final String name = syntheticNames.nameConstant(node);
-    write('  $name = ');
-    final String entries = node.entries.map((Constant constant) {
-      return syntheticNames.nameConstant(constant);
-    }).join(', ');
-    endLine('${node.runtimeType}<${node.typeArgument}>($entries)');
+    writeIndentation();
+    writeConstantReference(node);
+    writeSpaced('=');
+    write('SetConstant<');
+    writeSymbol('<');
+    writeType(node.typeArgument);
+    writeSymbol('>(');
+    writeList(node.entries, writeConstantReference);
+    endLine(')');
   }
 
   visitMapConstant(MapConstant node) {
-    final String name = syntheticNames.nameConstant(node);
-    write('  $name = ');
-    final String entries = node.entries.map((ConstantMapEntry entry) {
-      final String key = syntheticNames.nameConstant(entry.key);
-      final String value = syntheticNames.nameConstant(entry.value);
-      return '$key: $value';
-    }).join(', ');
-    endLine(
-        '${node.runtimeType}<${node.keyType}, ${node.valueType}>($entries)');
+    writeIndentation();
+    writeConstantReference(node);
+    writeSpaced('=');
+    write('MapConstant<');
+    writeList([node.keyType, node.valueType], writeType);
+    writeSymbol('>(');
+    writeList(node.entries, (entry) {
+      writeConstantReference(entry.key);
+      writeSymbol(':');
+      writeConstantReference(entry.value);
+    });
+    endLine(')');
   }
 
   visitInstanceConstant(InstanceConstant node) {
-    final String name = syntheticNames.nameConstant(node);
-    write('  $name = ');
-    final sb = new StringBuffer();
-    sb.write('${node.classNode}');
+    writeIndentation();
+    writeConstantReference(node);
+    writeSpaced('=');
+    writeClassReferenceFromReference(node.classReference);
     if (!node.classNode.typeParameters.isEmpty) {
-      sb.write('<');
-      sb.write(node.typeArguments.map((type) => type.toString()).join(', '));
-      sb.write('>');
+      writeSymbol('<');
+      writeList(node.typeArguments, writeType);
+      writeSymbol('>');
     }
-    sb.write(' {');
-    bool first = true;
-    node.fieldValues.forEach((Reference fieldRef, Constant constant) {
-      final String name = syntheticNames.nameConstant(constant);
-      if (!first) {
-        sb.write(', ');
-      }
-      sb.write('${fieldRef.asField.name}: $name');
-      first = false;
+    writeSymbol(' {');
+    writeList(node.fieldValues.entries, (entry) {
+      writeWord('${entry.key.asField.name.name}');
+      writeSymbol(':');
+      writeConstantReference(entry.value);
     });
-    sb.write('}');
-    endLine(sb.toString());
+    endLine('}');
   }
 
   visitStringConstant(StringConstant node) {
-    final String name = syntheticNames.nameConstant(node);
-    endLine('  $name = "${escapeString(node.value)}"');
+    writeIndentation();
+    writeConstantReference(node);
+    writeSpaced('=');
+    endLine('"${escapeString(node.value)}"');
   }
 
   visitUnevaluatedConstant(UnevaluatedConstant node) {
-    final String name = syntheticNames.nameConstant(node);
-    write('  $name = (');
+    writeIndentation();
+    writeConstantReference(node);
+    writeSpaced('=');
+    writeSymbol('(');
     writeExpression(node.expression);
     endLine(')');
   }