Remove redundant ReflectionImpl class

Always use the QuoteContext abstraction directly

Author: nicolasstucki

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

@@ -8,7 +8,7 @@ import scala.io.Codec
 import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.tasty.TastyPrinter
-import dotty.tools.dotc.quoted.reflect.ReflectionImpl
+import dotty.tools.dotc.quoted.QuoteContextImpl
 import dotty.tools.io.File
 
 /** Phase that prints the trees in all loaded compilation units.
@@ -43,7 +43,7 @@ class DecompilationPrinter extends Phase {
     else {
       val unitFile = unit.source.toString.replace("\\", "/").replace(".class", ".tasty")
       out.println(s"/** Decompiled from $unitFile */")
-      out.println(ReflectionImpl.showTree(unit.tpdTree))
+      out.println(QuoteContextImpl.showTree(unit.tpdTree))
     }
   }
 }

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

@@ -6,7 +6,7 @@ import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core._
 import dotty.tools.dotc.core.tasty.TastyHTMLPrinter
 import dotty.tools.dotc.reporting._
-import dotty.tools.dotc.quoted.reflect.ReflectionImpl
+import dotty.tools.dotc.quoted.QuoteContextImpl
 
 /**
   * Decompiler to be used with IDEs
@@ -34,7 +34,7 @@ class IDEDecompilerDriver(val settings: List[String]) extends dotc.Driver {
       run.printSummary()
       val unit = ctx.run.units.head
 
-      val decompiled = ReflectionImpl.showTree(unit.tpdTree)
+      val decompiled = QuoteContextImpl.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/PickledQuotes.scala

@@ -15,7 +15,6 @@ import dotty.tools.dotc.core.tasty.TreePickler.Hole
 import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter }
 import dotty.tools.dotc.core.tasty.DottyUnpickler
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
-import dotty.tools.dotc.quoted.reflect.ReflectionImpl
 
 import dotty.tools.tasty.TastyString
 

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

@@ -1,16 +1,29 @@
 package dotty.tools.dotc.quoted
 
+import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.quoted.reflect._
 
 import scala.quoted.QuoteContext
+import scala.quoted.show.SyntaxHighlight
 
 object QuoteContextImpl {
 
-  def apply()(using Context): QuoteContext =
-    new QuoteContextImpl(reflect.ReflectionImpl(ctx))
-
   type ScopeId = Int
 
+  def apply()(using Context): QuoteContext =
+    new QuoteContextImpl(ctx)
+
+  def showTree(tree: tpd.Tree)(using Context): String = {
+    val qctx = QuoteContextImpl()(using MacroExpansion.context(tree))
+    val reflCtx = ctx.asInstanceOf[qctx.tasty.Context]
+    val reflTree = tree.asInstanceOf[qctx.tasty.Tree]
+    val syntaxHighlight =
+      if (ctx.settings.color.value == "always") SyntaxHighlight.ANSI
+      else SyntaxHighlight.plain
+    new scala.tasty.reflect.SourceCodePrinter[qctx.tasty.type](qctx.tasty)(syntaxHighlight).showTree(reflTree)(using reflCtx)
+  }
+
   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(...)`")
@@ -19,6 +32,11 @@ object QuoteContextImpl {
   //      This id can only differentiate scope extrusion from one compiler instance to another.
   private[dotty] def scopeId(using Context): ScopeId =
     ctx.outersIterator.toList.last.hashCode()
+
 }
 
-class QuoteContextImpl(val tasty: scala.tasty.Reflection) extends QuoteContext
+class QuoteContextImpl private (ctx: Context) extends QuoteContext {
+  // NOTE: The tasty class should only mixin the compiler interface and the reflection interface.
+  //       We should not implement methods here, all should be implemented by `ReflectionCompilerInterface`
+  val tasty = new ReflectionCompilerInterface(ctx) with scala.tasty.Reflection
+}

compiler/src/dotty/tools/dotc/quoted/reflect/ReflectionImpl.scala

@@ -15,7 +15,6 @@ import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types.ExprType
 import dotty.tools.dotc.quoted.PickledQuotes
-import dotty.tools.dotc.quoted.reflect.ReflectionImpl
 import dotty.tools.dotc.transform.Splicer.checkEscapedVariables
 import dotty.tools.dotc.transform.ReifyQuotes
 import dotty.tools.dotc.util.Spans.Span

staging/src/scala/quoted/staging/QuoteCompiler.scala

@@ -9,7 +9,7 @@ import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Mode
 import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.fromtasty._
-import dotty.tools.dotc.quoted.reflect.ReflectionImpl
+import dotty.tools.dotc.quoted.QuoteContextImpl
 import dotty.tools.dotc.util.ClasspathFromClassloader
 
 import java.io.File.pathSeparator
@@ -57,8 +57,8 @@ trait TastyInspector:
       override def phaseName: String = "tastyInspector"
 
       override def run(implicit ctx: Context): Unit =
-        val reflect = ReflectionImpl(ctx)
-        self.processCompilationUnit(reflect)(ctx.compilationUnit.tpdTree.asInstanceOf[reflect.Tree])
+        val qctx = QuoteContextImpl()
+        self.processCompilationUnit(qctx.tasty)(ctx.compilationUnit.tpdTree.asInstanceOf[qctx.tasty.Tree])
 
     end TastyInspectorPhase