Remove ReflectionImpl

Author: nicolasstucki

compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala

@@ -43,7 +43,8 @@ class DecompilationPrinter extends Phase {
     } else {
       val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
       out.println(s"/** Decompiled from $unitFile */")
-      out.println(ReflectionImpl(ctx).showSourceCode.showTree(unit.tpdTree)(ctx))
+      val refl = ReflectionImpl(ctx)
+      out.println(new refl.SourceCodePrinter().showTree(unit.tpdTree)(ctx))
     }
   }
 }

compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala

@@ -35,7 +35,8 @@ class IDEDecompilerDriver(val settings: List[String]) extends dotc.Driver {
     run.printSummary()
     val unit = ctx.run.units.head
 
-    val decompiled = ReflectionImpl(ctx).showSourceCode.showTree(unit.tpdTree)
+    val refl = ReflectionImpl(ctx)
+    val decompiled = new refl.SourceCodePrinter().showTree(unit.tpdTree)
     val tree = new TastyHTMLPrinter(unit.pickled.head._2).printContents()
 
     reporter.removeBufferedMessages.foreach(message => System.err.println(message))

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

@@ -47,7 +47,8 @@ class QuoteDriver extends Driver {
       val tree1 =
         if (ctx.settings.YshowRawQuoteTrees.value) tree
         else (new TreeCleaner).transform(tree)
-      ReflectionImpl(ctx).showSourceCode.showTree(tree1)
+      val refl = ReflectionImpl(ctx)
+      new refl.SourceCodePrinter().showTree(tree1)
     }
     withTree(expr, show, settings)
   }

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

@@ -7,7 +7,6 @@ class ReflectionImpl private (ctx: Contexts.Context, pos: SourcePosition)
     extends scala.tasty.Reflection
     with CoreImpl
     with ContextOpsImpl
-    with PrintersImpl
     with SymbolOpsImpl
     with TreeOpsImpl
     with TypeOrBoundsTreesOpsImpl

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

@@ -24,36 +24,67 @@ trait Printers
   with TypeOrBoundsOps {
 
   /** Adds `show` as an extension method of a `Tree` */
-  implicit def TreeShowDeco(tree: Tree): ShowAPI
+  implicit class TreeShowDeco(tree: Tree) {
+    /** Shows the tree as extractors */
+    def show(implicit ctx: Context): String = new ExtractorsPrinter().showTree(tree)
+    /** Shows the tree as source code */
+    def showCode(implicit ctx: Context): String = new SourceCodePrinter().showTree(tree)
+  }
 
   /** Adds `show` as an extension method of a `TypeOrBoundsTree` */
-  implicit def TypeOrBoundsTreeShowDeco(tpt: TypeOrBoundsTree): ShowAPI
+  implicit class TypeOrBoundsTreeShowDeco(tpt: TypeOrBoundsTree) {
+    /** Shows the tree as extractors */
+    def show(implicit ctx: Context): String = new ExtractorsPrinter().showTypeOrBoundsTree(tpt)
+    /** Shows the tree as source code */
+    def showCode(implicit ctx: Context): String = new SourceCodePrinter().showTypeOrBoundsTree(tpt)
+  }
 
   /** Adds `show` as an extension method of a `TypeOrBounds` */
-  implicit def TypeOrBoundsShowDeco(tpt: TypeOrBounds): ShowAPI
+  implicit class TypeOrBoundsShowDeco(tpe: TypeOrBounds) {
+    /** Shows the tree as extractors */
+    def show(implicit ctx: Context): String = new ExtractorsPrinter().showTypeOrBounds(tpe)
+    /** Shows the tree as source code */
+    def showCode(implicit ctx: Context): String = new SourceCodePrinter().showTypeOrBounds(tpe)
+  }
 
   /** Adds `show` as an extension method of a `CaseDef` */
-  implicit def CaseDefShowDeco(caseDef: CaseDef): ShowAPI
+  implicit class CaseDefShowDeco(caseDef: CaseDef) {
+    /** Shows the tree as extractors */
+    def show(implicit ctx: Context): String = new ExtractorsPrinter().showCaseDef(caseDef)
+    /** Shows the tree as source code */
+    def showCode(implicit ctx: Context): String = new SourceCodePrinter().showCaseDef(caseDef)
+  }
 
   /** Adds `show` as an extension method of a `Pattern` */
-  implicit def PatternShowDeco(pattern: Pattern): ShowAPI
+  implicit class PatternShowDeco(pattern: Pattern) {
+    /** Shows the tree as extractors */
+    def show(implicit ctx: Context): String = new ExtractorsPrinter().showPattern(pattern)
+    /** Shows the tree as source code */
+    def showCode(implicit ctx: Context): String = new SourceCodePrinter().showPattern(pattern)
+  }
 
   /** Adds `show` as an extension method of a `Constant` */
-  implicit def ConstantShowDeco(const: Constant): ShowAPI
+  implicit class ConstantShowDeco(const: Constant) {
+    /** Shows the tree as extractors */
+    def show(implicit ctx: Context): String = new ExtractorsPrinter().showConstant(const)
+    /** Shows the tree as source code */
+    def showCode(implicit ctx: Context): String = new SourceCodePrinter().showConstant(const)
+  }
 
   /** Adds `show` as an extension method of a `Symbol` */
-  implicit def SymbolShowDeco(symbol: Symbol): ShowAPI
+  implicit class SymbolShowDeco(symbol: Symbol) {
+    /** Shows the tree as extractors */
+    def show(implicit ctx: Context): String = new ExtractorsPrinter().showSymbol(symbol)
+    /** Shows the tree as source code */
+    def showCode(implicit ctx: Context): String = new SourceCodePrinter().showSymbol(symbol)
+  }
 
   /** Adds `show` as an extension method of a `Flags` */
-  implicit def FlagsShowDeco(flags: Flags): ShowAPI
-
-  /** Define `show` as method */
-  trait ShowAPI {
+  implicit class FlagsShowDeco(flags: Flags) {
     /** Shows the tree as extractors */
-    def show(implicit ctx: Context): String
-
+    def show(implicit ctx: Context): String = new ExtractorsPrinter().showFlags(flags)
     /** Shows the tree as source code */
-    def showCode(implicit ctx: Context): String
+    def showCode(implicit ctx: Context): String = new SourceCodePrinter().showFlags(flags)
   }
 
   abstract class Printer {