added withColor param to Show's methods, pass scala setting for it in decompiler

Author: Tobias Bordenca

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

@@ -36,11 +36,12 @@ class DecompilationPrinter extends Phase {
 
   private def printToOutput(out: PrintStream)(implicit ctx: Context): Unit = {
     val unit = ctx.compilationUnit
+    val useColors = ctx.settings.color.value == "always"
     if (ctx.settings.printTasty.value) {
       new TastyPrinter(unit.pickled.head._2).printContents()
     } else {
       out.println(s"/** Decompiled from $unit */")
-      out.println(new TastyImpl(ctx).showSourceCode.showTree(unit.tpdTree)(ctx))
+      out.println(new TastyImpl(ctx).showSourceCode.showTree(unit.tpdTree, useColors)(ctx))
     }
   }
 }

library/src/scala/tasty/util/Show.scala

@@ -4,17 +4,17 @@ import scala.tasty.Tasty
 
 abstract class Show[T <: Tasty with Singleton](val tasty: T) {
 
-  def showTree(tree: tasty.Tree)(implicit ctx: tasty.Context): String
+  def showTree(tree: tasty.Tree, withColors: Boolean = false)(implicit ctx: tasty.Context): String
 
-  def showCaseDef(caseDef: tasty.CaseDef)(implicit ctx: tasty.Context): String
+  def showCaseDef(caseDef: tasty.CaseDef, withColors: Boolean = false)(implicit ctx: tasty.Context): String
 
-  def showPattern(pattern: tasty.Pattern)(implicit ctx: tasty.Context): String
+  def showPattern(pattern: tasty.Pattern, withColors: Boolean = false)(implicit ctx: tasty.Context): String
 
-  def showTypeOrBoundsTree(tpt: tasty.TypeOrBoundsTree)(implicit ctx: tasty.Context): String
+  def showTypeOrBoundsTree(tpt: tasty.TypeOrBoundsTree, withColors: Boolean = false)(implicit ctx: tasty.Context): String
 
-  def showTypeOrBounds(tpe: tasty.TypeOrBounds)(implicit ctx: tasty.Context): String
+  def showTypeOrBounds(tpe: tasty.TypeOrBounds, withColors: Boolean = false)(implicit ctx: tasty.Context): String
 
-  def showConstant(const: tasty.Constant)(implicit ctx: tasty.Context): String
+  def showConstant(const: tasty.Constant, withColors: Boolean = false)(implicit ctx: tasty.Context): String
 
   def showSymbol(symbol: tasty.Symbol)(implicit ctx: tasty.Context): String
 

library/src/scala/tasty/util/ShowExtractors.scala

@@ -5,22 +5,22 @@ import scala.tasty.Tasty
 class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty0) {
   import tasty.{rootContext => _, _}
 
-  def showTree(tree: Tree)(implicit ctx: Context): String =
+  def showTree(tree: Tree, withColors: Boolean = false)(implicit ctx: Context): String =
     new Buffer().visitTree(tree).result()
 
-  def showCaseDef(caseDef: CaseDef)(implicit ctx: Context): String =
+  def showCaseDef(caseDef: CaseDef, withColors: Boolean = false)(implicit ctx: Context): String =
     new Buffer().visitCaseDef(caseDef).result()
 
-  def showPattern(pattern: tasty.Pattern)(implicit ctx: tasty.Context): String =
+  def showPattern(pattern: tasty.Pattern, withColors: Boolean = false)(implicit ctx: tasty.Context): String =
     new Buffer().visitPattern(pattern).result()
 
-  def showTypeOrBoundsTree(tpt: TypeOrBoundsTree)(implicit ctx: Context): String =
+  def showTypeOrBoundsTree(tpt: TypeOrBoundsTree, withColors: Boolean = false)(implicit ctx: Context): String =
     new Buffer().visitTypeTree(tpt).result()
 
-  def showTypeOrBounds(tpe: TypeOrBounds)(implicit ctx: Context): String =
+  def showTypeOrBounds(tpe: TypeOrBounds, withColors: Boolean = false)(implicit ctx: Context): String =
     new Buffer().visitType(tpe).result()
 
-  def showConstant(const: Constant)(implicit ctx: Context): String =
+  def showConstant(const: Constant, withColors: Boolean = false)(implicit ctx: Context): String =
     new Buffer().visitConstant(const).result()
 
   def showSymbol(symbol: Symbol)(implicit ctx: Context): String =

library/src/scala/tasty/util/ShowSourceCode.scala

@@ -6,28 +6,28 @@ import scala.annotation.switch
 class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty0) {
   import tasty.{rootContext => _, _}
 
-  def showTree(tree: Tree)(implicit ctx: Context): String =
-    (new Buffer).printTree(tree).result()
+  def showTree(tree: Tree, withColors: Boolean = false)(implicit ctx: Context): String =
+    (new Buffer(withColors)).printTree(tree).result()
 
-  def showCaseDef(caseDef: CaseDef)(implicit ctx: Context): String =
-    (new Buffer).printCaseDef(caseDef).result()
+  def showCaseDef(caseDef: CaseDef, withColors: Boolean = false)(implicit ctx: Context): String =
+    (new Buffer(withColors)).printCaseDef(caseDef).result()
 
-  def showPattern(pattern: Pattern)(implicit ctx: Context): String =
-    (new Buffer).printPattern(pattern).result()
+  def showPattern(pattern: Pattern, withColors: Boolean = false)(implicit ctx: Context): String =
+    (new Buffer(withColors)).printPattern(pattern).result()
 
-  def showTypeOrBoundsTree(tpt: TypeOrBoundsTree)(implicit ctx: Context): String =
-    (new Buffer).printTypeOrBoundsTree(tpt).result()
+  def showTypeOrBoundsTree(tpt: TypeOrBoundsTree, withColors: Boolean = false)(implicit ctx: Context): String =
+    (new Buffer(withColors)).printTypeOrBoundsTree(tpt).result()
 
-  def showTypeOrBounds(tpe: TypeOrBounds)(implicit ctx: Context): String =
-    (new Buffer).printTypeOrBound(tpe).result()
+  def showTypeOrBounds(tpe: TypeOrBounds, withColors: Boolean = false)(implicit ctx: Context): String =
+    (new Buffer(withColors)).printTypeOrBound(tpe).result()
 
-  def showConstant(const: Constant)(implicit ctx: Context): String =
-    (new Buffer).printConstant(const).result()
+  def showConstant(const: Constant, withColors: Boolean = false)(implicit ctx: Context): String =
+    (new Buffer(withColors)).printConstant(const).result()
 
   def showSymbol(symbol: Symbol)(implicit ctx: Context): String =
     symbol.fullName
 
-  private class Buffer(implicit ctx: Context) {
+  private class Buffer(withColors: Boolean)(implicit ctx: Context) {
 
     private[this] val sb: StringBuilder = new StringBuilder