Rename tasty.Show to tasty.Printer

Aslo add `showCode` on Tree, TypeTree, ...

Author: nicolasstucki

compiler/src/dotty/tools/dotc/tastyreflect/PrintersImpl.scala

@@ -1,46 +1,53 @@
 package dotty.tools.dotc.tastyreflect
 
-import scala.tasty.util.{Show, ShowExtractors, ShowSourceCode}
+import scala.tasty.util.{Printer, ExtractorsPrinter, SourceCodePrinter}
 
-trait PrintersImpl extends scala.tasty.reflect.Printers with scala.tasty.reflect.ReflectionCore { tasty: ReflectionImpl =>
+trait PrintersImpl extends scala.tasty.reflect.Printers with scala.tasty.reflect.ReflectionCore { reflect: ReflectionImpl =>
 
-  def showExtractors: Show[tasty.type] = new ShowExtractors[tasty.type](this)
+  def showExtractors: Printer[reflect.type] = new ExtractorsPrinter[reflect.type](this)
 
-  def showSourceCode: Show[tasty.type] = new ShowSourceCode[tasty.type](this)
+  def showSourceCode: Printer[reflect.type] = new SourceCodePrinter[reflect.type](this)
 
   /** Adds `show` as an extension method of a `Tree` */
   def TreeShowDeco(tree: Tree): ShowAPI = new ShowAPI {
-    def show(implicit ctx: Context, s: Show[tasty.type]): String = s.showTree(tree)
+    def show(implicit ctx: Context): String = showExtractors.showTree(tree)
+    def showCode(implicit ctx: Context): String = showSourceCode.showTree(tree)
   }
 
   /** Adds `show` as an extension method of a `TypeOrBoundsTree` */
   def TypeOrBoundsTreeShowDeco(tpt: TypeOrBoundsTree): ShowAPI = new ShowAPI {
-    def show(implicit ctx: Context, s: Show[tasty.type]): String = s.showTypeOrBoundsTree(tpt)
+    def show(implicit ctx: Context): String = showExtractors.showTypeOrBoundsTree(tpt)
+    def showCode(implicit ctx: Context): String = showSourceCode.showTypeOrBoundsTree(tpt)
   }
 
   /** Adds `show` as an extension method of a `TypeOrBounds` */
   def TypeOrBoundsShowDeco(tpe: TypeOrBounds): ShowAPI = new ShowAPI {
-    def show(implicit ctx: Context, s: Show[tasty.type]): String = s.showTypeOrBounds(tpe)
+    def show(implicit ctx: Context): String = showExtractors.showTypeOrBounds(tpe)
+    def showCode(implicit ctx: Context): String = showSourceCode.showTypeOrBounds(tpe)
   }
 
   /** Adds `show` as an extension method of a `CaseDef` */
   def CaseDefShowDeco(caseDef: CaseDef): ShowAPI = new ShowAPI {
-    def show(implicit ctx: Context, s: Show[tasty.type]): String = s.showCaseDef(caseDef)
+    def show(implicit ctx: Context): String = showExtractors.showCaseDef(caseDef)
+    def showCode(implicit ctx: Context): String = showSourceCode.showCaseDef(caseDef)
   }
 
   /** Adds `show` as an extension method of a `Pattern` */
   def PatternShowDeco(pattern: Pattern): ShowAPI = new ShowAPI {
-    def show(implicit ctx: Context, s: Show[tasty.type]): String = s.showPattern(pattern)
+    def show(implicit ctx: Context): String = showExtractors.showPattern(pattern)
+    def showCode(implicit ctx: Context): String = showSourceCode.showPattern(pattern)
   }
 
   /** Adds `show` as an extension method of a `Constant` */
   def ConstantShowDeco(const: Constant): ShowAPI = new ShowAPI {
-    def show(implicit ctx: Context, s: Show[tasty.type]): String = s.showConstant(const)
+    def show(implicit ctx: Context): String = showExtractors.showConstant(const)
+    def showCode(implicit ctx: Context): String = showSourceCode.showConstant(const)
   }
 
   /** Adds `show` as an extension method of a `Symbol` */
   def SymbolShowDeco(symbol: Symbol): ShowAPI = new ShowAPI {
-    def show(implicit ctx: Context, s: Show[tasty.type]): String = s.showSymbol(symbol)
+    def show(implicit ctx: Context): String = showExtractors.showSymbol(symbol)
+    def showCode(implicit ctx: Context): String = showSourceCode.showSymbol(symbol)
   }
 
 }

library/src/scala/tasty/reflect/Printers.scala

@@ -1,17 +1,7 @@
 package scala.tasty
 package reflect
 
-import scala.tasty.util.Show
-
-trait Printers { reflect: Reflection =>
-  // TASTy 🎂 needed to for the path dependency `tasty.type` to make sure the
-  // implicit printers of different instances of Tasty are not used.
-
-  /** Printer that prints the tree as extractors (enabled by default) */
-  implicit def showExtractors: Show[reflect.type]
-
-  /** Printer that prints the tree as source code */
-  def showSourceCode: Show[reflect.type]
+trait Printers extends ReflectionCore {
 
   /** Adds `show` as an extension method of a `Tree` */
   implicit def TreeShowDeco(tree: Tree): ShowAPI
@@ -36,10 +26,11 @@ trait Printers { reflect: Reflection =>
 
   /** Define `show` as method */
   trait ShowAPI {
-    /** Shows the string representation based on an implicit instance of `Show[tasty.type]`
-     *  See: `showExtractors` and `showSourceCode`
-     */
-    def show(implicit ctx: Context, s: Show[reflect.type]): String
+    /** Shows the tree as extractors */
+    def show(implicit ctx: Context): String
+
+    /** Shows the tree as source code */
+    def showCode(implicit ctx: Context): String
   }
 
 }

library/src/scala/tasty/util/ShowExtractors.scala renamed to library/src/scala/tasty/util/ExtractorsPrinter.scala

@@ -2,7 +2,7 @@ package scala.tasty.util
 
 import scala.tasty.Reflection
 
-class ShowExtractors[R <: Reflection with Singleton](reclect0: R) extends Show[R](reclect0) {
+class ExtractorsPrinter[R <: Reflection with Singleton](reclect0: R) extends Printer[R](reclect0) {
   import reflect.{rootContext => _, _}
 
   def showTree(tree: Tree)(implicit ctx: Context): String =

library/src/scala/tasty/util/Show.scala renamed to library/src/scala/tasty/util/Printer.scala

@@ -2,7 +2,7 @@ package scala.tasty.util
 
 import scala.tasty.Reflection
 
-abstract class Show[R <: Reflection with Singleton](val reflect: R) {
+abstract class Printer[R <: Reflection with Singleton](val reflect: R) {
 
   def showTree(tree: reflect.Tree)(implicit ctx: reflect.Context): String
 

library/src/scala/tasty/util/ShowSourceCode.scala renamed to library/src/scala/tasty/util/SourceCodePrinter.scala

@@ -4,7 +4,7 @@ package util
 import scala.annotation.switch
 import scala.tasty.util.SyntaxHighlightUtils._
 
-class ShowSourceCode[R <: Reflection with Singleton](reflect0: R) extends Show[R](reflect0) {
+class SourceCodePrinter[R <: Reflection with Singleton](reflect0: R) extends Printer[R](reflect0) {
   import reflect.{rootContext => _, _}
 
   private[this] val color: Boolean = {

tests/run-separate-compilation/tasty-custom-show/quoted_1.scala

@@ -1,7 +1,7 @@
 import scala.quoted._
 
 import scala.tasty.Reflection
-import scala.tasty.util.{TreeTraverser, Show}
+import scala.tasty.util.{TreeTraverser, Printer}
 
 object Macros {
 
@@ -16,17 +16,17 @@ object Macros {
     val output = new TreeTraverser(reflect) {
       override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = {
         // Use custom Show[_] here
-        implicit val printer = new DummyShow(reflect)
+        val printer = new DummyShow(reflect)
         tree match {
           case IsDefinition(tree @ DefDef(name, _, _, _, _)) =>
             buff.append(name)
             buff.append("\n")
-            buff.append(tree.show)
+            buff.append(printer.showTree(tree))
             buff.append("\n\n")
           case IsDefinition(tree @ ValDef(name, _, _)) =>
             buff.append(name)
             buff.append("\n")
-            buff.append(tree.show)
+            buff.append(printer.showTree(tree))
             buff.append("\n\n")
           case _ =>
         }
@@ -41,7 +41,7 @@ object Macros {
 
 }
 
-class DummyShow[R <: Reflection with Singleton](reflect0: R) extends Show[R](reflect0) {
+class DummyShow[R <: Reflection with Singleton](reflect0: R) extends Printer[R](reflect0) {
   import reflect._
   def showTree(tree: Tree)(implicit ctx: Context): String = "Tree"
   def showCaseDef(caseDef: CaseDef)(implicit ctx: Context): String = "CaseDef"

tests/run-separate-compilation/xml-interpolation-1/XmlQuote_1.scala

@@ -22,7 +22,7 @@ object XmlQuote {
     // for debugging purpose
     def pp(tree: Tree): Unit = {
       println(tree.show)
-      println(reflect.showSourceCode.showTree(tree))
+      println(tree.showCode)
     }
 
     def liftListOfAny(lst: List[Term]): Expr[List[Any]] = lst match {

tests/run-separate-compilation/xml-interpolation-2/XmlQuote_1.scala

@@ -21,7 +21,7 @@ object XmlQuote {
     // for debugging purpose
     def pp(tree: Tree): Unit = {
       println(tree.show)
-      println(reflect.showSourceCode.showTree(tree))
+      println(tree.showCode)
     }
 
     def isSCOpsConversion(tree: Term) =