Merge pull request #4213 from dotty-staging/print-quotes-for-users

Pretty print quotes

Author: nicolasstucki

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

@@ -58,4 +58,10 @@ class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) {
     val impl1 = impl.copy(parents = impl.parents.filterNot(_.symbol.maybeOwner == defn.ObjectClass))
     super.toTextTemplate(impl1, ofNew)
   }
+
+  override protected def typeApplyText[T >: Untyped](tree: TypeApply[T]): Text = {
+    if (tree.symbol eq defn.quoteMethod) "'"
+    else if (tree.symbol eq defn.typeQuoteMethod) "'[" ~ toTextGlobal(tree.args, ", ") ~ "]"
+    else super.typeApplyText(tree)
+  }
 }

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

@@ -232,7 +232,10 @@ 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 typeApplyText[T >: Untyped](tree: TypeApply[T]): Text =
+    toTextLocal(tree.fun) ~ "[" ~ toTextGlobal(tree.args, ", ") ~ "]"
+
+  protected def toTextCore[T >: Untyped](tree: Tree[T]): Text = {
     import untpd.{modsDeco => _, _}
 
     def isLocalThis(tree: Tree) = tree.typeOpt match {
@@ -277,7 +280,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[_] =>
@@ -311,8 +314,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
           }
         else
           toTextLocal(fun) ~ "(" ~ toTextGlobal(args, ", ") ~ ")"
-      case TypeApply(fun, args) =>
-        toTextLocal(fun) ~ "[" ~ toTextGlobal(args, ", ") ~ "]"
+      case tree: TypeApply =>
+        typeApplyText(tree)
       case Literal(c) =>
         tree.typeOpt match {
           case ConstantType(tc) => withPos(toText(tc), tree.pos)
@@ -514,6 +517,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)
 
@@ -553,7 +560,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)
+  val a: quoted.Expr[Int] = '(4)
   a
 }

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)
+  val a: quoted.Expr[Int] = '(4)
   a
 }