Merge pull request #1085 from vovapolu/master

New scalafmt sbt plugin

build.sbt

@@ -69,13 +69,13 @@ def isOnly(scalaV: String) = Seq(
   crossScalaVersions := Seq(scalaV)
 )
 
-lazy val `scalafmt-sbt` = project
+lazy val `scalafmt-cli-sbt` = project
   .configs(IntegrationTest)
   .settings(
     allSettings,
     Defaults.itSettings,
     mimaPreviousArtifacts := Set.empty,
-    moduleName := "sbt-scalafmt",
+    moduleName := "sbt-cli-scalafmt",
     isOnly(scala212),
     sbtPlugin := true,
     sbtVersion in Global := "1.0.0",
@@ -90,6 +90,17 @@ lazy val `scalafmt-sbt` = project
   )
   .dependsOn(cli)
 
+lazy val `scalafmt-sbt` = project
+  .settings(
+    allSettings,
+    mimaPreviousArtifacts := Set.empty,
+    moduleName := "sbt-scalafmt",
+    isOnly(scala212),
+    sbtPlugin := true,
+    sbtVersion in Global := "1.0.0"
+  )
+  .dependsOn(coreJVM)
+
 lazy val `scalafmt-sbt-tests` = project
   .settings(
     allSettings,
@@ -336,7 +347,7 @@ def ciCommands = Seq(
       Nil
   ),
   Command.command("ci-sbt-scalafmt") { s =>
-    "scalafmt-sbt/it:test" ::
+    "scalafmt-cli-sbt/it:test" ::
       s
   },
   Command.command("ci-publish") { s =>

scalafmt-cli-sbt/src/main/scala/org/scalafmt/sbt/ScalafmtPlugin.scala

@@ -0,0 +1,25 @@
+package org.scalafmt.sbt
+import scala.meta.internal.tokenizers.PlatformTokenizerCache
+import sbt._
+import Keys._
+
+object ScalafmtPlugin extends AutoPlugin {
+  override def trigger: PluginTrigger = allRequirements
+  object autoImport {
+    val scalafmt: Command =
+      Command.args("scalafmt", "run the scalafmt command line interface.") {
+        case (state, args) =>
+          org.scalafmt.cli.Cli.main("--non-interactive" +: args.toArray)
+          PlatformTokenizerCache.megaCache.clear()
+          state
+      }
+  }
+  override def globalSettings: Seq[Def.Setting[_]] =
+    Seq(
+      commands += autoImport.scalafmt
+    ) ++
+      addCommandAlias("scalafmtTest", "scalafmt --test") ++
+      addCommandAlias("scalafmtDiffTest", "scalafmt --diff --test") ++
+      addCommandAlias("scalafmtDiff", "scalafmt --diff")
+
+}

scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala

@@ -80,7 +80,11 @@ object Scalafmt {
     **/
   def configWithDialect(
       config: ScalafmtConfig,
-      dialect: Dialect
-  ): ScalafmtConfig =
+      dialect: Dialect): ScalafmtConfig =
     config.withDialect(dialect)
+
+  def configForSbt(
+      config: ScalafmtConfig
+  ): ScalafmtConfig =
+    config.forSbt
 }

scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala

@@ -152,6 +152,8 @@ case class ScalafmtConfig(
   def withDialect(dialect: Dialect): ScalafmtConfig =
     copy(runner = runner.copy(dialect = dialect))
 
+  def forSbt: ScalafmtConfig = copy(runner = runner.forSbt)
+
   def reformatDocstrings: Boolean = docstrings != Docstrings.preserve
   def scalaDocs: Boolean = docstrings == Docstrings.ScalaDoc
   lazy val alignMap: Map[String, Regex] =

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/helloworld/build.sbt → scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt-cli/build.sbt

@@ -59,7 +59,7 @@ TaskKey[Unit]("check") := {
     new File("project/plugins.sbt"),
     """
       |addSbtPlugin(
-      |  "com.geirsson" % "sbt-scalafmt" % System.getProperty("plugin.version")
+      |  "com.geirsson" % "sbt-cli-scalafmt" % System.getProperty("plugin.version")
       |)
     """.stripMargin
   )

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt-cli/p3/src/main/java/TestJava.java

@@ -0,0 +1,6 @@
+public class TestJava
+{
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
+    }
+}

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt-cli/p3/src/test/java/MainTestJava.java

@@ -0,0 +1,6 @@
+public class MainTestJava
+{
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
+    }
+}

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt-cli/project/plugins.sbt

@@ -0,0 +1,3 @@
+addSbtPlugin   (
+  "com.geirsson" % "sbt-cli-scalafmt" % System.getProperty("plugin.version"))
+

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/.scalafmt.conf

@@ -0,0 +1 @@
+style = IntelliJ

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/.scalafmt6.conf

@@ -0,0 +1,4 @@
+style = default
+project.excludeFilters = [
+  MainTest
+]

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/build.sbt

@@ -0,0 +1,148 @@
+import java.io.File
+
+fork in ThisBuild := true
+
+lazy val p123 = project
+  .in(file("."))
+  .aggregate(
+    p1,
+    p2,
+    p3
+  )
+
+lazy val p1 = project.settings(
+  scalaVersion := "2.10.5"
+)
+lazy val p2 = project.settings(
+  scalaVersion := "2.11.8"
+)
+lazy val p3 = project.settings(
+  scalaVersion := "2.12.1"
+)
+lazy val p4 = project.settings(
+  scalaVersion := "2.12.1"
+)
+lazy val p5 = project.settings(
+  scalaVersion := "2.12.1",
+  scalafmtOnCompile := true
+)
+lazy val p6 = project.settings(
+  scalaVersion := "2.12.1",
+  scalafmtConfig := Some(file(".scalafmt6.conf"))
+)
+lazy val p7 = project.settings(
+  scalaVersion := "2.12.1",
+  scalafmtConfig := None
+)
+
+def assertContentsEqual(file: File, expected: String): Unit = {
+  val obtained =
+    scala.io.Source.fromFile(file).getLines().mkString("\n")
+
+  if (obtained.trim != expected.trim) {
+    val msg =
+      s"""File: $file
+         |Obtained output:
+         |$obtained
+         |Expected:
+         |$expected
+         |""".stripMargin
+    System.err.println(msg)
+    throw new Exception(msg)
+  }
+}
+
+TaskKey[Unit]("check") := {
+  (1 to 4).foreach { i =>
+    val expectedTest =
+      """
+        |object Test {
+        |  foo(
+        |    a, // comment
+        |    b
+        |  )
+        |}
+        """.stripMargin
+    val expectedMainTest = expectedTest.replaceFirst("Test", "MainTest")
+    assertContentsEqual(
+      file(s"p$i/src/main/scala/Test.scala"),
+      expectedTest
+    )
+    assertContentsEqual(
+      file(s"p$i/src/test/scala/MainTest.scala"),
+      expectedMainTest
+    )
+  }
+
+
+  assertContentsEqual(
+    file(s"p5/src/main/scala/Test.scala"),
+    """
+      |object Test {
+      |  def foo(a: Int, // comment
+      |          b: Double) = ???
+      |}
+    """.stripMargin
+  )
+  assertContentsEqual(
+    file(s"p5/src/test/scala/MainTest.scala"),
+    """
+      |object MainTest {
+      |  def foo(a: Int, // comment
+      |          b: Double) = ???
+      |}
+    """.stripMargin
+  )
+
+
+  assertContentsEqual(
+    file(s"p6/src/main/scala/Test.scala"),
+    """
+      |object Test {
+      |  foo(a, // comment
+      |      b)
+      |}
+    """.stripMargin
+  )
+  assertContentsEqual(
+    file(s"p6/src/test/scala/MainTest.scala"),
+    """
+      |object
+      |MainTest
+      |{
+      |  foo(a, // comment
+      |    b)
+      |}
+      |
+    """.stripMargin
+  )
+
+
+  assertContentsEqual(
+    file(s"p7/src/main/scala/Test.scala"),
+    """
+      |object Test {
+      |  foo(a, // comment
+      |      b)
+      |}
+    """.stripMargin
+  )
+  assertContentsEqual(
+    file(s"p7/src/test/scala/MainTest.scala"),
+    """
+      |object MainTest {
+      |  foo(a, // comment
+      |      b)
+      |}
+    """.stripMargin
+  )
+
+  assertContentsEqual(
+    file("project/plugins.sbt"),
+    """
+      |addSbtPlugin(
+      |  "com.geirsson" % "sbt-scalafmt" % System.getProperty("plugin.version")
+      |)
+    """.stripMargin
+  )
+}

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/p1

@@ -0,0 +1 @@
+../sbt-cli/p1

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/p2

@@ -0,0 +1 @@
+../sbt-cli/p2

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/p3

@@ -0,0 +1 @@
+../sbt-cli/p3

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/p4/p4.sbt

@@ -0,0 +1,4 @@
+lazy val settings =
+  Seq(
+  scalaVersion :=
+    "2.12.1")

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/p4/src

@@ -0,0 +1 @@
+../p3/src

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/p5/src/main/scala/Test.scala

@@ -0,0 +1,6 @@
+object
+Test
+{
+  def foo(a: Int, // comment
+    b: Double) = ???
+}

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/p5/src/test/scala/MainTest.scala

@@ -0,0 +1,6 @@
+object
+MainTest
+{
+  def foo(a: Int, // comment
+    b: Double) = ???
+}

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/p6/src

@@ -0,0 +1 @@
+../p3/src

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/p7/src

@@ -0,0 +1 @@
+../p3/src

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.0.0

scalafmt-sbt-tests/src/sbt-test/scalafmt-sbt/sbt/test

@@ -0,0 +1,31 @@
+-> p123/compile:scalafmtCheck
+-> p123/test:scalafmtCheck
+> p123/compile:scalafmt
+> p123/test:scalafmt
+> p123/compile:scalafmtCheck
+> p123/test:scalafmtCheck
+
+> scalafmtSbt
+> scalafmtSbtCheck
+
+> p4/scalafmtOnly src/main/scala/Test.scala src/test/scala/MainTest.scala p4.sbt
+> p4/compile:scalafmtCheck
+> p4/test:scalafmtCheck
+> p4/scalafmtSbtCheck
+
+> p5/compile
+> p5/test:compile
+> p5/compile:scalafmtCheck
+> p5/test:scalafmtCheck
+
+> p6/compile:scalafmt
+> p6/test:scalafmt
+> p6/compile:scalafmtCheck
+> p6/test:scalafmtCheck
+
+> p7/compile:scalafmt
+> p7/test:scalafmt
+> p7/compile:scalafmtCheck
+> p7/test:scalafmtCheck
+
+> check