Handle splices within annotated types

Author: nicolasstucki

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

@@ -136,6 +136,8 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
         case tp: ThisType =>
           assert(checkSymLevel(tp.cls, tp, pos).isEmpty)
           mapOver(tp)
+        case tp: AnnotatedType =>
+          derivedAnnotatedType(tp, apply(tp.parent), tp.annot)
         case _ =>
           mapOver(tp)
       }

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

@@ -78,7 +78,7 @@ class Pickler extends Phase {
         pickled.iterator.grouped(10).toList.zipWithIndex.map {
           case (row, i) => s"${i}0: ${row.mkString(" ")}"
         }
-        
+
       // println(i"rawBytes = \n$rawBytes%\n%") // DEBUG
       if (pickling ne noPrinter) {
         println(i"**** pickled info of $cls")

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

@@ -157,6 +157,8 @@ class ReifyQuotes extends MacroTransform {
                 val tagDef = tagDefCache.getOrElseUpdate(prefix.symbol, mkTagSymbolAndAssignType(prefix))
                 tagDef.symbol.typeRef
             }
+          case AnnotatedType(parent, _) =>
+            apply(parent) // Only keep the Annotated tree
           case _ =>
             mapOver(tp)
         }

tests/pos/i7519b.scala

@@ -0,0 +1,13 @@
+import scala.quoted._
+import scala.annotation.StaticAnnotation
+
+class Annot(in: Int) extends StaticAnnotation
+
+class Quoted[T]
+
+inline def quote[T]: Quoted[T] = ${ quoteImpl[T] }
+
+def quoteImpl[T: Type](given qctx: QuoteContext): Expr[Quoted[T]] = {
+  val value: Expr[Int] = '{ 42 }
+  '{ new Quoted[T @Annot($value)] }
+}

tests/run-macros/i7519c.check

@@ -0,0 +1 @@
+new Quoted[scala.Int @Annot(42)]()

tests/run-macros/i7519c/Macro_1.scala

@@ -0,0 +1,13 @@
+import scala.quoted._
+import scala.annotation.StaticAnnotation
+
+class Annot(in: Int) extends StaticAnnotation
+
+class Quoted[T]
+
+inline def quote[T]: String = ${ quoteImpl[T] }
+
+def quoteImpl[T: Type](given qctx: QuoteContext): Expr[String] = {
+  val value: Expr[Int] = '{ 42 }
+  Expr(('{ new Quoted[T @Annot($value)] }).show)
+}

tests/run-macros/i7519c/Test_2.scala

@@ -0,0 +1,5 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    println(quote[Int])
+  }
+}