SI-7789 make quasiquotes deconstruct UnApply trees

1 files changed, 5 insertions, 3 deletions

diff --git a/src/reflect/scala/reflect/internal/BuildUtils.scala b/src/reflect/scala/reflect/internal/BuildUtils.scala
index b9458e4b09..6f2cb239c5 100644
--- a/src/reflect/scala/reflect/internal/BuildUtils.scala
+++ b/src/reflect/scala/reflect/internal/BuildUtils.scala
@@ -163,9 +163,11 @@ trait BuildUtils { self: SymbolTable =>
       def apply(tree: Tree, argss: List[List[Tree]]): Tree =
         argss.foldLeft(tree) { (f, args) => Apply(f, args.map(treeInfo.assignmentToMaybeNamedArg)) }
 
-      def unapply(tree: Tree): Some[(Tree, List[List[Tree]])] = {
-        val treeInfo.Applied(fun, targs, argss) = tree
-        Some((SyntacticTypeApplied(fun, targs), argss))
+      def unapply(tree: Tree): Some[(Tree, List[List[Tree]])] = tree match {
+        case UnApply(treeInfo.Unapplied(Select(fun, nme.unapply)), pats) =>
+          Some((fun, pats :: Nil))
+        case treeInfo.Applied(fun, targs, argss) =>
+          Some((SyntacticTypeApplied(fun, targs), argss))
       }
     }