Add setting to Expr.show to allow printing raw tree

Author: nicolasstucki

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

@@ -44,7 +44,7 @@ class QuoteDriver extends Driver {
     def show(tree: Tree, ctx: Context): String = {
       val printer = new DecompilerPrinter(ctx)
       val pageWidth = ctx.settings.pageWidth.value(ctx)
-      val tree1 = (new TreeCleaner).transform(tree)(ctx)
+      val tree1 = if (settings.rawTree) tree else (new TreeCleaner).transform(tree)(ctx)
       printer.toText(tree1).mkString(pageWidth, false)
     }
     withTree(expr, show, settings)

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

@@ -53,7 +53,7 @@ object Toolbox {
 
   }
 
-  class Settings[T] private (val outDir: Option[String], val compilerArgs: List[String])
+  class Settings[T] private (val outDir: Option[String], val rawTree: Boolean, val compilerArgs: List[String])
 
   object Settings {
 
@@ -69,19 +69,22 @@ object Toolbox {
         ): Settings[Run] = {
       var compilerArgs1 = compilerArgs
       if (optimise) compilerArgs1 = "-optimise" :: compilerArgs1
-      new Settings(outDir, compilerArgs1)
+      new Settings(outDir, false, compilerArgs1)
     }
 
     /** Quote show settings
+     *  @param color Print output with colors
+     *  @param rawTree Do not remove quote tree artifacts
      *  @param compilerArgs Compiler arguments. Use only if you know what you are doing.
      */
     def show(
         color: Boolean = false,
+        rawTree: Boolean = false,
         compilerArgs: List[String] = Nil
         ): Settings[Show] = {
       var compilerArgs1 = compilerArgs
       compilerArgs1 = s"-color:${if (color) "always" else "never"}" :: compilerArgs1
-      new Settings(None, compilerArgs1)
+      new Settings(None, rawTree, compilerArgs1)
     }
 
   }

tests/run-with-compiler/quote-show-blocks-raw.check

@@ -0,0 +1,32 @@
+{
+  println(1)
+  {
+    println(2)
+    {
+      println(3)
+      {
+        println(4)
+        {
+          println(5)
+          ()
+        }
+      }
+    }
+  }
+}
+{
+  {
+    {
+      {
+        {
+          ()
+          println(5)
+        }
+        println(4)
+      }
+      println(3)
+    }
+    println(2)
+  }
+  println(1)
+}

tests/run-with-compiler/quote-show-blocks-raw.scala

@@ -0,0 +1,25 @@
+
+import dotty.tools.dotc.quoted.Toolbox._
+
+import scala.quoted._
+import scala.quoted.Liftable._
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    implicit val settings = Settings.show(rawTree = true)
+
+    def a(n: Int, x: Expr[Unit]): Expr[Unit] =
+      if (n == 0) x
+      else a(n - 1, '{ println(~n.toExpr); ~x })
+
+    println(a(5, ()).show)
+
+
+    def b(n: Int, x: Expr[Unit]): Expr[Unit] =
+      if (n == 0) x
+      else b(n - 1, '{ ~x; println(~n.toExpr) })
+
+    println(b(5, ()).show)
+  }
+
+}