Fix captured references to singleton types

When we had a reference to a `x.type` we mistakenly captured `x` instead
of `x.type`. This was caused because `SingletonTypeTree` was not handled
in `Splicing`. Fixing this uncovered some inconsistencies with the types
in the encoding of the hole captured types and contents.

Author: nicolasstucki

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

@@ -209,7 +209,7 @@ class Splicing extends MacroTransform:
                 // Dealias references to captured types
                 TypeTree(tree.tpe.dealias)
             else super.transform(tree)
-        case tree: TypeTree =>
+        case _: TypeTree | _: SingletonTypeTree =>
           if containsCapturedType(tree.tpe) && level >= 1 then getTagRefFor(tree)
           else tree
         case tree @ Assign(lhs: RefTree, rhs) =>
@@ -314,10 +314,7 @@ class Splicing extends MacroTransform:
       )
 
     private def capturedType(tree: Tree)(using Context): Symbol =
-      val tpe = tree.tpe.widenTermRefExpr
-      val bindingSym = refBindingMap
-        .getOrElseUpdate(tree.symbol, (TypeTree(tree.tpe), newQuotedTypeClassBinding(tpe)))._2
-      bindingSym
+      refBindingMap.getOrElseUpdate(tree.symbol, (TypeTree(tree.tpe), newQuotedTypeClassBinding(tree.tpe)))._2
 
     private def capturedPartTypes(quote: Quote)(using Context): Tree =
       val (tags, body1) = inContextWithQuoteTypeTags {

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

@@ -727,7 +727,7 @@ object TreeChecker {
       // Check that we only add the captured type `T` instead of a more complex type like `List[T]`.
       // If we have `F[T]` with captured `F` and `T`, we should list `F` and `T` separately in the args.
       for arg <- args do
-        assert(arg.isTerm || arg.tpe.isInstanceOf[TypeRef], "Expected TypeRef in Hole type args but got: " + arg.tpe)
+        assert(arg.isTerm || arg.tpe.isInstanceOf[TypeRef] || arg.tpe.isInstanceOf[TermRef] || arg.tpe.isInstanceOf[ThisType], "Expected TypeRef in Hole type args but got: " + arg.tpe)
 
       // Check result type of the hole
       if isTerm then assert(tree1.typeOpt <:< pt)
@@ -743,7 +743,7 @@ object TreeChecker {
               defn.AnyType
             case tpe => tpe
           defn.QuotedExprClass.typeRef.appliedTo(tpe)
-        else defn.QuotedTypeClass.typeRef.appliedTo(arg.typeOpt.widenTermRefExpr)
+        else defn.QuotedTypeClass.typeRef.appliedTo(arg.typeOpt)
       }
       val expectedResultType =
         if isTerm then defn.QuotedExprClass.typeRef.appliedTo(tree1.typeOpt)

tests/pos-macros/i17103c/Macro_1.scala

@@ -0,0 +1,16 @@
+import scala.quoted.*
+
+inline def test = ${ testExpr }
+
+def testExpr(using Quotes): Expr[Unit] =
+  '{
+    trait C
+    val c: C = ???
+    ${
+      val expr = '{
+        val cRef: c.type = ???
+        ()
+      }
+      expr
+    }
+  }

tests/pos-macros/i17103c/Test_2.scala

@@ -0,0 +1 @@
+def Test = test

tests/pos-macros/this-type-capture/Macro_1.scala

@@ -0,0 +1,28 @@
+import scala.quoted.*
+
+object Macro:
+  inline def generateCode: Unit = ${ testThisPaths }
+
+  def testThisPaths(using Quotes): Expr[Unit] =
+    '{
+      trait E extends G:
+        type V
+        val f: F
+        ${
+          val expr = '{
+            // val _: Any = this // FIXME: this should work
+            // val _: Any = f // FIXME: this should work
+            // val _: this.type = ??? // FIXME: this should work
+            val _: V = ???
+            val _: this.V = ???
+            val _: this.f.V = ???
+            val _: this.f.type = ???
+          }
+          expr
+        }
+      trait F:
+        type V
+    }
+
+trait G:
+  val f: Any

tests/pos-macros/this-type-capture/Test_2.scala

@@ -0,0 +1 @@
+@main def test = Macro.generateCode