make q"f(..$xs)" deconstruction symmetrical to q"f[..$xs]"

3 files changed, 17 insertions, 0 deletions

diff --git a/src/reflect/scala/reflect/api/BuildUtils.scala b/src/reflect/scala/reflect/api/BuildUtils.scala
index 0dad78112b..fc5d228417 100644
--- a/src/reflect/scala/reflect/api/BuildUtils.scala
+++ b/src/reflect/scala/reflect/api/BuildUtils.scala
@@ -122,6 +122,13 @@ private[reflect] trait BuildUtils { self: Universe =>
       def unapply(tree: Tree): Some[(Tree, List[List[Tree]])]
     }
 
+    val SyntacticApply: SyntacticApplyExtractor
+
+    trait SyntacticApplyExtractor {
+      def apply(tree: Tree, args: List[Tree]): Tree
+      def unapply(tree: Tree): Some[(Tree, List[Tree])]
+    }
+
     val SyntacticClassDef: SyntacticClassDefExtractor
 
     trait SyntacticClassDefExtractor {
diff --git a/src/reflect/scala/reflect/internal/BuildUtils.scala b/src/reflect/scala/reflect/internal/BuildUtils.scala
index 3e04811f4d..28f353593a 100644
--- a/src/reflect/scala/reflect/internal/BuildUtils.scala
+++ b/src/reflect/scala/reflect/internal/BuildUtils.scala
@@ -173,6 +173,15 @@ trait BuildUtils { self: SymbolTable =>
       }
     }
 
+    object SyntacticApply extends SyntacticApplyExtractor {
+      def apply(tree: Tree, args: List[Tree]): Tree = SyntacticApplied(tree, List(args))
+
+      def unapply(tree: Tree): Some[(Tree, List[Tree])] = tree match {
+        case Apply(fun, args) => Some((fun, args))
+        case other => Some((other, Nil))
+      }
+    }
+
     private object UnCtor {
       def unapply(tree: Tree): Option[(Modifiers, List[List[ValDef]], List[Tree])] = tree match {
         case DefDef(mods, nme.MIXIN_CONSTRUCTOR, _, _, _, Block(lvdefs, _)) =>
diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala
index 5cc3f911a4..8a0e1e4768 100644
--- a/src/reflect/scala/reflect/internal/StdNames.scala
+++ b/src/reflect/scala/reflect/internal/StdNames.scala
@@ -584,6 +584,7 @@ trait StdNames {
     val Select: NameType               = "Select"
     val SelectFromTypeTree: NameType   = "SelectFromTypeTree"
     val SyntacticApplied: NameType     = "SyntacticApplied"
+    val SyntacticApply: NameType       = "SyntacticApply"
     val SyntacticAssign: NameType      = "SyntacticAssign"
     val SyntacticBlock: NameType       = "SyntacticBlock"
     val SyntacticClassDef: NameType    = "SyntacticClassDef"