Drop tasty reflect given imports

nicolasstucki · cheeseng · commit a205c40fc6e1 · 2020-05-08T16:39:16.000+08:00
diff --git a/common-test.dotty/src/main/scala/org/scalatest/LineNumberHelper.scala b/common-test.dotty/src/main/scala/org/scalatest/LineNumberHelper.scala
@@ -9,7 +9,7 @@ private[scalatest] trait LineNumberHelper {
 
 object LineNumberMacro {
   def thisLineNumberImpl(implicit qctx: QuoteContext): Expr[Int] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
     Expr(rootPosition.startLine)
   }
 }
diff --git a/project/GenAnyVals.scala b/project/GenAnyVals.scala
@@ -32,7 +32,7 @@ object GenAnyVals {
              |  def apply(value: Expr[$primitiveTypeName])(implicit qctx: QuoteContext): Expr[$typeName] = {
              |    val notValidMsg = Resources.notValid$typeName
              |    val notLiteralMsg = Resources.notLiteral$typeName
-             |    import qctx.tasty.{_, given _}
+             |    import qctx.tasty._
              |    ensureValid${primitiveTypeName}Literal(value, notValidMsg, notLiteralMsg)(isValid)
              |    '{ $typeName.ensuringValid($$value) }
              |  }
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/BooleanMacro.scala b/scalactic.dotty/src/main/scala/org/scalactic/BooleanMacro.scala
@@ -38,7 +38,7 @@ object BooleanMacro {
       "exists") ++ logicOperators
 
   def parse(condition: Expr[Boolean], prettifier: Expr[Prettifier])(implicit qctx: QuoteContext): Expr[Bool] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
     import util._
 
     def exprStr: String = condition.show
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/Requirements.scala b/scalactic.dotty/src/main/scala/org/scalactic/Requirements.scala
@@ -231,7 +231,7 @@ object RequirementsMacro {
    * @return transformed expression that performs the requirement check and throw <code>IllegalArgumentException</code> with rich error message if requirement failed
    */
   def require(condition: Expr[Boolean], prettifier: Expr[Prettifier], clue: Expr[Any])(implicit qctx: QuoteContext): Expr[Unit] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val bool = BooleanMacro.parse(condition, prettifier)
     '{ Requirements.requirementsHelper.macroRequire($bool, $clue) }
@@ -245,7 +245,7 @@ object RequirementsMacro {
    * @return transformed expression that performs the requirement check and throw <code>IllegalStateException</code> with rich error message if requirement failed
    */
   def requireState(condition: Expr[Boolean], prettifier: Expr[Prettifier], clue: Expr[Any])(implicit qctx: QuoteContext): Expr[Unit] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val bool = BooleanMacro.parse(condition, prettifier)
     '{ Requirements.requirementsHelper.macroRequireState($bool, $clue) }
@@ -259,7 +259,7 @@ object RequirementsMacro {
    * @return transformed expression that performs the requirement check and throw <code>NullArgumentException</code> with rich error message if requirement failed
    */
   def requireNonNull(arguments: Expr[Seq[Any]], prettifier: Expr[Prettifier], pos: Expr[source.Position])(implicit qctx: QuoteContext): Expr[Unit] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     def liftSeq(args: Seq[Expr[String]]): Expr[Seq[String]] = args match {
       case x :: xs  => '{ ($x) +: ${ liftSeq(xs) }  }
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/Snapshots.scala b/scalactic.dotty/src/main/scala/org/scalactic/Snapshots.scala
@@ -221,7 +221,7 @@ object Snapshots extends Snapshots
 object SnapshotsMacro {
 
   def snap(expressions: Expr[Seq[Any]])(implicit qctx: QuoteContext): Expr[SnapshotSeq] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     def liftSeq(args: Seq[Expr[Snapshot]]): Expr[Seq[Snapshot]] = args match {
       case x :: xs  => '{ ($x) +: ${ liftSeq(xs) }  }
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/anyvals/CompileTimeAssertions.scala b/scalactic.dotty/src/main/scala/org/scalactic/anyvals/CompileTimeAssertions.scala
@@ -201,7 +201,7 @@ trait CompileTimeAssertions {
    * @param isValid a function used to validate a literal value parsed from the given expression
    */
   def ensureValidIntLiteral(value: Expr[Int], notValidMsg: String, notLiteralMsg: String)(isValid: Int => Boolean)(implicit qctx: QuoteContext): Unit = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     value.unseal.underlyingArgument match {
       case Literal(intConst) =>
@@ -236,7 +236,7 @@ trait CompileTimeAssertions {
    * @param isValid a function used to validate a literal value parsed from the given expression
    */
   def ensureValidLongLiteral(value: Expr[Long], notValidMsg: String, notLiteralMsg: String)(isValid: Long => Boolean)(implicit qctx: QuoteContext): Unit = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     value.unseal.underlyingArgument match {
       case Literal(longConst) =>
@@ -271,7 +271,7 @@ trait CompileTimeAssertions {
    * @param isValid a function used to validate a literal value parsed from the given expression
    */
   def ensureValidFloatLiteral(value: Expr[Float], notValidMsg: String, notLiteralMsg: String)(isValid: Float => Boolean)(implicit qctx: QuoteContext): Unit = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     value.unseal.underlyingArgument match {
       case Literal(floatConst) =>
@@ -306,7 +306,7 @@ trait CompileTimeAssertions {
    * @param isValid a function used to validate a literal value parsed from the given expression
    */
   def ensureValidDoubleLiteral(value: Expr[Double], notValidMsg: String, notLiteralMsg: String)(isValid: Double => Boolean)(implicit qctx: QuoteContext): Unit = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     value.unseal.underlyingArgument match {
       case Literal(doubleConst) =>
@@ -341,7 +341,7 @@ trait CompileTimeAssertions {
    * @param isValid a function used to validate a literal value parsed from the given expression
    */
   def ensureValidStringLiteral(value: Expr[String], notValidMsg: String, notLiteralMsg: String)(isValid: String => Boolean)(implicit qctx: QuoteContext): Unit = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     value.unseal.underlyingArgument match {
       case Literal(stringConst) =>
@@ -376,7 +376,7 @@ trait CompileTimeAssertions {
    * @param isValid a function used to validate a literal value parsed from the given expression
    */
   def ensureValidCharLiteral(value: Expr[Char], notValidMsg: String, notLiteralMsg: String)(isValid: Char => Boolean)(implicit qctx: QuoteContext): Unit = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     value.unseal.underlyingArgument match {
       case Literal(charConst) =>
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/anyvals/NumericStringMacro.scala b/scalactic.dotty/src/main/scala/org/scalactic/anyvals/NumericStringMacro.scala
@@ -25,7 +25,7 @@ object NumericStringMacro {
   def isValid(s: String): Boolean = s.forall(c => c >= '0' && c <= '9')
 
   def apply(value: Expr[String])(implicit qctx: QuoteContext): Expr[NumericString] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val notValidMsg =
       "NumericString.apply can only be invoked on String literals that contain numeric characters, i.e., decimal digits '0' through '9', " +
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/anyvals/PercentageIntMacros.scala b/scalactic.dotty/src/main/scala/org/scalactic/anyvals/PercentageIntMacros.scala
@@ -24,7 +24,7 @@ object PercentageIntMacro {
   def isValid(i: Int): Boolean = i >= 0 && i <= 100
 
   def apply(value: Expr[Int])(implicit qctx: QuoteContext): Expr[PercentageInt] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val notValidMsg =
       "PercentageInt.apply can only be invoked on Int literals between 0 and 100, "+
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/anyvals/RegexStringMacro.scala b/scalactic.dotty/src/main/scala/org/scalactic/anyvals/RegexStringMacro.scala
@@ -43,7 +43,7 @@ object RegexStringMacro {
     }
 
   def apply(value: Expr[String])(implicit qctx: QuoteContext): Expr[RegexString] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val notValidExceptionMsg: String = {
       value.unseal match {
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/source/Position.scala b/scalactic.dotty/src/main/scala/org/scalactic/source/Position.scala
@@ -67,7 +67,7 @@ object Position {
    * Helper method for Position macro.
    */
   private def genPosition(implicit qctx: QuoteContext): Expr[Position] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val file = rootPosition.sourceFile
     val fileName: String = file.jpath.getFileName.toString
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/source/TypeInfoMacro.scala b/scalactic.dotty/src/main/scala/org/scalactic/source/TypeInfoMacro.scala
@@ -26,7 +26,7 @@ object TypeInfoMacro {
     * Helper method for TypeInfo macro.
     */
   def genTypeInfo[T](tp: Type[T])(implicit qctx: QuoteContext): Expr[TypeInfo[T]] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val name = Expr(tp.show)
     '{ TypeInfo[$tp]($name) }
diff --git a/scalatest.dotty/src/main/scala/org/scalatest/AssertionsMacro.scala b/scalatest.dotty/src/main/scala/org/scalatest/AssertionsMacro.scala
@@ -49,7 +49,7 @@ object AssertionsMacro {
   )
   (implicit qctx: QuoteContext): Expr[Assertion] = {
 
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val bool = BooleanMacro.parse(condition, prettifier)
     '{ ($helper)($bool, $clue, $pos) }
diff --git a/scalatest.dotty/src/main/scala/org/scalatest/CompileMacro.scala b/scalatest.dotty/src/main/scala/org/scalatest/CompileMacro.scala
@@ -25,7 +25,7 @@ object CompileMacro {
 
   // parse and type check a code snippet, generate code to throw TestFailedException when type check passes or parse error
   def assertTypeErrorImpl(code: Expr[String], typeChecked: Expr[Boolean], pos: Expr[source.Position])(implicit qctx: QuoteContext): Expr[Assertion] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     if (!typeChecked.value) '{ Succeeded }
     else '{
@@ -35,7 +35,7 @@ object CompileMacro {
   }
 
   def expectTypeErrorImpl(code: Expr[String], typeChecked: Expr[Boolean], prettifier: Expr[Prettifier], pos: Expr[source.Position])(implicit qctx: QuoteContext): Expr[Fact] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     if (typeChecked.value)
       '{
@@ -70,7 +70,7 @@ object CompileMacro {
 
   // parse and type check a code snippet, generate code to throw TestFailedException when both parse and type check succeeded
   def assertDoesNotCompileImpl(code: Expr[String], typeChecked: Expr[Boolean], pos: Expr[source.Position])(implicit qctx: QuoteContext): Expr[Assertion] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     if (!typeChecked.value) '{ Succeeded }
     else '{
@@ -81,7 +81,7 @@ object CompileMacro {
 
   // parse and type check a code snippet, generate code to return Fact (Yes or No).
   def expectDoesNotCompileImpl(code: Expr[String], typeChecked: Expr[Boolean], prettifier: Expr[Prettifier], pos: Expr[source.Position])(implicit qctx: QuoteContext): Expr[Fact] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     if (typeChecked.value)
       '{
@@ -116,7 +116,7 @@ object CompileMacro {
 
   // parse and type check a code snippet, generate code to throw TestFailedException when either parse or type check fails.
   def assertCompilesImpl(code: Expr[String], typeChecked: Expr[Boolean], pos: Expr[source.Position])(implicit qctx: QuoteContext): Expr[Assertion] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     if (typeChecked.value) '{ Succeeded }
     else '{
@@ -126,7 +126,7 @@ object CompileMacro {
   }
 
   def expectCompilesImpl(code: Expr[String], typeChecked: Expr[Boolean], prettifier: Expr[Prettifier], pos: Expr[source.Position])(implicit qctx: QuoteContext): Expr[Fact] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     if (typeChecked.value)
       '{
@@ -161,7 +161,7 @@ object CompileMacro {
 
   // check that a code snippet does not compile
   def assertNotCompileImpl[T](self: Expr[T], compileWord: Expr[CompileWord], pos: Expr[source.Position])(shouldOrMust: String)(implicit qctx: QuoteContext): Expr[Assertion] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     // parse and type check a code snippet, generate code to throw TestFailedException if both parse and type check succeeded
     def checkNotCompile(code: String): Expr[Assertion] =
@@ -212,7 +212,7 @@ object CompileMacro {
 
   // check that a code snippet does not compile
   def assertNotTypeCheckImpl(self: Expr[Matchers#AnyShouldWrapper[_]], typeCheckWord: Expr[TypeCheckWord], pos: Expr[source.Position])(shouldOrMust: String)(implicit qctx: QuoteContext): Expr[Assertion] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     // parse and type check a code snippet, generate code to throw TestFailedException if both parse and type check succeeded
     def checkNotTypeCheck(code: String): Expr[Assertion] =
@@ -265,7 +265,7 @@ object CompileMacro {
 
   // check that a code snippet compiles
   def assertCompileImpl[T](self: Expr[T], compileWord: Expr[CompileWord], pos: Expr[source.Position])(shouldOrMust: String)(implicit qctx: QuoteContext): Expr[Assertion] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     // parse and type check a code snippet, generate code to throw TestFailedException if both parse and type check succeeded
     def checkCompile(code: String): Expr[Assertion] =
diff --git a/scalatest.dotty/src/main/scala/org/scalatest/DiagrammedAssertionsMacro.scala b/scalatest.dotty/src/main/scala/org/scalatest/DiagrammedAssertionsMacro.scala
@@ -30,7 +30,7 @@ object DiagrammedAssertionsMacro {
     condition: Expr[Boolean], clue: Expr[Any],
     prettifier: Expr[Prettifier],
     pos: Expr[source.Position])(implicit qctx: QuoteContext): Expr[Assertion] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val startLine = rootPosition.startLine // Get the expression first line number
     val endLine = rootPosition.endLine // Get the expression last line number
diff --git a/scalatest.dotty/src/main/scala/org/scalatest/diagrams/DiagramsMacro.scala b/scalatest.dotty/src/main/scala/org/scalatest/diagrams/DiagramsMacro.scala
@@ -24,7 +24,7 @@ object DiagramsMacro {
   // Transform the input expression by parsing out the anchor and generate expression that can support diagram rendering
   def parse(qctx: QuoteContext)(expr: qctx.tasty.Term): qctx.tasty.Term = {
     implicit val qctx2: qctx.type = qctx // TODO qctx should be given
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
     import util._
 
     type R
@@ -225,7 +225,7 @@ object DiagramsMacro {
     helper: Expr[(DiagrammedExpr[Boolean], Any, String, source.Position) => Assertion],
     condition: Expr[Boolean], pos: Expr[source.Position], clue: Expr[Any], sourceText: String
   )(implicit qctx: QuoteContext): Expr[Assertion] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
     val diagExpr = parse(qctx)(condition.unseal.underlyingArgument).seal.cast[DiagrammedExpr[Boolean]]
     '{ $helper($diagExpr, $clue, ${Expr(sourceText)}, $pos) }
   }
diff --git a/scalatest.dotty/src/main/scala/org/scalatest/expectations/ExpectationsMacro.scala b/scalatest.dotty/src/main/scala/org/scalatest/expectations/ExpectationsMacro.scala
@@ -25,7 +25,7 @@ import org.scalatest.Fact
 object ExpectationsMacro {
 
   def expect(condition: Expr[Boolean])(prettifier: Expr[Prettifier], pos: Expr[source.Position])(implicit qctx: QuoteContext): Expr[Fact] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val bool = BooleanMacro.parse(condition, prettifier)
     '{ Expectations.expectationsHelper.macroExpect($bool, "", $prettifier, $pos) }
diff --git a/scalatest.dotty/src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala b/scalatest.dotty/src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala
@@ -71,14 +71,14 @@ private[scalatest] object MatchPatternMacro {
   }
 
   def andNotMatchPatternMatcher[T:Type](self: Expr[Matcher[T]#AndNotWord], right: Expr[PartialFunction[Any, _]])(implicit qctx: QuoteContext): Expr[Matcher[T]] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val notMatcher = '{ MatchPatternHelper.notMatchPatternMatcher($right) }
     '{ ($self).owner.and($notMatcher) }
   }
 
   def orNotMatchPatternMatcher[T:Type](self: Expr[Matcher[T]#OrNotWord], right: Expr[PartialFunction[Any, _]])(implicit qctx: QuoteContext): Expr[Matcher[T]] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
 
     val notMatcher = '{ MatchPatternHelper.notMatchPatternMatcher($right) }
     '{ ($self).owner.or($notMatcher) }
diff --git a/scalatest.dotty/src/main/scala/org/scalatest/matchers/TypeMatcherMacro.scala b/scalatest.dotty/src/main/scala/org/scalatest/matchers/TypeMatcherMacro.scala

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ private[scalatest] trait LineNumberHelper {`
`9`	`9`
`10`	`10`	`object LineNumberMacro {`
`11`	`11`	`def thisLineNumberImpl(implicit qctx: QuoteContext): Expr[Int] = {`
`12`		`- import qctx.tasty.{_, given _}`
	`12`	`+ import qctx.tasty._`
`13`	`13`	`Expr(rootPosition.startLine)`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ object RegexStringMacro {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`def apply(value: Expr[String])(implicit qctx: QuoteContext): Expr[RegexString] = {`
`46`		`- import qctx.tasty.{_, given _}`
	`46`	`+ import qctx.tasty._`
`47`	`47`
`48`	`48`	`val notValidExceptionMsg: String = {`
`49`	`49`	`value.unseal match {`