Format all sources

Even those not known to the build

.github/workflows/run-mill-action.yml

@@ -53,10 +53,10 @@ jobs:
 
       - uses: coursier/cache-action@v6
 
-      - uses: actions/setup-java@v4
+      - uses: coursier/setup-action@v1
         with:
-          java-version: ${{ inputs.java-version }}
-          distribution: temurin
+          apps: scalafmt
+          jvm: temurin:${{ inputs.java-version }}
 
       - name: Prepare git config
         run: |

.github/workflows/run-tests.yml

@@ -152,4 +152,6 @@ jobs:
     uses: ./.github/workflows/run-mill-action.yml
     with:
       java-version: '11'
-      buildcmd: ./mill -i mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll __.sources + __.mimaReportBinaryIssues + __.fix --check
+      buildcmd: |
+        scalafmt --test && scalafmt --reportError # Seems --test doesn't exit with 1 on misformatted files
+        ./mill -i __.mimaReportBinaryIssues + __.fix --check

.scalafmt.conf

@@ -22,3 +22,11 @@ project.git = true
 
 runner.dialect = scala213
 
+project.excludeFilters = [
+   # can't get fileOverride to work to specify scala3 as dialect for these
+  "scalalib/test/resources/hello-dotty/*"
+  # these have scaladoc comments with a particular shape that we don't want to reformat
+  "example/depth/large/*"
+  # these need to have a wrong format, tests check that Mill can reformat them
+  "scalalib/test/resources/scalafmt/*"
+]

example/depth/tasks/11-module-run-task/bar/src/Bar.scala

@@ -2,9 +2,9 @@ package bar
 object Bar {
   def main(args: Array[String]) = {
     val dest = os.pwd
-    for(sourceStr <- args){
+    for (sourceStr <- args) {
       val sourcePath = os.Path(sourceStr)
-      for(p <- os.walk(sourcePath) if p.ext == "scala"){
+      for (p <- os.walk(sourcePath) if p.ext == "scala") {
         val text = os.read(p)
         val mangledText = text.replace("hello", "HELLO")
         val fileDest = dest / (p.subRelativeTo(sourcePath))

example/extending/imports/6-contrib-import/foo/src/Foo.scala

@@ -1,5 +1,5 @@
 package foo
-object Foo{
+object Foo {
   def main(args: Array[String]): Unit = {
     println("foo.BuildInfo.scalaVersion: " + foo.BuildInfo.scalaVersion)
   }

example/extending/metabuild/5-meta-shared-sources/mill-build/src/ScalaVersion.scala

@@ -1,4 +1,4 @@
 package millbuild
-object ScalaVersion{
+object ScalaVersion {
   def myScalaVersion = "2.13.10"
 }

example/extending/plugins/7-writing-mill-plugins/myplugin/src/LineCountJavaModule.scala

@@ -1,21 +1,23 @@
 package myplugin
 import mill._
+
 /**
  * Example Mill plugin trait that adds a `line-count.txt`
  * to the resources of your `JavaModule`
  */
-trait LineCountJavaModule extends mill.javalib.JavaModule{
+trait LineCountJavaModule extends mill.javalib.JavaModule {
+
   /** Name of the file containing the line count that we create in the resource path */
   def lineCountResourceFileName: T[String]
 
   /** Total number of lines in module's source files */
-  def lineCount = T{
+  def lineCount = T {
     allSourceFiles().map(f => os.read.lines(f.path).size).sum
   }
 
   /** Generate resources using lineCount of sources */
-  override def resources = T{
+  override def resources = T {
     os.write(T.dest / lineCountResourceFileName(), "" + lineCount())
     super.resources() ++ Seq(PathRef(T.dest))
   }
-}
+}

example/extending/plugins/7-writing-mill-plugins/myplugin/test/src/mill/testkit/UnitTests.scala

@@ -12,7 +12,6 @@ object UnitTests extends TestSuite {
 
       val resourceFolder = os.Path(sys.env("MILL_TEST_RESOURCE_FOLDER"))
       UnitTester(build, resourceFolder / "unit-test-project").scoped { eval =>
-
         // Evaluating tasks by direct reference
         val Right(result) = eval(build.resources)
         assert(

example/scalalib/basic/3-multi-module/foo/src/Foo.scala

@@ -2,8 +2,10 @@ package foo
 import mainargs.{main, ParserForMethods, arg}
 object Foo {
   @main
-  def main(@arg(name = "foo-text") fooText: String,
-           @arg(name = "bar-text") barText: String): Unit = {
+  def main(
+      @arg(name = "foo-text") fooText: String,
+      @arg(name = "bar-text") barText: String
+  ): Unit = {
     println("Foo.value: " + fooText)
     println("Bar.value: " + bar.Bar.generateHtml(barText))
   }

example/scalalib/basic/4-builtin-commands/foo/src/Foo.scala

@@ -4,8 +4,10 @@ object Foo {
   val value = "hello"
 
   @main
-  def main(@arg(name = "foo-text") fooText: String,
-           @arg(name = "bar-text") barText: String): Unit = {
+  def main(
+      @arg(name = "foo-text") fooText: String,
+      @arg(name = "bar-text") barText: String
+  ): Unit = {
     println("Foo.value: " + Foo.value)
     bar.Bar.printText(barText)
   }

example/scalalib/builds/1-common-config/custom-src/Foo2.scala

@@ -18,4 +18,3 @@ object Foo2 {
     if (sys.env.contains("MY_CUSTOM_ENV")) println("MY_CUSTOM_ENV: " + sys.env("MY_CUSTOM_ENV"))
   }
 }
-

example/scalalib/builds/4-nested-modules/baz/src/Baz.scala

@@ -4,10 +4,12 @@ import mainargs.{main, ParserForMethods, arg}
 
 object Baz {
   @main
-  def main(@arg(name = "bar-text") barText: String,
-           @arg(name = "qux-text") quxText: String,
-           @arg(name = "foo-text") fooText: String,
-           @arg(name = "baz-text") bazText: String): Unit = {
+  def main(
+      @arg(name = "bar-text") barText: String,
+      @arg(name = "qux-text") quxText: String,
+      @arg(name = "foo-text") fooText: String,
+      @arg(name = "baz-text") bazText: String
+  ): Unit = {
     foo.Foo.main(barText, quxText, fooText)
 
     val value = p(bazText)

example/scalalib/builds/4-nested-modules/foo/qux/src/Qux.scala

@@ -4,8 +4,10 @@ import mainargs.{main, ParserForMethods, arg}
 
 object Qux {
   @main
-  def main(@arg(name = "bar-text") barText: String,
-           @arg(name = "qux-text") quxText: String): Unit = {
+  def main(
+      @arg(name = "bar-text") barText: String,
+      @arg(name = "qux-text") quxText: String
+  ): Unit = {
     foo.bar.Bar.main(barText)
 
     val value = p(quxText)

example/scalalib/builds/4-nested-modules/foo/src/Foo.scala

@@ -4,9 +4,11 @@ import mainargs.{main, ParserForMethods, arg}
 
 object Foo {
   @main
-  def main(@arg(name = "bar-text") barText: String,
-           @arg(name = "qux-text") quxText: String,
-           @arg(name = "foo-text") fooText: String): Unit = {
+  def main(
+      @arg(name = "bar-text") barText: String,
+      @arg(name = "qux-text") quxText: String,
+      @arg(name = "foo-text") fooText: String
+  ): Unit = {
     foo.qux.Qux.main(barText, quxText)
 
     val value = p(fooText)

example/scalalib/module/5-resources/foo/test/src/FooTests.scala

@@ -19,7 +19,7 @@ object FooTests extends TestSuite {
       // Use `MILL_TEST_RESOURCE_FOLDER` to list files available in resource folder
       assert(
         os.list(testFileResourceDir).sorted ==
-        Seq(testFileResourceDir / "test-file-a.txt", testFileResourceDir / "test-file-b.txt")
+          Seq(testFileResourceDir / "test-file-a.txt", testFileResourceDir / "test-file-b.txt")
       )
 
       // Use the `OTHER_FILES_FOLDER` configured in your build to access the

example/scalalib/module/7-docjar/bar/src/Bar.scala

@@ -1,4 +1,5 @@
 package bar
+
 /**
  * My Awesome Docs for class Bar
  */

example/scalalib/web/4-webapp-scalajs/client/src/ClientApp.scala

@@ -1,6 +1,6 @@
 package client
 import org.scalajs.dom
-object ClientApp{
+object ClientApp {
   var state = "all"
   var todoApp = dom.document.getElementsByClassName("todoapp")(0)
 
@@ -11,7 +11,7 @@ object ClientApp{
         method = dom.HttpMethod.POST
       }
     ).then[String](response => response.text())
-      .then[Unit]{ text =>
+      .then[Unit] { text =>
         todoApp.innerHTML = text
         initListeners()
       }
@@ -45,19 +45,20 @@ object ClientApp{
     bindEvent("todo-completed", s"/list/completed", Some("completed"))
     bindEvent("clear-completed", s"/clear-completed/$state", None)
 
-    val newTodoInput = dom.document.getElementsByClassName("new-todo")(0).asInstanceOf[dom.HTMLInputElement]
+    val newTodoInput =
+      dom.document.getElementsByClassName("new-todo")(0).asInstanceOf[dom.HTMLInputElement]
     newTodoInput.addEventListener(
       "keydown",
       (evt: dom.KeyboardEvent) => {
-        if (evt.keyCode == 13){
+        if (evt.keyCode == 13) {
           dom.fetch(
             s"/add/$state",
             new dom.RequestInit {
               method = dom.HttpMethod.POST
               body = newTodoInput.value
             }
           ).then[String](response => response.text())
-            .then[Unit]{text =>
+            .then[Unit] { text =>
               newTodoInput.value = ""
               todoApp.innerHTML = text
               initListeners()

example/scalalib/web/5-webapp-scalajs-shared/client/src/ClientApp.scala

@@ -1,7 +1,7 @@
 package client
 import org.scalajs.dom
 import shared.{Todo, Shared}
-object ClientApp{
+object ClientApp {
   var state = "all"
   var todoApp = dom.document.getElementsByClassName("todoapp")(0)
 
@@ -12,7 +12,7 @@ object ClientApp{
         method = dom.HttpMethod.POST
       }
     ).`then`[String](response => response.text())
-      .`then`[Unit]{ text =>
+      .`then`[Unit] { text =>
         todoApp.innerHTML = Shared
           .renderBody(upickle.default.read[Seq[Todo]](text), state)
           .render
@@ -49,19 +49,20 @@ object ClientApp{
     bindEvent("todo-completed", s"/list/completed", Some("completed"))
     bindEvent("clear-completed", s"/clear-completed/$state", None)
 
-    val newTodoInput = dom.document.getElementsByClassName("new-todo")(0).asInstanceOf[dom.HTMLInputElement]
+    val newTodoInput =
+      dom.document.getElementsByClassName("new-todo")(0).asInstanceOf[dom.HTMLInputElement]
     newTodoInput.addEventListener(
       "keydown",
       (evt: dom.KeyboardEvent) => {
-        if (evt.keyCode == 13){
+        if (evt.keyCode == 13) {
           dom.fetch(
             s"/add/$state",
             new dom.RequestInit {
               method = dom.HttpMethod.POST
               body = newTodoInput.value
             }
           ).`then`[String](response => response.text())
-            .`then`[Unit]{text =>
+            .`then`[Unit] { text =>
               newTodoInput.value = ""
 
               todoApp.innerHTML = Shared
@@ -75,6 +76,5 @@ object ClientApp{
     )
   }
 
-
   def main(args: Array[String]): Unit = initListeners()
 }

example/scalalib/web/5-webapp-scalajs-shared/shared/src/Shared.scala

@@ -8,7 +8,7 @@ object Todo {
   implicit def todoRW: upickle.default.ReadWriter[Todo] = upickle.default.macroRW[Todo]
 }
 
-object Shared{
+object Shared {
   def renderBody(todos: Seq[Todo], state: String) = {
     val filteredTodos = state match {
       case "all" => todos.zipWithIndex

scalajslib/test/resources/esModuleRemap/src/app/App.scala

@@ -1,9 +1,9 @@
 package app
 
 import scala.scalajs.js
-import scala.scalajs.js.annotation._ 
+import scala.scalajs.js.annotation._
 
-object App {  
+object App {
   def main(args: Array[String]): Unit = {
     println(linspace(-10.0, 10.0, 10))
   }

scalalib/test/resources/assembly/src/Main.scala

@@ -14,4 +14,4 @@ object Main {
   }
 
   def main(args: Array[String]): Unit = ParserForMethods(this).runOrExit(args)
-}
+}

scalanativelib/test/resources/hello-native-world/build/test/src/utest/tests/MainTests.scala

@@ -21,11 +21,14 @@ object MainTests extends TestSuite {
       test("resource") {
         val expected = new java.util.ArrayList[Path]()
         expected.add(Paths.get(sys.env("MILL_TEST_RESOURCE_FOLDER") + "/hello-resource.txt"))
-        val listed = Files.list(Paths.get(sys.env("MILL_TEST_RESOURCE_FOLDER"))).collect(Collectors.toList())
+        val listed =
+          Files.list(Paths.get(sys.env("MILL_TEST_RESOURCE_FOLDER"))).collect(Collectors.toList())
         assert(listed == expected)
         assert(
-          Files.readString(Paths.get(sys.env("MILL_TEST_RESOURCE_FOLDER") + "/hello-resource.txt")) ==
-          "hello world resource text"
+          Files.readString(
+            Paths.get(sys.env("MILL_TEST_RESOURCE_FOLDER") + "/hello-resource.txt")
+          ) ==
+            "hello world resource text"
         )
       }
     }