Pretty print quotes

Author: nicolasstucki

compiler/src/dotty/tools/dotc/printing/DecompilerPrinter.scala

@@ -1,6 +1,6 @@
 package dotty.tools.dotc.printing
 
-import dotty.tools.dotc.ast.Trees.{Closure, DefDef, Untyped, ValDef}
+import dotty.tools.dotc.ast.Trees._
 import dotty.tools.dotc.ast.untpd.{PackageDef, Template, TypeDef}
 import dotty.tools.dotc.ast.{Trees, untpd}
 import dotty.tools.dotc.printing.Texts._
@@ -51,4 +51,16 @@ class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) {
       }
     }
   }
+
+  override protected def toTextCore[T >: Untyped](tree: Tree[T]): Text = {
+    import untpd.{modsDeco => _, _}
+    tree match {
+      case TypeApply(fun, args) =>
+        if (tree.symbol eq defn.quoteMethod) "'"
+        else if (tree.symbol eq defn.typeQuoteMethod) "'[" ~ toTextGlobal(args, ", ") ~ "]"
+        else super.toTextCore(tree)
+      case _ =>
+        super.toTextCore(tree)
+    }
+  }
 }

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -229,7 +229,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   protected def blockText[T >: Untyped](trees: List[Tree[T]]): Text =
     ("{" ~ toText(trees, "\n") ~ "}").close
 
-  override def toText[T >: Untyped](tree: Tree[T]): Text = controlled {
+  protected def toTextCore[T >: Untyped](tree: Tree[T]): Text = {
     import untpd.{modsDeco => _, _}
 
     def isLocalThis(tree: Tree) = tree.typeOpt match {
@@ -274,7 +274,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       case _ => toTextGlobal(arg)
     }
 
-    def toTextCore(tree: Tree): Text = tree match {
+    tree match {
       case id: Trees.BackquotedIdent[_] if !homogenizedView =>
         "`" ~ toText(id.name) ~ "`"
       case id: Trees.SearchFailureIdent[_] =>
@@ -511,6 +511,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       case _ =>
         tree.fallbackToText(this)
     }
+  }
+
+  override def toText[T >: Untyped](tree: Tree[T]): Text = controlled {
+    import untpd.{modsDeco => _, _}
 
     var txt = toTextCore(tree)
 
@@ -550,7 +554,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       if (ctx.settings.YprintPosSyms.value && tree.isDef)
         txt = (txt ~
           s"@@(${tree.symbol.name}=" ~ tree.symbol.pos.toString ~ ")").close
-   }
+    }
     if (ctx.settings.YshowTreeIds.value)
       txt = (txt ~ "#" ~ tree.uniqueId.toString).close
     tree match {

tests/run-with-compiler/quote-nested-1.check

@@ -1 +1 @@
-<special-ops>.'[Int](3)
+'(3)

tests/run-with-compiler/quote-nested-2.check

@@ -1,4 +1,4 @@
 {
-  val a: quoted.Expr[Int] = <special-ops>.'[Int](4)
-  <special-ops>.'[Int](a.unary_~)
+  val a: quoted.Expr[Int] = '(4)
+  '(a.unary_~)
 }

tests/run-with-compiler/quote-nested-4.check

@@ -1,4 +1,4 @@
 {
-  val t: quoted.Type[String] = <special-ops>.type_'[String]
+  val t: quoted.Type[String] = '[String]
   t: quoted.Type[String]
 }

tests/run-with-compiler/quote-nested-5.check

@@ -1,4 +1,4 @@
 {
-  val a: quoted.Expr[Int] = <special-ops>.'[Int](4)
-  <special-ops>.'[Int](a.unary_~)
+  val a: quoted.Expr[Int] = '(4)
+  '(a.unary_~)
 }