SI-8331 make sure type select & applied type doesn't match terms

Due to tree re-use it used to be the fact that type quasiquotes could
match term trees. This commit makes sure selections and applied type and
type applied are all non-overlapping between q and tq.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala b/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala
index 5eae3b6e6f..ebb59f98fd 100644
--- a/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala
+++ b/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala
@@ -185,6 +185,8 @@ trait Reifiers { self: Quasiquotes =>
         reifyBuildCall(nme.SyntacticApplied, fun, argss)
       case SyntacticTypeApplied(fun, targs) if targs.nonEmpty =>
         reifyBuildCall(nme.SyntacticTypeApplied, fun, targs)
+      case SyntacticAppliedType(tpt, targs) if targs.nonEmpty =>
+        reifyBuildCall(nme.SyntacticAppliedType, tpt, targs)
       case SyntacticFunction(args, body) =>
         reifyBuildCall(nme.SyntacticFunction, args, body)
       case SyntacticIdent(name, isBackquoted) =>
@@ -215,6 +217,11 @@ trait Reifiers { self: Quasiquotes =>
       // correctness of the trees produced by quasiquotes
       case Select(id @ Ident(nme.scala_), name) if id.symbol == ScalaPackage =>
         reifyBuildCall(nme.ScalaDot, name)
+      case Select(qual, name) =>
+        if (name.isTypeName)
+          reifyBuildCall(nme.SyntacticSelectType, qual, name)
+        else
+          reifyBuildCall(nme.SyntacticSelectTerm, qual, name)
       case _ =>
         super.reifyTreeSyntactically(tree)
     }