Remove SyntaxHighlighting fro Expr, Type and Reflection

Author: nicolasstucki

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

@@ -44,7 +44,7 @@ class DecompilationPrinter extends Phase {
     else {
       val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
       out.println(s"/** Decompiled from $unitFile */")
-      out.println(QuoteContextImpl.showTree(unit.tpdTree))
+      out.println(QuoteContextImpl.showDecompiledTree(unit.tpdTree))
     }
   }
 }

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

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

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

@@ -26,17 +26,14 @@ object QuoteContextImpl {
   def apply()(using Context): QuoteContext =
     new QuoteContextImpl(ctx)
 
-  def showTree(tree: tpd.Tree)(using Context): String = {
-    val qctx = QuoteContextImpl()(using MacroExpansion.context(tree))
-    val syntaxHighlight =
-      if (ctx.settings.color.value == "always") SyntaxHighlight.ANSI
-      else SyntaxHighlight.plain
-    show(using qctx)(tree.asInstanceOf[qctx.reflect.Tree], syntaxHighlight)(using ctx.asInstanceOf[qctx.reflect.Context])
+  def showDecompiledTree(tree: tpd.Tree)(using Context): String = {
+    val qctx: QuoteContextImpl = new QuoteContextImpl(MacroExpansion.context(tree))
+    if ctx.settings.color.value == "always" then
+      qctx.reflect.TreeMethodsImpl.extension_showAnsiColored(tree)
+    else
+      qctx.reflect.TreeMethodsImpl.extension_show(tree)
   }
 
-  private def show(using qctx: QuoteContext)(tree: qctx.reflect.Tree, syntaxHighlight: SyntaxHighlight)(using qctx.reflect.Context) =
-    tree.showWith(syntaxHighlight)
-
   private[dotty] def checkScopeId(id: ScopeId)(using Context): Unit =
     if (id != scopeId)
       throw new scala.quoted.ScopeException("Cannot call `scala.quoted.staging.run(...)` within a macro or another `run(...)`")
@@ -67,9 +64,9 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
         def showExtractors: String =
           Extractors.showTree(using QuoteContextImpl.this)(self)
         def show: String =
-          self.showWith(SyntaxHighlight.plain)
-        def showWith(syntaxHighlight: SyntaxHighlight): String =
-          SourceCode.showTree(using QuoteContextImpl.this)(self)(syntaxHighlight)
+          SourceCode.showTree(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
+        def showAnsiColored: String =
+          SourceCode.showTree(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
         def isExpr: Boolean =
           self match
             case TermTypeTest(self) =>
@@ -1592,10 +1589,10 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
           Extractors.showType(using QuoteContextImpl.this)(self)
 
         def show: String =
-          self.showWith(SyntaxHighlight.plain)
+          SourceCode.showType(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
 
-        def showWith(syntaxHighlight: SyntaxHighlight): String =
-          SourceCode.showType(using QuoteContextImpl.this)(self)(syntaxHighlight)
+        def showAnsiColored: String =
+          SourceCode.showType(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
 
         def seal: scala.quoted.Type[_] =
           new scala.internal.quoted.Type(Inferred(self), QuoteContextImpl.this.hashCode)
@@ -2174,9 +2171,9 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
         def showExtractors: String =
           Extractors.showConstant(using QuoteContextImpl.this)(self)
         def show: String =
-          self.showWith(SyntaxHighlight.plain)
-        def showWith(syntaxHighlight: SyntaxHighlight): String =
-          SourceCode.showConstant(using QuoteContextImpl.this)(self)(syntaxHighlight)
+          SourceCode.showConstant(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
+        def showAnsiColored: String =
+          SourceCode.showConstant(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
       end extension
     end ConstantMethodsImpl
 
@@ -2397,9 +2394,9 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
         def showExtractors: String =
           Extractors.showSymbol(using QuoteContextImpl.this)(self)
         def show: String =
-          self.showWith(SyntaxHighlight.plain)
-        def showWith(syntaxHighlight: SyntaxHighlight): String =
-          SourceCode.showSymbol(using QuoteContextImpl.this)(self)(syntaxHighlight)
+          SourceCode.showSymbol(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
+        def showAnsiColored: String =
+          SourceCode.showSymbol(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
 
       end extension
 
@@ -2533,9 +2530,9 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
         def showExtractors: String =
           Extractors.showFlags(using QuoteContextImpl.this)(self)
         def show: String =
-          self.showWith(SyntaxHighlight.plain)
-        def showWith(syntaxHighlight: SyntaxHighlight): String =
-          SourceCode.showFlags(using QuoteContextImpl.this)(self)(syntaxHighlight)
+          SourceCode.showFlags(using QuoteContextImpl.this)(self)(SyntaxHighlight.plain)
+        def showAnsiColored: String =
+          SourceCode.showFlags(using QuoteContextImpl.this)(self)(SyntaxHighlight.ANSI)
       end extension
     end FlagsMethodsImpl
 

library/src-bootstrapped/scala/quoted/Expr.scala

@@ -1,18 +1,15 @@
 package scala.quoted
 
-import scala.quoted.reflection.printers.SyntaxHighlight
 import scala.internal.tasty.CompilerInterface.quoteContextWithCompilerInterface
 
 /** Quoted expression of type `T` */
 abstract class Expr[+T] private[scala] {
 
   /** Show a source code like representation of this expression without syntax highlight */
-  def show(using qctx: QuoteContext): String =
-    this.unseal.showWith(SyntaxHighlight.plain)
+  def show(using qctx: QuoteContext): String = this.unseal.show
 
-  /** Show a source code like representation of this expression */
-  def showWith(syntaxHighlight: SyntaxHighlight)(using qctx: QuoteContext): String =
-    this.unseal.showWith(syntaxHighlight)
+  /** Shows the tree as fully typed source code colored with ANSI */
+  def showAnsiColored(using qctx: QuoteContext): String = this.unseal.showAnsiColored
 
   /** Pattern matches `this` against `that`. Effectively performing a deep equality check.
    *  It does the equivalent of

library/src-bootstrapped/scala/quoted/Type.scala

@@ -1,7 +1,6 @@
 package scala.quoted
 
 import scala.annotation.compileTimeOnly
-import scala.quoted.reflection.printers.SyntaxHighlight
 
 /** Quoted type (or kind) `T` */
 abstract class Type[T <: AnyKind] private[scala] {
@@ -10,12 +9,10 @@ abstract class Type[T <: AnyKind] private[scala] {
   type Underlying = T
 
   /** Show a source code like representation of this type without syntax highlight */
-  def show(using qctx: QuoteContext): String =
-    this.unseal.showWith(SyntaxHighlight.plain)
+  def show(using qctx: QuoteContext): String = this.unseal.show
 
-  /** Show a source code like representation of this type */
-  def showWith(syntaxHighlight: SyntaxHighlight)(using qctx: QuoteContext): String =
-    this.unseal.showWith(syntaxHighlight)
+  /** Shows the tree as fully typed source code colored with ANSI */
+  def showAnsiColored(using qctx: QuoteContext): String = this.unseal.showAnsiColored
 
   /** View this expression `quoted.Type[T]` as a `TypeTree` */
   def unseal(using qctx: QuoteContext): qctx.reflect.TypeTree

library/src/scala/tasty/Reflection.scala

@@ -3,7 +3,6 @@ package scala.tasty
 import scala.internal.tasty.CompilerInterface
 
 import scala.quoted.QuoteContext
-import scala.quoted.reflection.printers.SyntaxHighlight
 import scala.tasty.reflect._
 
 /** TASTy Reflect Interface.
@@ -156,8 +155,8 @@ trait Reflection { reflection =>
       /** Shows the tree as fully typed source code */
       def show: String
 
-      /** Shows the tree as fully typed source code */
-      def showWith(syntaxHighlight: SyntaxHighlight): String
+      /** Shows the tree as fully typed source code colored with ANSI */
+      def showAnsiColored: String
 
       /** Does this tree represent a valid expression? */
       def isExpr: Boolean
@@ -1753,8 +1752,8 @@ trait Reflection { reflection =>
       /** Shows the tree as fully typed source code */
       def show: String
 
-      /** Shows the tree as fully typed source code */
-      def showWith(syntaxHighlight: SyntaxHighlight): String
+      /** Shows the tree as fully typed source code colored with ANSI */
+      def showAnsiColored: String
 
       /** Convert `TypeRepr` to an `quoted.Type[_]` */
       def seal: scala.quoted.Type[_]
@@ -2491,8 +2490,8 @@ trait Reflection { reflection =>
       /** Shows the tree as fully typed source code */
       def show: String
 
-      /** Shows the tree as fully typed source code */
-      def showWith(syntaxHighlight: SyntaxHighlight): String
+      /** Shows the tree as fully typed source code colored with ANSI */
+      def showAnsiColored: String
     end extension
   }
 
@@ -2800,8 +2799,8 @@ trait Reflection { reflection =>
       /** Shows the tree as fully typed source code */
       def show: String
 
-      /** Shows the tree as fully typed source code */
-      def showWith(syntaxHighlight: SyntaxHighlight): String
+      /** Shows the tree as fully typed source code colored with ANSI */
+      def showAnsiColored: String
 
       /** Case class or case object children of a sealed trait */
       def children: List[Symbol]
@@ -3155,8 +3154,8 @@ trait Reflection { reflection =>
       /** Shows the tree as fully typed source code */
       def show: String
 
-      /** Shows the tree as fully typed source code */
-      def showWith(syntaxHighlight: SyntaxHighlight): String
+      /** Shows the tree as fully typed source code colored with ANSI */
+      def showAnsiColored: String
 
     end extension
   }

tests/run-macros/i6270/Macro_1.scala

@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.reflection.printers.SyntaxHighlight.ANSI
 
 object api {
   extension (inline x: String) inline def reflect : String =
@@ -15,6 +14,6 @@ object api {
 
   private def reflImplColor(x: Expr[String])(using qctx: QuoteContext) : Expr[String] = {
     import qctx.reflect._
-    Expr(x.showWith(ANSI))
+    Expr(x.showAnsiColored)
   }
 }