Get dotty build to compile without errors, still have some failing tests in scalatest.

Author: cheeseng

project/GenFactoriesDotty.scala

@@ -46,6 +46,7 @@ import org.scalatest.matchers.AMatcher
 import org.scalatest.matchers.AnMatcher
 import org.scalatest.matchers.MatchPatternMacro
 import org.scalatest.matchers.TypeMatcherMacro
+import org.scalatest.matchers.MatchPatternHelper
 import org.scalatest.matchers.dsl.FullyMatchWord
 import org.scalatest.matchers.dsl.StartWithWord
 import org.scalatest.matchers.dsl.EndWithWord

project/GenMatchers.scala

@@ -152,11 +152,17 @@ object GenMatchers {
     targetDir.mkdirs()
     val matchersDir = new File(targetDir, "matchers")
     matchersDir.mkdirs()
-    val junitDir = new File(targetDir, "junit")
-    junitDir.mkdirs()
+    val shouldDir = new File(matchersDir, "should")
+    shouldDir.mkdirs()
+    val mustDir = new File(matchersDir, "must")
+    mustDir.mkdirs()
 
+    (if (scalaJS || dotty)
+      Seq(translateFile(shouldDir, "Matchers.scala", "scalatest/src/main/scala/org/scalatest/matchers/should/Matchers.scala", scalaVersion, scalaJS, dotty, line => line))
+    else
+      Seq.empty[File]) ++  
     Seq(
-      translateFile(targetDir, "Matchers.scala", "scalatest/src/main/scala/org/scalatest/matchers/should/Matchers.scala", scalaVersion, scalaJS, dotty, translateShouldToMust)
+      translateFile(mustDir, "Matchers.scala", "scalatest/src/main/scala/org/scalatest/matchers/should/Matchers.scala", scalaVersion, scalaJS, dotty, translateShouldToMust)
       /*translateFile(targetDir, "WillMatchers.scala", "scalatest/src/main/scala/org/scalatest/Matchers.scala", scalaVersion, scalaJS, translateShouldToWill)
       translateFile(targetDir, "FactNoExceptionWord.scala", "scalatest/src/main/scala/org/scalatest/words/NoExceptionWord.scala", scalaVersion, scalaJS, translateShouldToWill)
       translateFile(targetDir, "FactResultOfATypeInvocation.scala", "scalatest/src/main/scala/org/scalatest/words/ResultOfATypeInvocation.scala", scalaVersion, scalaJS,

project/GenScalaTestDotty.scala

@@ -144,6 +144,12 @@ object GenScalaTestDotty {
     ) ++
     copyDir("scalatest/src/main/scala/org/scalatest/compatible", "org/scalatest/compatible", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/diagrams", "org/scalatest/diagrams", targetDir, 
+      List(
+        "Diagrams.scala", 
+        "DiagramsMacro.scala"
+      )
+    ) ++
     copyDir("scalatest/src/main/scala/org/scalatest/exceptions", "org/scalatest/exceptions", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/enablers", "org/scalatest/enablers", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/events", "org/scalatest/events", targetDir, List.empty) ++
@@ -160,20 +166,25 @@ object GenScalaTestDotty {
         "TypeMatcherMacro.scala"   // Re-implemented with new macro
       )
     ) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/matchers/dsl", "org/scalatest/matchers/dsl", targetDir, 
+      List(
+        "BeWord.scala", 
+        "JavaCollectionWrapper.scala",
+        "JavaMapWrapper.scala", 
+        "MatchPatternWord.scala",
+        "NotWord.scala", 
+        "ResultOfNotWordForAny.scala"
+      )
+    ) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/matchers/should", "org/scalatest/matchers/should", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/path", "org/scalatest/path", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/propspec", "org/scalatest/propspec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/time", "org/scalatest/time", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/verbs", "org/scalatest/verbs", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/tools", "org/scalatest/tools", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/refspec", "org/scalatest/refspec", targetDir, List.empty) ++
-    copyDir("scalatest/src/main/scala/org/scalatest/words", "org/scalatest/words", targetDir,
-      List(
-        "BeWord.scala",
-        "MatchPatternWord.scala",
-        "NotWord.scala",
-        "ResultOfNotWordForAny.scala"
-      )
-    ) ++ 
+    copyDir("scalatest/src/main/scala/org/scalatest/words", "org/scalatest/words", targetDir, List.empty) ++ 
     copyDir("scalatest/src/main/scala/org/scalatest/wordspec", "org/scalatest/wordspec", targetDir, List.empty)
   }
 

scalatest.dotty/src/main/scala/org/scalatest/DiagrammedAssertionsMacro.scala

@@ -17,6 +17,7 @@ package org.scalatest
 
 import org.scalactic._
 import scala.quoted._
+import org.scalatest.diagrams._
 
 object DiagrammedAssertionsMacro {
   /**
@@ -35,21 +36,21 @@ object DiagrammedAssertionsMacro {
     val endLine = rootPosition.endLine // Get the expression last line number
 
     if (startLine == endLine) // Only use diagram macro if it is one line, where startLine will be equaled to endLine
-      DiagrammedExprMacro.transform(helper, condition, pos, clue, rootPosition.sourceCode)
+      DiagramsMacro.transform(helper, condition, pos, clue, rootPosition.sourceCode)
     else // otherwise we'll just fallback to use BooleanMacro
       AssertionsMacro.transform(fallback, condition, prettifier, pos, clue)
   }
 
   def assert(condition: Expr[Boolean], prettifier: Expr[Prettifier], pos: Expr[source.Position], clue: Expr[Any])(implicit qctx: QuoteContext): Expr[Assertion] = {
     macroImpl(
-      '{ DiagrammedAssertions.diagrammedAssertionsHelper.macroAssert },
+      '{ Diagrams.diagrammedAssertionsHelper.macroAssert },
       '{ Assertions.assertionsHelper.macroAssert },
       condition, clue, prettifier, pos)
   }
 
   def assume(condition: Expr[Boolean], prettifier: Expr[Prettifier], pos: Expr[source.Position], clue: Expr[Any])(implicit qctx: QuoteContext): Expr[Assertion] = {
     macroImpl(
-      '{ DiagrammedAssertions.diagrammedAssertionsHelper.macroAssume },
+      '{ Diagrams.diagrammedAssertionsHelper.macroAssume },
       '{ Assertions.assertionsHelper.macroAssume },
       condition, clue, prettifier, pos)
   }

scalatest.dotty/src/main/scala/org/scalatest/DiagrammedAssertions.scala renamed to scalatest.dotty/src/main/scala/org/scalatest/diagrams/Diagrams.scala

@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest
+package org.scalatest.diagrams
 
 import org.scalactic._
 import org.scalactic.Requirements._
 import scala.collection.mutable.ListBuffer
 import collection.immutable.TreeMap
+import org.scalatest.{AnchorValue, Assertions, DiagrammedExpr, DiagrammedAssertionsMacro, Succeeded}
+import org.scalatest.compatible.Assertion
 
 /**
  * Sub-trait of <code>Assertions</code> that override <code>assert</code> and <code>assume</code> methods to include
@@ -152,7 +154,7 @@ import collection.immutable.TreeMap
  *
  * <p>Trait <code>DiagrammedAssertions</code> was inspired by Peter Niederwieser's work in <a href="http://code.google.com/p/spock/">Spock</a> and <a href="https://github.com/pniederw/expecty">Expecty</a>.
  */
-trait DiagrammedAssertions extends Assertions {
+trait Diagrams extends Assertions {
 
   import scala.tasty._
   import scala.quoted._
@@ -277,7 +279,7 @@ trait DiagrammedAssertions extends Assertions {
  * 	    at sun.reflect.NativeMethodAccessorImpl.invoke...
  * </pre>
  */
-object DiagrammedAssertions extends DiagrammedAssertions {
+object Diagrams extends Diagrams {
 
   /**
     * Helper class used by code generated by the overriden <code>assert</code> macro.

scalatest.dotty/src/main/scala/org/scalatest/DiagrammedExprMacro.scala renamed to scalatest.dotty/src/main/scala/org/scalatest/diagrams/DiagramsMacro.scala

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest
+package org.scalatest.diagrams
 
 import org.scalactic._
 import scala.quoted._
+import org.scalatest.{Assertions, DiagrammedExpr}
+import org.scalatest.compatible.Assertion
 
-
-object DiagrammedExprMacro {
+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: QuoteContext = qctx

scalatest.dotty/src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala

@@ -16,7 +16,7 @@
 package org.scalatest.matchers
 
 import org.scalatest.Resources
-import org.scalatest.words.ResultOfNotWordForAny
+import org.scalatest.matchers.dsl.ResultOfNotWordForAny
 import scala.quoted._
 import scala.tasty._
 

scalatest.dotty/src/main/scala/org/scalatest/matchers/Matcher.scala

@@ -18,9 +18,10 @@ package org.scalatest.matchers
 import org.scalactic._
 import org.scalatest.enablers._
 import org.scalatest.words._
+import org.scalatest.matchers.dsl._
 import org.scalatest.FailureMessages
-import org.scalatest.MatchersHelper.andMatchersAndApply
-import org.scalatest.MatchersHelper.orMatchersAndApply
+import org.scalatest.matchers.MatchersHelper.andMatchersAndApply
+import org.scalatest.matchers.MatchersHelper.orMatchersAndApply
 import org.scalatest.Resources
 import scala.collection.GenTraversable
 import scala.reflect.ClassTag

scalatest.dotty/src/main/scala/org/scalatest/matchers/TypeMatcherMacro.scala

@@ -15,7 +15,7 @@
  */
 package org.scalatest.matchers
 
-import org.scalatest.words.{ResultOfAnTypeInvocation, MatcherWords, ResultOfATypeInvocation, ResultOfNotWordForAny}
+import org.scalatest.matchers.dsl.{ResultOfAnTypeInvocation, MatcherWords, ResultOfATypeInvocation, ResultOfNotWordForAny}
 
 // //import org.scalatest.words.{FactResultOfAnTypeInvocation, FactResultOfATypeInvocation}
 // import org.scalactic.Prettifier
@@ -24,7 +24,7 @@ import org.scalatest.words.{ResultOfAnTypeInvocation, MatcherWords, ResultOfATyp
 import scala.quoted._
 import scala.tasty._
 
-private[scalatest] object TypeMatcherMacro {
+ object TypeMatcherMacro {
 
 //   // Check that no type parameter is specified, if any does, give a friendly compiler warning.
   def checkTypeParameter(qctx: QuoteContext)(tree: qctx.tasty.Term, methodName: String): Unit = {
@@ -169,7 +169,7 @@ private[scalatest] object TypeMatcherMacro {
   }
 
   // Do checking on type parameter and generate AST to call TypeMatcherHelper.checkAType, used by 'shouldBe a [type]' syntax
-  def shouldBeATypeImpl(self: Expr[org.scalatest.Matchers#AnyShouldWrapper[_]], aType: Expr[ResultOfATypeInvocation[_]])(implicit qctx: QuoteContext): Expr[org.scalatest.Assertion] = {
+  def shouldBeATypeImpl(self: Expr[org.scalatest.matchers.should.Matchers#AnyShouldWrapper[_]], aType: Expr[ResultOfATypeInvocation[_]])(implicit qctx: QuoteContext): Expr[org.scalatest.Assertion] = {
     import qctx.tasty._
     checkTypeParameter(qctx)(aType.unseal, "a")
     '{
@@ -178,7 +178,7 @@ private[scalatest] object TypeMatcherMacro {
   }
 
   // Do checking on type parameter and generate AST to call TypeMatcherHelper.checkAType, used by 'mustBe a [type]' syntax
-  def mustBeATypeImpl(self: Expr[org.scalatest.MustMatchers#AnyMustWrapper[_]], aType: Expr[ResultOfATypeInvocation[_]])(implicit qctx: QuoteContext): Expr[org.scalatest.Assertion] = {
+  def mustBeATypeImpl(self: Expr[org.scalatest.matchers.must.Matchers#AnyMustWrapper[_]], aType: Expr[ResultOfATypeInvocation[_]])(implicit qctx: QuoteContext): Expr[org.scalatest.Assertion] = {
     import qctx.tasty._
     checkTypeParameter(qctx)(aType.unseal, "a")
     '{
@@ -187,7 +187,7 @@ private[scalatest] object TypeMatcherMacro {
   }
 
   // Do checking on type parameter and generate AST to call TypeMatcherHelper.checkAType, used by 'shouldBe an [type]' syntax
-  def shouldBeAnTypeImpl(self: Expr[org.scalatest.Matchers#AnyShouldWrapper[_]], anType: Expr[ResultOfAnTypeInvocation[_]])(implicit qctx: QuoteContext): Expr[org.scalatest.Assertion] = {
+  def shouldBeAnTypeImpl(self: Expr[org.scalatest.matchers.should.Matchers#AnyShouldWrapper[_]], anType: Expr[ResultOfAnTypeInvocation[_]])(implicit qctx: QuoteContext): Expr[org.scalatest.Assertion] = {
     import qctx.tasty._
     checkTypeParameter(qctx)(anType.unseal, "an")
     '{
@@ -196,7 +196,7 @@ private[scalatest] object TypeMatcherMacro {
   }
 
   // Do checking on type parameter and generate AST to call TypeMatcherHelper.checkAnType, used by 'mustBe an [type]' syntax
-  def mustBeAnTypeImpl(self: Expr[org.scalatest.MustMatchers#AnyMustWrapper[_]], anType: Expr[ResultOfAnTypeInvocation[_]])(implicit qctx: QuoteContext): Expr[org.scalatest.Assertion] = {
+  def mustBeAnTypeImpl(self: Expr[org.scalatest.matchers.must.Matchers#AnyMustWrapper[_]], anType: Expr[ResultOfAnTypeInvocation[_]])(implicit qctx: QuoteContext): Expr[org.scalatest.Assertion] = {
     import qctx.tasty._
     checkTypeParameter(qctx)(anType.unseal, "an")
     '{

scalatest.dotty/src/main/scala/org/scalatest/words/BeWord.scala renamed to scalatest.dotty/src/main/scala/org/scalatest/matchers/dsl/BeWord.scala

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.words
+package org.scalatest.matchers.dsl
 
 import org.scalactic._
 import org.scalatest.matchers._
@@ -24,7 +24,7 @@ import org.scalatest.Resources
 import org.scalatest.Suite
 import org.scalatest.UnquotedString
 // SKIP-SCALATESTJS,NATIVE-START
-import org.scalatest.MatchersHelper.matchSymbolToPredicateMethod
+import org.scalatest.matchers.MatchersHelper.matchSymbolToPredicateMethod
 // SKIP-SCALATESTJS,NATIVE-END
 import org.scalatest.enablers.Definition
 import org.scalatest.enablers.Emptiness