Remove Printers abstraction

Author: nicolasstucki

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

@@ -14,7 +14,7 @@ import dotty.tools.dotc.quoted.QuoteUtils._
 import dotty.tools.dotc.core.Decorators._
 
 import scala.quoted.QuoteContext
-import scala.quoted.reflect.printers.{ExtractorsPrinter, SourceCodePrinter, SyntaxHighlight}
+import scala.quoted.reflect.printers.{Extractors, SourceCode, SyntaxHighlight}
 
 import scala.internal.quoted.PickledQuote
 import scala.tasty.reflect._
@@ -65,11 +65,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
         def pos: Position = self.sourcePos
         def symbol: Symbol = self.symbol
         def showExtractors: String =
-          new ExtractorsPrinter().showTree(using QuoteContextImpl.this)(self)
+          Extractors.showTree(using QuoteContextImpl.this)(self)
         def show: String =
           self.showWith(SyntaxHighlight.plain)
         def showWith(syntaxHighlight: SyntaxHighlight): String =
-          new SourceCodePrinter(syntaxHighlight).showTree(using QuoteContextImpl.this)(self)
+          SourceCode.showTree(using QuoteContextImpl.this)(self)(syntaxHighlight)
         def isExpr: Boolean =
           self match
             case TermTypeTest(self) =>
@@ -1589,13 +1589,13 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
     object TypeMethodsImpl extends TypeMethods:
       extension (self: TypeRepr):
         def showExtractors: String =
-          new ExtractorsPrinter().showType(using QuoteContextImpl.this)(self)
+          Extractors.showType(using QuoteContextImpl.this)(self)
 
         def show: String =
           self.showWith(SyntaxHighlight.plain)
 
         def showWith(syntaxHighlight: SyntaxHighlight): String =
-          new SourceCodePrinter(syntaxHighlight).showType(using QuoteContextImpl.this)(self)
+          SourceCode.showType(using QuoteContextImpl.this)(self)(syntaxHighlight)
 
         def seal: scala.quoted.Type[_] =
           new scala.internal.quoted.Type(Inferred(self), QuoteContextImpl.this.hashCode)
@@ -2172,11 +2172,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
       extension (self: Constant):
         def value: Any = self.value
         def showExtractors: String =
-          new ExtractorsPrinter().showConstant(using QuoteContextImpl.this)(self)
+          Extractors.showConstant(using QuoteContextImpl.this)(self)
         def show: String =
           self.showWith(SyntaxHighlight.plain)
         def showWith(syntaxHighlight: SyntaxHighlight): String =
-          new SourceCodePrinter(syntaxHighlight).showConstant(using QuoteContextImpl.this)(self)
+          SourceCode.showConstant(using QuoteContextImpl.this)(self)(syntaxHighlight)
       end extension
     end ConstantMethodsImpl
 
@@ -2395,11 +2395,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
         def children: List[Symbol] = self.denot.children
 
         def showExtractors: String =
-          new ExtractorsPrinter().showSymbol(using QuoteContextImpl.this)(self)
+          Extractors.showSymbol(using QuoteContextImpl.this)(self)
         def show: String =
           self.showWith(SyntaxHighlight.plain)
         def showWith(syntaxHighlight: SyntaxHighlight): String =
-          new SourceCodePrinter(syntaxHighlight).showSymbol(using QuoteContextImpl.this)(self)
+          SourceCode.showSymbol(using QuoteContextImpl.this)(self)(syntaxHighlight)
 
       end extension
 
@@ -2531,11 +2531,11 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
         def |(that: Flags): Flags = dotc.core.Flags.extension_|(self)(that)
         def &(that: Flags): Flags = dotc.core.Flags.extension_&(self)(that)
         def showExtractors: String =
-          new ExtractorsPrinter().showFlags(using QuoteContextImpl.this)(self)
+          Extractors.showFlags(using QuoteContextImpl.this)(self)
         def show: String =
           self.showWith(SyntaxHighlight.plain)
         def showWith(syntaxHighlight: SyntaxHighlight): String =
-          new SourceCodePrinter(syntaxHighlight).showFlags(using QuoteContextImpl.this)(self)
+          SourceCode.showFlags(using QuoteContextImpl.this)(self)(syntaxHighlight)
       end extension
     end FlagsMethodsImpl
 

library/src/scala/quoted/reflect/printers/ExtractorsPrinter.scala renamed to library/src/scala/quoted/reflect/printers/Extractors.scala

@@ -1,19 +1,19 @@
 package scala.quoted
 package reflect.printers
 
-class ExtractorsPrinter extends Printer {
+object Extractors {
 
   def showTree(using QuoteContext)(tree: qctx.reflect.Tree): String =
-    new Buffer[qctx.type]().visitTree(tree).result()
+    new ExtractorsPrinter[qctx.type]().visitTree(tree).result()
 
   def showType(using QuoteContext)(tpe: qctx.reflect.TypeRepr): String =
-    new Buffer[qctx.type]().visitType(tpe).result()
+    new ExtractorsPrinter[qctx.type]().visitType(tpe).result()
 
   def showConstant(using QuoteContext)(const: qctx.reflect.Constant): String =
-    new Buffer[qctx.type]().visitConstant(const).result()
+    new ExtractorsPrinter[qctx.type]().visitConstant(const).result()
 
   def showSymbol(using QuoteContext)(symbol: qctx.reflect.Symbol): String =
-    new Buffer[qctx.type]().visitSymbol(symbol).result()
+    new ExtractorsPrinter[qctx.type]().visitSymbol(symbol).result()
 
   def showFlags(using QuoteContext)(flags: qctx.reflect.Flags): String = {
     import qctx.reflect._
@@ -55,7 +55,7 @@ class ExtractorsPrinter extends Printer {
     flagList.result().mkString(" | ")
   }
 
-  private class Buffer[QCtx <: QuoteContext & Singleton](using val qctx: QCtx) { self =>
+  private class ExtractorsPrinter[QCtx <: QuoteContext & Singleton](using val qctx: QCtx) { self =>
     import qctx.reflect._
 
     private val sb: StringBuilder = new StringBuilder

library/src/scala/quoted/reflect/printers/Printer.scala

@@ -4,22 +4,21 @@ package reflect.printers
 import scala.annotation.switch
 
 /** Printer for fully elaborated representation of the source code */
-class SourceCodePrinter(syntaxHighlight: SyntaxHighlight) extends Printer {
-  import syntaxHighlight._
+object SourceCode {
 
-  def showTree(using QuoteContext)(tree: qctx.reflect.Tree): String =
-    (new Buffer[qctx.type]).printTree(tree).result()
+  def showTree(using QuoteContext)(tree: qctx.reflect.Tree)(syntaxHighlight: SyntaxHighlight): String =
+    new SourceCodePrinter[qctx.type](syntaxHighlight).printTree(tree).result()
 
-  def showType(using QuoteContext)(tpe: qctx.reflect.TypeRepr): String =
-    (new Buffer[qctx.type]).printType(tpe)(using None).result()
+  def showType(using QuoteContext)(tpe: qctx.reflect.TypeRepr)(syntaxHighlight: SyntaxHighlight): String =
+    new SourceCodePrinter[qctx.type](syntaxHighlight).printType(tpe)(using None).result()
 
-  def showConstant(using QuoteContext)(const: qctx.reflect.Constant): String =
-    (new Buffer[qctx.type]).printConstant(const).result()
+  def showConstant(using QuoteContext)(const: qctx.reflect.Constant)(syntaxHighlight: SyntaxHighlight): String =
+    new SourceCodePrinter[qctx.type](syntaxHighlight).printConstant(const).result()
 
-  def showSymbol(using QuoteContext)(symbol: qctx.reflect.Symbol): String =
+  def showSymbol(using QuoteContext)(symbol: qctx.reflect.Symbol)(syntaxHighlight: SyntaxHighlight): String =
     symbol.fullName
 
-  def showFlags(using QuoteContext)(flags: qctx.reflect.Flags): String = {
+  def showFlags(using QuoteContext)(flags: qctx.reflect.Flags)(syntaxHighlight: SyntaxHighlight): String = {
     import qctx.reflect._
     val flagList = List.newBuilder[String]
     if (flags.is(Flags.Abstract)) flagList += "abstract"
@@ -59,7 +58,8 @@ class SourceCodePrinter(syntaxHighlight: SyntaxHighlight) extends Printer {
     flagList.result().mkString("/*", " ", "*/")
   }
 
-  private class Buffer[QCtx <: QuoteContext & Singleton](using val qctx: QCtx) {
+  private class SourceCodePrinter[QCtx <: QuoteContext & Singleton](syntaxHighlight: SyntaxHighlight)(using val qctx: QCtx) {
+    import syntaxHighlight._
     import qctx.reflect._
 
     private[this] val sb: StringBuilder = new StringBuilder

library/src/scala/quoted/reflect/printers/SourceCodePrinter.scala renamed to library/src/scala/quoted/reflect/printers/SourceCode.scala

@@ -17,7 +17,7 @@ object Test {
     println(Expr("string").show)
     println()
     println(Expr(classOf[String]).show)
-    println(Expr(summon[reflect.ClassTag[String]]).show)
+    println(Expr(summon[scala.reflect.ClassTag[String]]).show)
     println()
     println(Expr(Array("a")).show)
     println(Expr(Array(true)).show)