wip

Author: nicolasstucki

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

@@ -16,6 +16,7 @@ import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 import dotty.tools.dotc.quoted.QuoteContext
 import dotty.tools.dotc.tastyreflect.{ReflectionImpl, TastyTreeExpr, TreeType}
+import dotty.tools.dotc.util.Spans.NoSpan
 
 import dotty.tools.tasty.TastyString
 
@@ -112,38 +113,28 @@ object PickledQuotes {
           //   typeSpliceMap = splicedTypes.toMap
           //   transform(expr1)
           case Hole(isType, idx, args) =>
+            assert(!isType)
             val splice = splices(idx)
             def wrap(arg: Tree) =
               if (arg.isTerm) (qctx: scala.quoted.QuoteContext) ?=> new TastyTreeExpr(arg, QuoteContext.scopeId)
               else new TreeType(arg, QuoteContext.scopeId)
             val reifiedArgs = args.map(wrap)
-            val filled = if (isType) {
-              ???
-              val quotedType = splice.asInstanceOf[Seq[Any] => quoted.Type[?]](reifiedArgs)
-              PickledQuotes.quotedTypeToTree(quotedType)
-            }
-            else {
-              val splice1 = splice.asInstanceOf[Seq[Any] => scala.quoted.QuoteContext ?=> quoted.Expr[?]]
-              val quotedExpr = splice1(reifiedArgs)(using dotty.tools.dotc.quoted.QuoteContext())
-              PickledQuotes.quotedExprToTree(quotedExpr)
-            }
+
+            val splice1 = splice.asInstanceOf[Seq[Any] => scala.quoted.QuoteContext ?=> quoted.Expr[?]]
+            val quotedExpr = splice1(reifiedArgs)(using dotty.tools.dotc.quoted.QuoteContext())
+            val filled = PickledQuotes.quotedExprToTree(quotedExpr)
+
             // We need to make sure a hole is created with the source file of the surrounding context, even if
-            // it filled with contents a different source file. Otherwise nodes contqaining holes might end
-            // up without a position. PositionPickler makes sure that holes always get spans assigned,
-            // so we can just return the filler tree with the new source and no span here.
+            // it filled with contents a different source file.
             if (filled.source == ctx.source) filled
-            else {
-              val filled1 = filled.cloneIn(ctx.source)
-              // filled1.span = NoSpan
-              filled1
-            }
+            else filled.cloneIn(ctx.source)
 
             // super.transform(tree).withType(dealiasTypeTags(tree.tpe))
           case tree =>
             super.transform(tree).withType(spliceTypes(tree.tpe))
         }
       }
-      val evaluatedExpansion = evaluateHoles.transform(expnasion1)
+      val evaluatedExpansion = evaluateHoles.transform(expnasion1)(inlineContext(call))
       cpy.Inlined(unpickled)(call, Nil, evaluatedExpansion)
     else
       val forceAndCleanArtefacts = new TreeMap {

tests/neg-macros/delegate-match-1.check

@@ -3,5 +3,5 @@
 6 |  f // error
   |  ^
   |  AmbiguousImplicits
-  |  both value a1 in class Test1 and value a2 in class Test1 match type A
+  |  both value a1 in class Test1 and value a2 in class Test1 match type <empty>.this.A
   | This location contains code that was inlined from Test_2.scala:6

tests/neg-macros/delegate-match-2.check

@@ -3,5 +3,5 @@
 5 |  f // error
   |  ^
   |  DivergingImplicit
-  |  method a1 in class Test produces a diverging implicit search when trying to match type A
+  |  method a1 in class Test produces a diverging implicit search when trying to match type <empty>.this.A
   | This location contains code that was inlined from Test_2.scala:5

tests/neg-macros/delegate-match-3.check

@@ -3,5 +3,5 @@
 3 |  f // error
   |  ^
   |  NoMatchingImplicits
-  |  no implicit values were found that match type A
+  |  no implicit values were found that match type <empty>.this.A
   | This location contains code that was inlined from Test_2.scala:3