Fix format of ConstantExpr.show

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/QuoteDriver.scala

@@ -1,14 +1,12 @@
 package dotty.tools.dotc.quoted
 
 import dotty.tools.dotc.Driver
-import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Contexts.{Context, FreshContext}
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.io.VirtualDirectory
-
 import dotty.tools.repl.AbstractFileClassLoader
 
 import scala.quoted.Expr
-
 import java.io.ByteArrayOutputStream
 import java.io.PrintStream
 import java.nio.charset.StandardCharsets

compiler/src/dotty/tools/dotc/quoted/Runners.scala

@@ -1,5 +1,9 @@
 package dotty.tools.dotc.quoted
 
+import dotty.tools.dotc.ast.Trees.Literal
+import dotty.tools.dotc.core.Constants.Constant
+import dotty.tools.dotc.printing.RefinedPrinter
+
 import scala.quoted.Expr
 import scala.quoted.Liftable.ConstantExpr
 import scala.runtime.quoted._
@@ -15,7 +19,11 @@ object Runners {
     }
 
     def show(expr: Expr[T]): String = expr match {
-      case expr: ConstantExpr[T] => expr.value.toString
+      case expr: ConstantExpr[T] =>
+        val ctx = new QuoteDriver().initCtx
+        ctx.settings.color.update("never")(ctx)
+        val printer = new RefinedPrinter(ctx)
+        printer.toText(Literal(Constant(expr.value))).mkString(Int.MaxValue, false)
       case _ => new QuoteDriver().show(expr)
     }
   }

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -198,6 +198,7 @@ class CompilationTests extends ParallelTesting {
     implicit val testGroup: TestGroup = TestGroup("runAll")
     compileFilesInDir("../tests/run", defaultOptions) +
     compileFilesInDir("../tests/run-no-optimise", defaultOptions) +
+    compileFile("../tests/run-special/quote-run-constants.scala", defaultRunWithCompilerOptions) +
     compileFile("../tests/run-special/quote-run.scala", defaultRunWithCompilerOptions) +
     compileFile("../tests/run-special/quote-run-2.scala", defaultRunWithCompilerOptions) +
     compileFile("../tests/run-special/quote-run-staged-interpreter.scala", defaultRunWithCompilerOptions)

tests/run-special/quote-run-constants.check

@@ -0,0 +1,28 @@
+true
+a
+
+
+"
+'
+\
+1
+2
+3
+4.0
+5.0
+xyz
+======
+true
+'a'
+'\n'
+'\"'
+'\''
+'\\'
+1
+2
+3L
+4.0
+5.0
+"xyz"
+"\n\\\"\'"
+"abc\n         xyz"

tests/run-special/quote-run-constants.scala

@@ -0,0 +1,42 @@
+
+import dotty.tools.dotc.quoted.Runners._
+
+import scala.quoted._
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    def run[T](expr: Expr[T]): Unit = println(expr.run)
+    def show[T](expr: Expr[T]): Unit = println(expr.show)
+
+    run(true)
+    run('a')
+    run('\n')
+    run('"')
+    run('\'')
+    run('\\')
+    run(1)
+    run(2)
+    run(3L)
+    run(4.0f)
+    run(5.0d)
+    run("xyz")
+
+    println("======")
+
+    show(true)
+    show('a')
+    show('\n')
+    show('"')
+    show('\'')
+    show('\\')
+    show(1)
+    show(2)
+    show(3L)
+    show(4.0f)
+    show(5.0d)
+    show("xyz")
+    show("\n\\\"'")
+    show("""abc
+         xyz""")
+  }
+}