Making progress in CompileMacro for Dotty.

Author: cheeseng

project/GenScalaTestDotty.scala

@@ -176,7 +176,8 @@ object GenScalaTestDotty {
   def genTest(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     copyFiles("scalatest-test/src/test/scala/org/scalatest", "org/scalatest", targetDir,
       List(
-        "AssertionsSpec.scala"
+        "AssertionsSpec.scala", 
+        "ShouldCompileSpec.scala"
       )
     ) /*++
       copyDir("scalatest-test/src/test/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,

scalatest-test/src/test/scala/org/scalatest/ShouldCompileSpec.scala

@@ -42,6 +42,7 @@ class ShouldCompileSpec extends FunSpec {
         assert(e.failedCodeLineNumber === (Some(thisLineNumber - 6)))
       }
 
+      // SKIP-DOTTY-START
       it("should throw TestFailedException with correct message and stack depth when parse failed") {
         val e = intercept[TestFailedException] {
           "println(\"test)" should compile
@@ -52,9 +53,43 @@ class ShouldCompileSpec extends FunSpec {
         assert(e.failedCodeFileName === (Some(fileName)))
         assert(e.failedCodeLineNumber === (Some(thisLineNumber - 6)))
       }
+      // SKIP-DOTTY-END
 
     }
 
+    describe("when work with string literal with triple double quotes") {
+
+      it("should do nothing when type check passed") {
+        """val a = 1""" should compile
+      }
+
+      it("should throw TestFailedException with correct message and stack depth when type check failed") {
+        val e = intercept[TestFailedException] {
+          """val a: String = 2""" should compile
+        }
+        val errMsg = Resources.expectedNoErrorButGotTypeError("", "")
+        assert(e.message.get.startsWith(errMsg.substring(0, errMsg.indexOf(':'))))
+        assert(e.message.get.indexOf("val a: String = 2") >= 0)
+        assert(e.failedCodeFileName === (Some(fileName)))
+        assert(e.failedCodeLineNumber === (Some(thisLineNumber - 6)))
+      }
+
+      // SKIP-DOTTY-START
+      it("should throw TestFailedException with correct message and stack depth when parse failed") {
+        val e = intercept[TestFailedException] {
+          """println(\"test)""" should compile
+        }
+        val errMsg = Resources.expectedNoErrorButGotParseError("", "")
+        assert(e.message.get.startsWith(errMsg.substring(0, errMsg.indexOf(':'))))
+        assert(e.message.get.indexOf("println(\"test)") >= 0)
+        assert(e.failedCodeFileName === (Some(fileName)))
+        assert(e.failedCodeLineNumber === (Some(thisLineNumber - 6)))
+      }
+      // SKIP-DOTTY-END
+
+    }
+
+    // SKIP-DOTTY-START
     describe("when work with triple quotes string literal with stripMargin") {
 
       it("should do nothing when type check passed") {
@@ -89,5 +124,6 @@ class ShouldCompileSpec extends FunSpec {
         assert(e.failedCodeLineNumber === (Some(thisLineNumber - 6)))
       }
     }
+    // SKIP-DOTTY-END
   }
 }

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

@@ -176,15 +176,15 @@ object CompileMacro {
       }
 
     self.unseal.underlyingArgument match {
-      case Apply(
+      /*case Apply(
              Apply(
                Select(
                  Apply(
                    Apply(
                      _,
                      List(
                        Literal(
-                         String(code)
+                         code
                        )
                      )
                    ),
@@ -197,7 +197,20 @@ object CompileMacro {
              _
       ) if shouldOrMustTermName == shouldOrMust =>
         // LHS is a normal string literal, call checkCompile with the extracted code string to generate code
+        checkNotCompile(code.toString)*/
+      
+      case Apply(
+             Apply(
+               Select(_, shouldOrMustTerconvertToStringShouldOrMustWrapperTermName),
+               List(
+                 Literal(code)
+               )
+             ),
+             _
+           ) if shouldOrMustTerconvertToStringShouldOrMustWrapperTermName ==  "convertToString" + shouldOrMust.capitalize + "Wrapper" =>
+        // LHS is a normal string literal, call checkCompile with the extracted code string to generate code
         checkNotCompile(code.toString)
+
       case other =>
         throw QuoteError("The '" + shouldOrMust + " compile' syntax only works with String literals.")
     }
@@ -276,7 +289,7 @@ object CompileMacro {
       }
 
     self.unseal.underlyingArgument match {
-      case Apply(
+      /*case Apply(
              Apply(
                Select(
                  Apply(
@@ -297,8 +310,34 @@ object CompileMacro {
              _
       ) if shouldOrMustTermName == shouldOrMust =>
         // LHS is a normal string literal, call checkCompile with the extracted code string to generate code
+        checkCompile(code.toString)*/
+
+      case Apply(
+             Apply(
+               Select(_, shouldOrMustTerconvertToStringShouldOrMustWrapperTermName),
+               List(
+                 Literal(String(code))
+               )
+             ),
+             _
+           ) if shouldOrMustTerconvertToStringShouldOrMustWrapperTermName ==  "convertToString" + shouldOrMust.capitalize + "Wrapper" =>
+        // LHS is a normal string literal, call checkCompile with the extracted code string to generate code
         checkCompile(code.toString)
+
+      case Apply(
+             Apply(
+               Ident(shouldOrMustTerconvertToStringShouldOrMustWrapperTermName),
+               List(
+                 Literal(String(code))
+               )
+             ),
+             _
+           ) if shouldOrMustTerconvertToStringShouldOrMustWrapperTermName ==  "convertToString" + shouldOrMust.capitalize + "Wrapper" =>
+        // LHS is a normal string literal, call checkCompile with the extracted code string to generate code
+        checkCompile(code.toString)    
+
       case other =>
+        println("###other: " + other)
         throw QuoteError("The '" + shouldOrMust + " compile' syntax only works with String literals.")
     }
   }