Merge pull request #285 from sjrd/fix-read-type-bindings-tree

Fix #284: Read BLOCK's in TypeTree position as TypeBindingsTree.
scalacenter · Apr 17, 2023 · 4497b2a · 4497b2a
2 parents c5704a7 + 565cc83
commit 4497b2a
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 0 deletions.
diff --git a/tasty-query/shared/src/main/scala/tastyquery/Trees.scala b/tasty-query/shared/src/main/scala/tastyquery/Trees.scala
@@ -68,6 +68,7 @@ object Trees {
       case TypeTreeBind(name, body, symbol)               => body :: Nil
       case WildcardTypeBoundsTree(bounds)                 => bounds :: Nil
       case TypeLambdaTree(tparams, body)                  => tparams ::: body :: Nil
+      case TypeBindingsTree(bindings, body)               => bindings ::: body :: Nil
 
       case InferredTypeBoundsTree(bounds)               => Nil
       case ExplicitTypeBoundsTree(low, high)            => low :: high :: Nil
@@ -795,6 +796,12 @@ object Trees {
     override final def withSpan(span: Span): TypeLambdaTree = TypeLambdaTree(tparams, body)(span)
   }
 
+  final case class TypeBindingsTree(bindings: List[TypeMember], body: TypeTree)(span: Span) extends TypeTree(span):
+    override protected def calculateType(using Context): Type = body.toType
+
+    override def withSpan(span: Span): TypeBindingsTree = TypeBindingsTree(bindings, body)(span)
+  end TypeBindingsTree
+
   // --- TypeDefinitionTrees and TypeBoundsTrees ------------------------------
 
   sealed abstract class TypeDefinitionTree(span: Span) extends Tree(span):

diff --git a/tasty-query/shared/src/main/scala/tastyquery/reader/tasties/TreeUnpickler.scala b/tasty-query/shared/src/main/scala/tastyquery/reader/tasties/TreeUnpickler.scala
@@ -1367,6 +1367,14 @@ private[tasties] class TreeUnpickler(
       val spn = span
       reader.readByte()
       ByNameTypeTree(readTypeTree)(spn)
+    case BLOCK =>
+      // #284 See QuotesAndSplices.typeQuoteMatching
+      val spn = span
+      reader.readByte()
+      val end = reader.readEnd()
+      val body = readTypeTree
+      val bindings = readStats(end).map(_.asInstanceOf[TypeMember])
+      TypeBindingsTree(bindings, body)(spn)
     case SHAREDterm =>
       val spn = span
       reader.readByte()

diff --git a/tasty-query/shared/src/test/scala/tastyquery/ReadTreeSuite.scala b/tasty-query/shared/src/test/scala/tastyquery/ReadTreeSuite.scala
@@ -2290,4 +2290,26 @@ class ReadTreeSuite extends RestrictedUnpicklingSuite {
     }
     assert(containsSubtree(abstractVarCheck)(clue(tree)))
   }
+
+  testUnpickle("quotes-and-splices", "simple_trees.QuotesAndSplices$") { tree =>
+    val typeQuoteMatchingDef = findTree(tree) { case dd @ DefDef(SimpleName("typeQuoteMatching"), _, _, _, _) =>
+      dd
+    }
+    val typeQuoteMatchingCaseDef = findTree(typeQuoteMatchingDef) { case cd: CaseDef =>
+      cd
+    }
+    val typeQuoteMatchingCheck: StructureCheck = {
+      case TypeBindingsTree(
+            List(
+              TypeMember(SimpleTypeName("t"), InferredTypeBoundsTree(_), tSym),
+              TypeMember(SimpleTypeName("u"), InferredTypeBoundsTree(_), uSym)
+            ),
+            AppliedTypeTree(
+              TypeIdent(SimpleTypeName("Map")),
+              List(TypeWrapper(TypeRefInternal(NoPrefix, tSymRef)), TypeWrapper(TypeRefInternal(NoPrefix, uSymRef)))
+            )
+          ) if tSymRef == tSym && uSymRef == uSym && tSym != uSym =>
+    }
+    assert(containsSubtree(typeQuoteMatchingCheck)(clue(typeQuoteMatchingCaseDef)))
+  }
 }
diff --git a/test-sources/src/main/scala/simple_trees/QuotesAndSplices.scala b/test-sources/src/main/scala/simple_trees/QuotesAndSplices.scala
@@ -0,0 +1,9 @@
+package simple_trees
+
+import scala.quoted.*
+
+object QuotesAndSplices:
+  def typeQuoteMatching(using quotes: Quotes): Expr[Unit] =
+    Type.of[Any] match
+      case '[Map[t, u]] => '{ () }
+end QuotesAndSplices