Merge pull request #3452 from xeno-by/topic/palladium0

SI-8063 and its seventy friends

1 files changed, 5 insertions, 5 deletions

diff --git a/test/files/scalacheck/quasiquotes/DefinitionDeconstructionProps.scala b/test/files/scalacheck/quasiquotes/DefinitionDeconstructionProps.scala
index e2d1757d48..512b81c0e6 100644
--- a/test/files/scalacheck/quasiquotes/DefinitionDeconstructionProps.scala
+++ b/test/files/scalacheck/quasiquotes/DefinitionDeconstructionProps.scala
@@ -1,5 +1,5 @@
 import org.scalacheck._, Prop._, Gen._, Arbitrary._
-import scala.reflect.runtime.universe._, Flag._
+import scala.reflect.runtime.universe._, Flag._, internal.reificationSupport.SyntacticClassDef
 
 object DefinitionDeconstructionProps
   extends QuasiquoteProperties("definition deconstruction")
@@ -94,7 +94,7 @@ trait ClassDeconstruction { self: QuasiquoteProperties =>
   property("SI-7979") = test {
     val PARAMACCESSOR = (1 << 29).toLong.asInstanceOf[FlagSet]
     assertThrows[MatchError] {
-      val build.SyntacticClassDef(_, _, _, _, _, _, _, _, _) =
+      val SyntacticClassDef(_, _, _, _, _, _, _, _, _) =
         ClassDef(
           Modifiers(), TypeName("Foo"), List(),
           Template(
@@ -102,7 +102,7 @@ trait ClassDeconstruction { self: QuasiquoteProperties =>
             noSelfType,
             List(
               //ValDef(Modifiers(PRIVATE | LOCAL | PARAMACCESSOR), TermName("x"), Ident(TypeName("Int")), EmptyTree),
-              DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List(ValDef(Modifiers(PARAM | PARAMACCESSOR), TermName("x"),
+              DefDef(Modifiers(), termNames.CONSTRUCTOR, List(), List(List(ValDef(Modifiers(PARAM | PARAMACCESSOR), TermName("x"),
                 Ident(TypeName("Int")), EmptyTree))), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))))))
     }
   }
@@ -117,7 +117,7 @@ trait ModsDeconstruction { self: QuasiquoteProperties =>
 
   property("@$annot def foo") = forAll { (annotName: TypeName) =>
     val q"@$annot def foo" = q"@$annotName def foo"
-    annot ≈ Apply(Select(New(Ident(annotName)), nme.CONSTRUCTOR), List())
+    annot ≈ Apply(Select(New(Ident(annotName)), termNames.CONSTRUCTOR), List())
   }
 
   property("@$annot(..$args) def foo") = forAll { (annotName: TypeName, tree: Tree) =>
@@ -269,6 +269,6 @@ trait ImportDeconstruction { self: QuasiquoteProperties =>
         q"import $expr.{$plain, $oldname => $newname, $discard => _}"
 
     expr1 ≈ expr && plain11 == plain12 && plain12 == plain &&
-    oldname1 == oldname && newname1 == newname && discard1 == discard && wildcard == nme.WILDCARD
+    oldname1 == oldname && newname1 == newname && discard1 == discard && wildcard == termNames.WILDCARD
   }
 }