Remove Context type from Reflection

Author: nicolasstucki

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

@@ -12,17 +12,17 @@ object QuoteContextImpl {
   type ScopeId = Int
 
   def apply()(using Context): QuoteContext =
-    new QuoteContextImpl(ctx)
+    new QuoteContextImpl
 
   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.tasty.Tree], syntaxHighlight)(using ctx.asInstanceOf[qctx.tasty.Context])
+    show(using qctx)(tree.asInstanceOf[qctx.tasty.Tree], syntaxHighlight)
   }
 
-  private def show(using qctx: QuoteContext)(tree: qctx.tasty.Tree, syntaxHighlight: SyntaxHighlight)(using qctx.tasty.Context) =
+  private def show(using qctx: QuoteContext)(tree: qctx.tasty.Tree, syntaxHighlight: SyntaxHighlight) =
     tree.showWith(syntaxHighlight)
 
   private[dotty] def checkScopeId(id: ScopeId)(using Context): Unit =
@@ -36,8 +36,8 @@ object QuoteContextImpl {
 
 }
 
-class QuoteContextImpl private (ctx: Context) extends QuoteContext {
+class QuoteContextImpl private (using 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
+  val tasty = new ReflectionCompilerInterface with scala.tasty.Reflection
 }

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

@@ -25,13 +25,11 @@ import scala.tasty.reflect.TypeTest
 // NOTE: `ReflectionCompilerInterface` should be a class to make sure that all functionality of
 //       `CompilerInterface` is implemented here.
 
-class ReflectionCompilerInterface(val rootContext: Context) extends CompilerInterface {
+class ReflectionCompilerInterface(using val ctx: Context) extends CompilerInterface {
   import tpd._
 
-  private given core.Contexts.Context = rootContext
-
   def rootPosition: util.SourcePosition =
-    MacroExpansion.position.getOrElse(SourcePosition(rootContext.source, Spans.NoSpan))
+    MacroExpansion.position.getOrElse(SourcePosition(ctx.source, Spans.NoSpan))
 
 
   //////////////////////
@@ -45,26 +43,20 @@ class ReflectionCompilerInterface(val rootContext: Context) extends CompilerInte
     PickledQuotes.unpickleType(repr, args)
 
 
-  /////////////
-  // CONTEXT //
-  /////////////
-
-  type Context = core.Contexts.Context
-
   /////////////////
   // Constraints //
   /////////////////
 
 
   def Constraints_context[T]: scala.quoted.QuoteContext =
-    val ctx = rootContext.fresh.setFreshGADTBounds.addMode(Mode.GadtConstraintInference)
-    dotty.tools.dotc.quoted.QuoteContextImpl()(using ctx)
+    val ctx1 = ctx.fresh.setFreshGADTBounds.addMode(Mode.GadtConstraintInference)
+    dotty.tools.dotc.quoted.QuoteContextImpl()(using ctx1)
 
   def Constraints_add(syms: List[Symbol]): Boolean =
-    rootContext.gadt.addToConstraint(syms)
+    ctx.gadt.addToConstraint(syms)
 
   def Constraints_approximation(sym: Symbol, fromBelow: Boolean): Type =
-    rootContext.gadt.approximation(sym, fromBelow)
+    ctx.gadt.approximation(sym, fromBelow)
 
   ////////////
   // Source //
@@ -2114,5 +2106,5 @@ class ReflectionCompilerInterface(val rootContext: Context) extends CompilerInte
   private def withDefaultPos[T <: Tree](tree: T): T =
     tree.withSpan(rootPosition.span)
 
-  def compilerId: Int = rootContext.outersIterator.toList.last.hashCode()
+  def compilerId: Int = ctx.outersIterator.toList.last.hashCode()
 }

library/src/scala/tasty/reflect/Types.scala

@@ -114,9 +114,6 @@ import scala.tasty.reflect._
  */
 trait Types {
 
-  /** Compilation context */
-  type Context <: AnyRef
-
   /** Tree representing code written in the source */
   type Tree <: AnyRef