WiP

Author: nicolasstucki

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

@@ -131,11 +131,14 @@ object PickledQuotes {
           case tdef: TypeDef =>
             assert(tdef.symbol.hasAnnotation(defn.QuotedRuntime_SplicedTypeAnnot))
             val tree = tdef.rhs match
-              case TypeBoundsTree(_, Hole(_, idx, args, _, _), _) =>
+              case TypeBoundsTree(_, Hole(_, idx, args, _, _), _) => // keep for backwards compat
                 val quotedType = typeHole(idx, args)
                 PickledQuotes.quotedTypeToTree(quotedType)
-              case TypeBoundsTree(_, tpt, _) =>
+              case TypeBoundsTree(_, tpt, _) => // keep for backwards compat
                 tpt
+              case Hole(_, idx, args, _, _) =>
+                val quotedType = typeHole(idx, args)
+                PickledQuotes.quotedTypeToTree(quotedType)
             (tdef.symbol, tree.tpe)
         }.toMap
         class ReplaceSplicedTyped extends TypeMap() {

compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala

@@ -157,15 +157,14 @@ class PickleQuotes extends MacroTransform {
             val holeType = getTermHoleType(tree.tpe)
             val hole = Hole(true, idx, args, EmptyTree, TypeTree(holeType)).withSpan(content.span).withType(holeType).asInstanceOf[Hole]
             Inlined(EmptyTree, Nil, hole).withSpan(tree.span)
-
-          case Select(tp, _) if tree.symbol == defn.QuotedType_splice =>
-            // TODO move to Splicing phase
+          case Hole(false, _, args, content, _) =>
             def makeTypeHole =
-              splices += ref(tp.symbol)
+              splices += content
               idx += 1
               val holeType = getTypeHoleType(tree.tpe)
               Hole(false, idx, Nil, EmptyTree, TypeTree(holeType)).withType(holeType).asInstanceOf[Hole]
-            typeHoles.getOrElseUpdate(tp.symbol, makeTypeHole)
+            typeHoles.getOrElseUpdate(content.symbol, makeTypeHole)
+
           case tree: DefTree =>
             val newAnnotations = tree.symbol.annotations.mapconserve { annot =>
               annot.derivedAnnotation(transform(annot.tree)(using ctx.withOwner(tree.symbol)))

compiler/src/dotty/tools/dotc/transform/Splicing.scala

@@ -94,6 +94,9 @@ class Splicing extends MacroTransform {
         if fn.symbol == defn.QuotedRuntime_exprQuote =>
           val quoteTransformer = new QuoteTransformer
           quoteTransformer.transform(tree)
+        case TypeApply(_, _) if tree.symbol == defn.QuotedTypeModule_of =>
+          val quoteTransformer = new QuoteTransformer
+          quoteTransformer.transform(tree)
         case _ =>
           super.transform(tree)
   end MyTransformer
@@ -108,6 +111,11 @@ class Splicing extends MacroTransform {
           val newSplicedCode1 = spliceTransformer.transformSplice(splicedCode, tree.tpe)
           val newSplicedCode2 = MyTransformer.transform(newSplicedCode1)
           newSplicedCode2
+        case tree: TypeDef if tree.symbol.hasAnnotation(defn.QuotedRuntime_SplicedTypeAnnot) =>
+          val tp @ TypeRef(qual: TermRef, _) = tree.rhs.tpe.hiBound
+          quotedDefs += tree.symbol
+          holeIdx += 1
+          cpy.TypeDef(tree)(rhs = Hole(false, holeIdx, Nil, ref(qual), TypeTree(tp)).withType(tp))
         case tree: DefTree =>
           quotedDefs += tree.symbol
           transformAnnotations(tree)