Merge branch 'cheeseng-feature-dotty-0.21-cherry-pick' into 3.1.x

Author: bvenners

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._
-    rootPosition.startLine.toExpr
+    import qctx.tasty.{_, given}
+    Expr(rootPosition.startLine)
   }
 }

common-test.dotty/src/main/scala/org/scalatest/SharedHelpers.scala

@@ -26,6 +26,7 @@ import scala.collection.SortedSet
 import FailureMessages.decorateToStringValue
 import java.util.concurrent.Executors
 import org.scalactic.Prettifier
+import org.scalactic.ArrayHelper.deep
 
 object SharedHelpers extends Assertions with LineNumberHelper {
 
@@ -855,7 +856,7 @@ object SharedHelpers extends Assertions with LineNumberHelper {
         case map: GenMap[_, _] => element.asInstanceOf[Tuple2[_, _]]._1
         case genTrv: GenTraversable[_] => getIndex(xs, element)
       }
-    Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) element.asInstanceOf[Array[T]].deep.toString else element.toString))
+    Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) deep(element.asInstanceOf[Array[T]]).toString else element.toString))
   }
 
   def indexLengthElement[T](itr: java.util.Iterator[String], xs: java.util.Collection[String], errorFun: String => Boolean): Array[String] = {
@@ -865,7 +866,7 @@ object SharedHelpers extends Assertions with LineNumberHelper {
         case map: java.util.Map[_, _] => element.asInstanceOf[java.util.Map.Entry[_, _]].getKey
         case genTrv: java.util.Collection[_] => getIndex(xs, element)
       }
-    Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) element.asInstanceOf[Array[T]].deep.toString else element.toString))
+    Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) deep(element.asInstanceOf[Array[T]]).toString else element.toString))
   }
 
   def indexElementLengthString[T](itr: Iterator[String], xs: GenTraversable[String], errorFun: String => Boolean): Array[String] = {

project/DottyBuild.scala

@@ -13,12 +13,11 @@ trait DottyBuild { this: BuildCommons =>
 
   // List of available night build at https://repo1.maven.org/maven2/ch/epfl/lamp/dotty-compiler_0.14/
   // lazy val dottyVersion = dottyLatestNightlyBuild.get
-  lazy val dottyVersion = "0.17.0-RC1"
+  lazy val dottyVersion = "0.21.0-RC1"
   lazy val dottySettings = List(
     scalaVersion := dottyVersion,
     libraryDependencies := libraryDependencies.value.map(_.withDottyCompat(scalaVersion.value)),
-    libraryDependencies --= scalaLibraries(scalaVersion.value),
-    scalacOptions := List("-language:Scala2,implicitConversions")
+    scalacOptions ++= List("-language:implicitConversions", "-noindent", "-Xprint-suspension")
   )
 
   lazy val scalacticDotty = Project("scalacticDotty", file("scalactic.dotty"))

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._
+             |    import qctx.tasty.{_, given}
              |    ensureValid${primitiveTypeName}Literal(value, notValidMsg, notLiteralMsg)(isValid)
              |    '{ $typeName.ensuringValid($$value) }
              |  }
@@ -636,7 +636,7 @@ object GenAnyVals {
        |def plus(x: $typePrefix2$primitiveName): $typePrefix$primitiveName = $typePrefix$primitiveName.ensuringValid(value + x.value)
        |""".stripMargin
 
-  def deprecatedOrdering(name: String, typePrefix: String, primitiveName: String): String = 
+  def deprecatedOrdering(name: String, typePrefix: String, primitiveName: String): String =
     s"""
        |/**
        | * <strong>The formerly implicit <code>$name</code> field has been deprecated and will be removed in a future version of ScalaTest. Please use the <code>ordering</code> field instead.</strong>
@@ -646,7 +646,7 @@ object GenAnyVals {
        |  new Ordering[$typePrefix$primitiveName] {
        |    def compare(x: $typePrefix$primitiveName, y: $typePrefix$primitiveName): Int = ordering.compare(x, y)
        |  }
-    """.stripMargin     
+    """.stripMargin
 
   def importsForMacro(dotty: Boolean): String =
     if (dotty)
@@ -705,7 +705,7 @@ object GenAnyVals {
       isPosInfinity("PosZ", "Float") +
       isFinite("PosZ", "Float"),
       positiveInfinity("PosZ", "Float") +
-      minPositiveValue("PosZ", "Float") + 
+      minPositiveValue("PosZ", "Float") +
       deprecatedOrdering("posZFloatOrd", "PosZ", "Float"),
       posZWidens("Float"), dotty) :::
     genDoubleAnyVal(dir, "PosZDouble", "non-negative", "", "i >= 0.0", "PosZDouble(1.1)", "PosZDouble(-1.1)", "1.1", "-1.1", "0.0", "0.0",
@@ -717,7 +717,7 @@ object GenAnyVals {
       isPosInfinity("PosZ", "Double") +
       isFinite("PosZ", "Double"),
       positiveInfinity("PosZ", "Double") +
-      minPositiveValue("PosZ", "Double") + 
+      minPositiveValue("PosZ", "Double") +
       deprecatedOrdering("posZDoubleOrd", "PosZ", "Double"),
       posZWidens("Double"), dotty) :::
     genIntAnyVal(dir, "PosInt", "positive", "Note: a <code>PosInt</code> may not equal 0. If you want positive number or 0, use [[PosZInt]].", "i > 0", "PosInt(42)", "PosInt(0)", "42", "0", "1", "1",
@@ -733,7 +733,7 @@ object GenAnyVals {
       isPosInfinity("Pos", "Float") +
       isFinite("Pos", "Float"),
       positiveInfinity("Pos", "Float") +
-      minPositiveValue("Pos", "Float") + 
+      minPositiveValue("Pos", "Float") +
       deprecatedOrdering("posFloatOrd", "Pos", "Float"),
       posWidens("Float"), dotty) :::
     genDoubleAnyVal(dir, "PosDouble", "positive", "", "i > 0.0", "PosDouble(1.1)", "PosDouble(-1.1)", "1.1", "-1.1", "Double.MinPositiveValue", "4.9E-324",
@@ -745,7 +745,7 @@ object GenAnyVals {
       isPosInfinity("Pos", "Double") +
       isFinite("Pos", "Double"),
       positiveInfinity("Pos", "Double") +
-      minPositiveValue("Pos", "Double") + 
+      minPositiveValue("Pos", "Double") +
       deprecatedOrdering("posDoubleOrd", "Pos", "Double"),
       posWidens("Double"), dotty) :::
     genIntAnyVal(dir, "NegInt", "negative", "Note: a <code>NegInt</code> may not equal 0. If you want negative number or 0, use [[NegZInt]].", "i < 0", "NegInt(-42)", "NegInt(0)", "-42", "0", "Int.MinValue", "-2147483648", "-1", "-1",

project/GenArrayHelper.scala

@@ -21,7 +21,7 @@ object GenArrayHelper {
 
   def genMain(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val content =
-      if (scalaVersion startsWith "2.13")
+      if (ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2018 Artima, Inc.
           | *

project/GenColCompatHelper.scala

@@ -21,7 +21,7 @@ object GenColCompatHelper {
 
   def genMain(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val content =
-      if (scalaVersion startsWith "2.13")
+      if (ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2018 Artima, Inc.
           | *
@@ -139,7 +139,7 @@ object GenColCompatHelper {
 
   def genTest(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val chainSpec =
-      if (scalaVersion startsWith "2.13")
+      if (ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2018 Artima, Inc.
           | *
@@ -213,7 +213,7 @@ object GenColCompatHelper {
         """.stripMargin
 
     val everySpec =
-      if (scalaVersion startsWith "2.13")
+      if (ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2018 Artima, Inc.
           | *

project/GenCompatibleClasses.scala

@@ -80,7 +80,7 @@ object GenCompatibleClasses {
     targetDir.mkdirs()
     val file = new File(targetDir, "CompatParColls.scala")
     if (!file.exists || generatorSource.lastModified > file.lastModified) {
-      val parMethod = if (scalaVersion startsWith "2.13") "def par: T = oriCol" else ""
+      val parMethod = if(ScalaVersionHelper.isStdLibCompat_213(scalaVersion)) "def par: T = oriCol" else ""
       /*
        For recording purpose, this is the original version of CompatParColls that stops working in 2.13.0-M4
         /**

project/GenConfigMap.scala

@@ -21,7 +21,7 @@ object GenConfigMap {
 
   def genMain(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val content =
-      if (scalaVersion startsWith "2.13")
+      if(ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2013 Artima, Inc.
           | *

project/GenEvery.scala

@@ -6,7 +6,7 @@ import scala.io.Source
 object GenEvery {
 
   def transformLine(line: String, scalaVersion: String): String = {
-    if (scalaVersion startsWith "2.13")
+    if(ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
       line
         .replaceAllLiterally(": Map[K, Every[T]]", ": scala.collection.MapView[K, org.scalactic.Every[T]]")
         .replaceAllLiterally("final def to[Col[_]](implicit cbf: CanBuildFrom[Nothing, T, Col[T @uV]]): Col[T @uV] = underlying.to[Col](cbf)",

project/GenScalaTestDotty.scala

@@ -164,9 +164,9 @@ object GenScalaTestDotty {
       "org/scalatest/matchers/dsl" -> List(
         "BeWord.scala", 
         "JavaCollectionWrapper.scala",
-        "JavaMapWrapper.scala", 
+        "JavaMapWrapper.scala",
         "MatchPatternWord.scala",
-        "NotWord.scala", 
+        "NotWord.scala",
         "ResultOfNotWordForAny.scala"
       ), 
       "org/scalatest/matchers/should" -> List.empty, 
@@ -191,17 +191,17 @@ object GenScalaTestDotty {
     copyFiles("scalatest-test/src/test/scala/org/scalatest", "org/scalatest", targetDir,
       List(
         "AssertionsSpec.scala",
-        "ShouldCompileSpec.scala",
-        "ShouldNotCompileSpec.scala"/*,
-        "ShouldNotTypeCheckSpec.scala"*/
+        // "ShouldCompileSpec.scala",
+        // "ShouldNotCompileSpec.scala",
+        // "ShouldNotTypeCheckSpec.scala"
       )
-    ) ++ 
-    copyDir("scalatest-test/src/test/scala/org/scalatest/diagrams", "org/scalatest/diagrams", targetDir, List.empty) ++ 
-    copyDir("scalatest-test/src/test/scala/org/scalatest/expectations", "org/scalatest/expectations", targetDir, 
+    ) ++
+    copyDir("scalatest-test/src/test/scala/org/scalatest/diagrams", "org/scalatest/diagrams", targetDir, List.empty) ++
+    copyDir("scalatest-test/src/test/scala/org/scalatest/expectations", "org/scalatest/expectations", targetDir,
       List(
         "DirectExpectationsSpec.scala"
       )
-    ) 
+    )
     /*++
       copyDir("scalatest-test/src/test/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
         List(