Remove implicit from tasty.Reflection

Author: nicolasstucki

compiler/src/dotty/tools/dotc/tastyreflect/ReflectionCompilerInterface.scala

@@ -592,7 +592,7 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
   def Closure_copy(original: Tree)(meth: Tree, tpe: Option[Type])(given Context): Closure =
     tpd.cpy.Closure(original)(Nil, meth, tpe.map(tpd.TypeTree(_)).getOrElse(tpd.EmptyTree))
 
-  def Lambda_apply(tpe: MethodType, rhsFn: List[Tree] => Tree)(implicit ctx: Context): Block =
+  def Lambda_apply(tpe: MethodType, rhsFn: List[Tree] => Tree)(given ctx: Context): Block =
     tpd.Lambda(tpe, rhsFn)
 
   type If = tpd.If
@@ -1204,7 +1204,7 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
       case tpe: Types.ConstantType => Some(tpe)
       case _ => None
   }
-  
+
   def ConstantType_apply(const: Constant)(given Context): ConstantType =
     Types.ConstantType(const)
 

library/src/scala/internal/quoted/Matcher.scala

@@ -32,7 +32,8 @@ private[quoted] object Matcher {
     def termMatch(scrutineeTerm: Term, patternTerm: Term, hasTypeSplices: Boolean): Option[Tuple] = {
       implicit val env: Env = Map.empty
       if (hasTypeSplices) {
-        implicit val ctx: Context = internal.Context_GADT_setFreshGADTBounds(rootContext)
+        val ctx: Context = internal.Context_GADT_setFreshGADTBounds(rootContext)
+        given Context = ctx
         val matchings = scrutineeTerm.underlyingArgument =?= patternTerm.underlyingArgument
         // After matching and doing all subtype checks, we have to aproximate all the type bindings
         // that we have found and seal them in a quoted.Type
@@ -52,7 +53,8 @@ private[quoted] object Matcher {
     def typeTreeMatch(scrutineeTypeTree: TypeTree, patternTypeTree: TypeTree, hasTypeSplices: Boolean): Option[Tuple] = {
       implicit val env: Env = Map.empty
       if (hasTypeSplices) {
-        implicit val ctx: Context = internal.Context_GADT_setFreshGADTBounds(rootContext)
+        val ctx: Context = internal.Context_GADT_setFreshGADTBounds(rootContext)
+        given Context = ctx
         val matchings = scrutineeTypeTree =?= patternTypeTree
         // After matching and doing all subtype checks, we have to aproximate all the type bindings
         // that we have found and seal them in a quoted.Type

library/src/scala/tasty/Reflection.scala

@@ -452,7 +452,7 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
   //////////////
 
   /** Context of the macro expansion */
-  implicit def rootContext: Context = internal.rootContext // TODO: Use given // TODO: Should this be moved to QuoteContext?
+  given rootContext: Context = internal.rootContext // TODO: Use given // TODO: Should this be moved to QuoteContext?
 
   given ContextOps: extension (self: Context) {
     /** Returns the owner of the context */
@@ -1009,7 +1009,7 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
       case _ => None
     }
 
-    def apply(tpe: MethodType, rhsFn: List[Tree] => Tree)(implicit ctx: Context): Block =
+    def apply(tpe: MethodType, rhsFn: List[Tree] => Tree)(given ctx: Context): Block =
       internal.Lambda_apply(tpe, rhsFn)
 
   }
@@ -2742,7 +2742,7 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
     def foldTrees(x: X, trees: Iterable[Tree])(given ctx: Context): X = trees.foldLeft(x)(foldTree)
 
     def foldOverTree(x: X, tree: Tree)(given ctx: Context): X = {
-      def localCtx(definition: Definition): Context = definition.symbol.localContext
+      lazy val localCtx: Context = tree.symbol.localContext
       tree match {
         case Ident(_) =>
           x
@@ -2785,16 +2785,16 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
         case Inlined(call, bindings, expansion) =>
           foldTree(foldTrees(x, bindings), expansion)
         case vdef @ ValDef(_, tpt, rhs) =>
-          implicit val ctx = localCtx(vdef)
+          given Context = localCtx
           foldTrees(foldTree(x, tpt), rhs)
         case ddef @ DefDef(_, tparams, vparamss, tpt, rhs) =>
-          implicit val ctx = localCtx(ddef)
+          given Context = localCtx
           foldTrees(foldTree(vparamss.foldLeft(foldTrees(x, tparams))(foldTrees), tpt), rhs)
         case tdef @ TypeDef(_, rhs) =>
-          implicit val ctx = localCtx(tdef)
+          given Context = localCtx
           foldTree(x, rhs)
         case cdef @ ClassDef(_, constr, parents, derived, self, body) =>
-          implicit val ctx = localCtx(cdef)
+          given Context = localCtx
           foldTrees(foldTrees(foldTrees(foldTrees(foldTree(x, constr), parents), derived), self), body)
         case Import(expr, _) =>
           foldTree(x, expr)
@@ -2862,20 +2862,20 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
     }
 
     def transformStatement(tree: Statement)(given ctx: Context): Statement = {
-      def localCtx(definition: Definition): Context = definition.symbol.localContext
+      lazy val localCtx: Context = tree.symbol.localContext
       tree match {
         case tree: Term =>
           transformTerm(tree)
         case tree: ValDef =>
-          implicit val ctx = localCtx(tree)
+          given Context = localCtx
           val tpt1 = transformTypeTree(tree.tpt)
           val rhs1 = tree.rhs.map(x => transformTerm(x))
           ValDef.copy(tree)(tree.name, tpt1, rhs1)
         case tree: DefDef =>
-          implicit val ctx = localCtx(tree)
+          given Context = localCtx
           DefDef.copy(tree)(tree.name, transformSubTrees(tree.typeParams), tree.paramss mapConserve (transformSubTrees(_)), transformTypeTree(tree.returnTpt), tree.rhs.map(x => transformTerm(x)))
         case tree: TypeDef =>
-          implicit val ctx = localCtx(tree)
+          given Context = localCtx
           TypeDef.copy(tree)(tree.name, transformTree(tree.rhs))
         case tree: ClassDef =>
           ClassDef.copy(tree)(tree.name, tree.constructor, tree.parents, tree.derived, tree.self, tree.body)

library/src/scala/tasty/reflect/CompilerInterface.scala

@@ -455,7 +455,7 @@ trait CompilerInterface {
   def Closure_apply(meth: Term, tpe: Option[Type])(given ctx: Context): Closure
   def Closure_copy(original: Tree)(meth: Tree, tpe: Option[Type])(given ctx: Context): Closure
 
-  def Lambda_apply(tpe: MethodType, rhsFn: List[Tree] => Tree)(implicit ctx: Context): Block
+  def Lambda_apply(tpe: MethodType, rhsFn: List[Tree] => Tree)(given ctx: Context): Block
 
   /** Tree representing an if/then/else `if (...) ... else ...` in the source code */
   type If <: Term
@@ -1043,7 +1043,7 @@ trait CompilerInterface {
 
   def isInstanceOfPolyType(given ctx: Context): IsInstanceOf[PolyType]
 
-  def PolyType_apply(paramNames: List[String])(paramBoundsExp: PolyType => List[TypeBounds], resultTypeExp: PolyType => Type)(given ctx: Context): PolyType 
+  def PolyType_apply(paramNames: List[String])(paramBoundsExp: PolyType => List[TypeBounds], resultTypeExp: PolyType => Type)(given ctx: Context): PolyType
 
   def PolyType_param(self: PolyType, idx: Int)(given ctx: Context): Type
   def PolyType_paramNames(self: PolyType)(given ctx: Context): List[String]

tests/neg-macros/macros-in-same-project-6/Foo.scala

@@ -5,7 +5,7 @@ object Foo {
   inline def myMacro(): Unit = ${ aMacroImplementation }
 
   def aMacroImplementation with (qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.tasty._
+    import qctx.tasty.{given, _}
     error("some error", rootPosition)
     throw new NoClassDefFoundError("Bar$")
   }

tests/run-macros/quote-matcher-runtime/quoted_1.scala

@@ -7,7 +7,7 @@ object Macros {
   inline def matches[A, B](inline a: A, inline b: B): Unit = ${impl('a, 'b)}
 
   private def impl[A, B](a: Expr[A], b: Expr[B]) with (qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.tasty.{Bind => _, _}
+    import qctx.tasty.{Bind => _, given, _}
 
     val res = scala.internal.quoted.Expr.unapply[Tuple, Tuple](a)(b, true, qctx).map { tup =>
       tup.toArray.toList.map {

tests/run-macros/quote-type-matcher/quoted_1.scala

@@ -7,7 +7,7 @@ object Macros {
   inline def matches[A, B]: Unit = ${ matchesExpr('[A], '[B]) }
 
   private def matchesExpr[A, B](a: Type[A], b: Type[B]) with (qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.tasty.{Bind => _, _}
+    import qctx.tasty.{Bind => _, given, _}
 
     val res = scala.internal.quoted.Type.unapply[Tuple, Tuple](a)(b, true, qctx).map { tup =>
       tup.toArray.toList.map {