Fix #8100: Handle explicit paths in quotes

Author: nicolasstucki

compiler/src/dotty/tools/dotc/tastyreflect/ReflectionCompilerInterface.scala

@@ -1204,7 +1204,7 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
       case tpe: Types.ConstantType => Some(tpe)
       case _ => None
   }
-  
+
   def ConstantType_apply(const: Constant)(given Context): ConstantType =
     Types.ConstantType(const)
 

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

@@ -9,6 +9,7 @@ import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.quoted._
+import dotty.tools.dotc.core.Mode
 import dotty.tools.dotc.core.NameKinds._
 import dotty.tools.dotc.core.StagingContext._
 import dotty.tools.dotc.core.StdNames._
@@ -49,7 +50,10 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
           case annot => transform(annot.tree)(given annotCtx)
         }
         checkLevel(super.transform(tree))
-      case _ => checkLevel(super.transform(tree))
+      case _ =>
+        val ctx1 = if tree.isType then ctx.addMode(Mode.Type) else ctx
+        given Context = ctx1
+        checkLevel(super.transform(tree))
     }
 
   /** Transform quoted trees while maintaining phase correctness */
@@ -100,7 +104,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
             case Some(tpRef) => tpRef
             case _ => tree
           }
-      case _: TypeTree | _: AppliedTypeTree | _: Apply | _: TypeApply | _: UnApply | Select(_, OuterSelectName(_, _)) =>
+      case _: TypeTree | _: AppliedTypeTree | _: Apply | _: UnApply | Select(_, OuterSelectName(_, _)) =>
         tree.withType(checkTp(tree.tpe))
       case _: ValOrDefDef | _: Bind =>
         tree.symbol.info = checkTp(tree.symbol.info)
@@ -179,6 +183,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
         case tp: TypeRef =>
           if levelOf(sym).getOrElse(0) < level then tryHeal(sym, tp, pos)
           else None
+        case _: TermRef if ctx.mode.is(Mode.Type) && levelOf(sym).getOrElse(0) >= level => None
         case _ =>
           levelError(sym, tp, pos, "")
     else if (!sym.owner.isStaticOwner) // non-top level class reference that is phase inconsistent

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

@@ -231,8 +231,7 @@ class ReifyQuotes extends MacroTransform {
           if (isType) ref(defn.Unpickler_unpickleType).appliedToType(originalTp)
           else ref(defn.Unpickler_unpickleExpr).appliedToType(originalTp.widen)
         val spliceResType =
-          if (isType) defn.QuotedTypeClass.typeRef.appliedTo(WildcardType)
-          else defn.FunctionType(1, isContextual = true).appliedTo(defn.QuoteContextClass.typeRef, defn.QuotedExprClass.typeRef.appliedTo(defn.AnyType)) | defn.QuotedTypeClass.typeRef.appliedTo(WildcardType)
+          defn.FunctionType(1, isContextual = true).appliedTo(defn.QuoteContextClass.typeRef, defn.QuotedExprClass.typeRef.appliedTo(defn.AnyType)) | defn.QuotedTypeClass.typeRef.appliedTo(WildcardType)
         val pickledQuoteStrings = liftList(PickledQuotes.pickleQuote(body).map(x => Literal(Constant(x))), defn.StringType)
         val splicesList = liftList(splices, defn.FunctionType(1).appliedTo(defn.SeqType.appliedTo(defn.AnyType), spliceResType))
         meth.appliedTo(pickledQuoteStrings, splicesList)

library/src/scala/internal/quoted/Unpickler.scala

@@ -7,7 +7,7 @@ object Unpickler {
 
   type PickledQuote = List[String]
   type PickledExprArgs = Seq[Seq[Any] => (((given QuoteContext) => Expr[Any]) | Type[_])]
-  type PickledTypeArgs = Seq[Seq[Any] => Type[_]]
+  type PickledTypeArgs = Seq[Seq[Any] => (((given QuoteContext) => Expr[Any]) | Type[_])]
 
   /** Unpickle `repr` which represents a pickled `Expr` tree,
    *  replacing splice nodes with `args`

tests/neg/i8100.scala

@@ -0,0 +1,21 @@
+
+import scala.quoted._
+import scala.quoted.matching._
+
+class M {
+  type E
+}
+
+def f[T: Type] with QuoteContext =
+  summonExpr[M] match
+    case Some('{ $mm : $tt }) =>
+      '{
+        val m = $mm
+        ${ val b: m.type =
+          m // error
+          ???
+        }
+      }
+
+
+def g[T] with Type[T] = ???

tests/pos/i8100.scala

@@ -0,0 +1,25 @@
+
+import scala.quoted._
+import scala.quoted.matching._
+
+class M {
+  type E
+}
+
+def f with QuoteContext : Expr[Any] =
+  val mm: Expr[M] = ???
+  '{
+    val m: M = $mm
+    type ME = m.E
+    ${ g[ME](given '[ME]) }
+    ${ g[m.E](given '[ME]) }
+    ${ g[ME](given '[m.E]) }
+    ${ g[m.E](given '[m.E]) }
+    // ${ g[ME] } // FIXME
+    // ${ g[m.E] } // FIXME
+    ${ g(given '[ME]) }
+    ${ g(given '[m.E]) }
+  }
+
+
+def g[T] with Type[T] = ???