Fix inline macros at level 0 within a splice and quote

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -1313,10 +1313,6 @@ object desugar {
     val desugared = tree match {
       case SymbolLit(str) =>
         Literal(Constant(scala.Symbol(str)))
-      case Splice(expr) => // TODO move to typer and track level
-        Select(expr, nme.splice)
-      case TypSplice(expr) => // TODO move to typer and track level
-        Select(expr, tpnme.splice)
       case InterpolatedString(id, segments) =>
         val strs = segments map {
           case ts: Thicket => ts.trees.head

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1960,14 +1960,26 @@ class Typer extends Namer
     }
   }
 
-  /** Translate `'(expr)`/`'{ expr* }` into `scala.quoted.Expr.apply(expr)` and `'[T]` into `scala.quoted.Type.apply[T]`
+  /** Translate '{ t }` into `scala.quoted.Expr.apply(t)` and `'[T]` into `scala.quoted.Type.apply[T]`
    *  while tracking the quotation level in the context.
    */
   def typedQuote(tree: untpd.Quote, pt: Type)(implicit ctx: Context): Tree = track("typedQuote") {
-    if (tree.t.isType)
-      typedTypeApply(untpd.TypeApply(untpd.ref(defn.QuotedType_applyR), List(tree.t)), pt)(TreeMapWithStages.quoteContext).withSpan(tree.span)
-    else
-      typedApply(untpd.Apply(untpd.ref(defn.QuotedExpr_applyR), tree.t), pt)(TreeMapWithStages.quoteContext).withSpan(tree.span)
+    val tree1 =
+      if (tree.t.isType)
+        typedTypeApply(untpd.TypeApply(untpd.ref(defn.QuotedType_applyR), List(tree.t)), pt)(TreeMapWithStages.quoteContext)
+      else
+        typedApply(untpd.Apply(untpd.ref(defn.QuotedExpr_applyR), tree.t), pt)(TreeMapWithStages.quoteContext)
+    tree1.withSpan(tree.span)
+  }
+
+  /** Translate `${ t: Expr[T] }` into expresiion `t.splice` while tracking the quotation level in the context */
+  def typedSplice(tree: untpd.Splice, pt: Type)(implicit ctx: Context): Tree = track("typedSplice") {
+    typedSelect(untpd.Select(tree.expr, nme.splice), pt)(TreeMapWithStages.spliceContext).withSpan(tree.span)
+  }
+
+  /** Translate ${ t: Type[T] }` into type `t.splice` while tracking the quotation level in the context */
+  def typedTypSplice(tree: untpd.TypSplice, pt: Type)(implicit ctx: Context): Tree = track("typedTypSplice") {
+    typedSelect(untpd.Select(tree.expr, tpnme.splice), pt)(TreeMapWithStages.spliceContext).withSpan(tree.span)
   }
 
   /** Retrieve symbol attached to given tree */
@@ -2061,6 +2073,8 @@ class Typer extends Namer
           case tree @ untpd.PostfixOp(qual, Ident(nme.WILDCARD)) => typedAsFunction(tree, pt)
           case untpd.EmptyTree => tpd.EmptyTree
           case tree: untpd.Quote => typedQuote(tree, pt)
+          case tree: untpd.Splice => typedSplice(tree, pt)
+          case tree: untpd.TypSplice => typedTypSplice(tree, pt)
           case _ => typedUnadapted(desugar(tree), pt, locked)
         }
 

tests/run-with-compiler/quote-macro-in-splice.check

@@ -0,0 +1,4 @@
+{
+  val y: scala.Int = 1
+  y.+(8)
+}

tests/run-with-compiler/quote-macro-in-splice/quoted_2.scala

@@ -5,16 +5,15 @@ import scala.quoted.Toolbox.Default._
 
 object Test {
   def main(args: Array[String]): Unit = {
-    // FIXME
-//    val x = '{
-//      val y = 1
-//      ${
-//        inline def a(z: Int): Int = ${ impl('z) }
-//        val b = a(7).toExpr
-//        '{ y + $b }
-//      }
-//    }
-//    println(x.show)
+    val x = '{
+      val y = 1
+      ${
+        inline def a(z: Int): Int = ${ impl('z) }
+        val b = a(7).toExpr
+        '{ y + $b }
+      }
+    }
+    println(x.show)
   }
 
 }