Preserve implicits in Quotes context

Author: joroKr21

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

@@ -22,6 +22,7 @@ import scala.collection.mutable
 
 import QuoteUtils.*
 import dotty.tools.io.NoAbstractFile
+import dotty.tools.dotc.ast.TreeMapWithImplicits
 
 object PickledQuotes {
   import tpd.*
@@ -99,7 +100,7 @@ object PickledQuotes {
 
   /** Replace all term holes with the spliced terms */
   private def spliceTerms(tree: Tree, typeHole: TypeHole, termHole: ExprHole)(using Context): Tree = {
-    def evaluateHoles = new TreeMapWithPreciseStatContexts {
+    def evaluateHoles = new TreeMapWithImplicits {
       override def transform(tree: tpd.Tree)(using Context): tpd.Tree = tree match {
         case Hole(isTerm, idx, args, _) =>
           inContext(SpliceScope.contextWithNewSpliceScope(tree.sourcePos)) {

tests/run-macros/i22260.check

@@ -0,0 +1,5 @@
+42
+42
+42
+42
+42

tests/run-macros/i22260/Macros_1.scala

@@ -0,0 +1,49 @@
+import scala.quoted.*
+
+object Macros:
+  inline def inMethod: Int = ${ insideMethod }
+  inline def usMethod: Int = ${ usingMethod }
+  inline def inObject: Int = ${ insideObject }
+  inline def inClass: Int = ${ insideClass }
+  inline def usClass: Int = ${ usingClass }
+
+  def summon(using Quotes) =
+    Expr.summon[Int].getOrElse('{ 0 })
+
+  def insideMethod(using Quotes): Expr[Int] = '{
+    def foo =
+      given Int = 42
+      ${summon}
+
+    foo
+  }
+
+  def usingMethod(using Quotes): Expr[Int] = '{
+    def foo(using Int) =
+      ${summon}
+
+    foo(using 42)
+  }
+
+  def insideObject(using Quotes): Expr[Int] = '{
+    object Foo:
+      given Int = 42
+      val x = ${summon}
+
+    Foo.x
+  }
+
+  def insideClass(using Quotes): Expr[Int] = '{
+    class Foo:
+      given Int = 42
+      val x = ${summon}
+
+    new Foo().x
+  }
+
+  def usingClass(using Quotes): Expr[Int] = '{
+    class Foo(using Int):
+      val x = ${summon}
+
+    new Foo(using 42).x
+  }

tests/run-macros/i22260/Test_2.scala

@@ -0,0 +1,6 @@
+@main def Test =
+  println(Macros.inMethod)
+  println(Macros.usMethod)
+  println(Macros.inObject)
+  println(Macros.inClass)
+  println(Macros.usClass)