Merge pull request #173 from olafurpg/dotty

Add support to expected output that only compiles with Dotty.

Author: olafurpg

build.sbt

@@ -260,6 +260,17 @@ lazy val testsOutput = project
   )
   .dependsOn(testsShared)
 
+lazy val testsOutputDotty = project
+  .in(file("scalafix-tests/output-dotty"))
+  .settings(
+    allSettings,
+    noPublish,
+    scalaVersion := "0.1.1-bin-20170530-f8f52cc-NIGHTLY",
+    libraryDependencies := libraryDependencies.value.map(_.withDottyCompat()),
+    scalacOptions := Nil
+  )
+  .disablePlugins(ScalahostSbtPlugin)
+
 lazy val unit = project
   .in(file("scalafix-tests/unit"))
   .settings(
@@ -282,6 +293,8 @@ lazy val unit = project
         sourceDirectory.in(testsInput, Compile).value,
       "outputSourceroot" ->
         sourceDirectory.in(testsOutput, Compile).value,
+      "outputDottySourceroot" ->
+        sourceDirectory.in(testsOutputDotty, Compile).value,
       "testsInputResources" -> resourceDirectory.in(testsInput, Compile).value,
       "mirrorClasspath" -> classDirectory.in(testsInput, Compile).value
     ),

project/plugins.sbt

@@ -3,11 +3,11 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
 resolvers += Resolver.bintrayIvyRepo("scalameta", "sbt-plugins") // only needed for scalatex 0.3.8-pre
 addSbtPlugin("com.lihaoyi"     % "scalatex-sbt-plugin" % "0.3.8-pre")
 addSbtPlugin("io.get-coursier" % "sbt-coursier"        % "1.0.0-M15")
-addSbtPlugin("org.wartremover" % "sbt-wartremover"     % "1.2.1")
 addSbtPlugin("com.jsuereth"    % "sbt-pgp"             % "1.0.0")
 addSbtPlugin("org.xerial.sbt"  % "sbt-sonatype"        % "1.1")
 addSbtPlugin("me.lessis"       % "bintray-sbt"         % "0.3.0")
 addSbtPlugin("com.dwijnand"    % "sbt-dynver"          % "1.2.0")
+addSbtPlugin("ch.epfl.lamp"    % "sbt-dotty"           % "0.1.1")
 addSbtPlugin("org.scalameta"   % "sbt-scalahost"       % Dependencies.scalametaV)
 
 resolvers += Resolver.bintrayIvyRepo("duhemm", "sbt-plugins")

scalafix-testkit/src/main/scala/scalafix/testkit/SemanticRewriteSuite.scala

@@ -2,13 +2,14 @@ package scalafix
 package testkit
 
 import scala.meta._
+import org.scalameta.logger
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.FunSuite
 
 abstract class SemanticRewriteSuite(
     val mirror: Database,
     val inputSourceroot: AbsolutePath,
-    val expectedOutputSourceroot: AbsolutePath
+    val expectedOutputSourceroot: Seq[AbsolutePath]
 ) extends FunSuite
     with DiffAssertions
     with BeforeAndAfterAll { self =>
@@ -27,7 +28,19 @@ abstract class SemanticRewriteSuite(
       }
       val expected =
         new String(
-          expectedOutputSourceroot.resolve(diffTest.filename).readAllBytes)
+          expectedOutputSourceroot
+            .map(_.resolve(diffTest.filename))
+            .find(_.isFile)
+            .map(_.readAllBytes)
+            .getOrElse {
+              val tried = expectedOutputSourceroot
+                .map(_.resolve(diffTest.filename))
+                .mkString("\n")
+              sys.error(
+                s"""Missing expected output file for test ${diffTest.filename}. Tried:
+                   |$tried""".stripMargin)
+            }
+        )
       assertNoDiff(obtained, expected)
     }
   }

scalafix-tests/output/src/main/scala/test/ProcedureSyntax.scala renamed to scalafix-tests/output-dotty/src/main/scala/test/ProcedureSyntax.scala

@@ -7,7 +7,10 @@ class SemanticTests
     extends SemanticRewriteSuite(
       Database.load(Classpath(AbsolutePath(BuildInfo.mirrorClasspath))),
       AbsolutePath(BuildInfo.inputSourceroot),
-      AbsolutePath(BuildInfo.outputSourceroot)
+      Seq(
+        AbsolutePath(BuildInfo.outputSourceroot),
+        AbsolutePath(BuildInfo.outputDottySourceroot)
+      )
     ) {
   runAllTests()
 }