Format code (#3526)

Settings, see #3511

Pull request: #3526

bsp/package.mill

@@ -4,7 +4,6 @@ import mill._
 import mill.contrib.buildinfo.BuildInfo
 import mill.T
 
-
 object `package` extends RootModule with build.MillPublishScalaModule with BuildInfo {
   def compileModuleDeps = Seq(build.scalalib)
   def testModuleDeps = super.testModuleDeps ++ compileModuleDeps
@@ -33,7 +32,12 @@ object `package` extends RootModule with build.MillPublishScalaModule with Build
   }
 
   object worker extends build.MillPublishScalaModule {
-    def compileModuleDeps = Seq(build.bsp, build.scalalib, build.testrunner, build.runner) ++ build.scalalib.compileModuleDeps
+    def compileModuleDeps = Seq(
+      build.bsp,
+      build.scalalib,
+      build.testrunner,
+      build.runner
+    ) ++ build.scalalib.compileModuleDeps
     def ivyDeps = Agg(build.Deps.bsp4j, build.Deps.sbtTestInterface)
   }
 }

ci/package.mill

@@ -1 +1 @@
-package build.ci
+package build.ci

ci/shared.mill

@@ -1,4 +1,5 @@
 package build.ci
+
 /**
  * Utility code that is shared between our SBT build and our Mill build. SBT
  * calls this by shelling out to Ammonite in a subprocess, while Mill loads it

contrib/package.mill

@@ -160,7 +160,8 @@ object `package` extends RootModule {
 
   object buildinfo extends ContribModule {
     def compileModuleDeps = Seq(build.scalalib, build.scalajslib, build.scalanativelib)
-    def testModuleDeps = super.testModuleDeps ++ Seq(build.scalalib, build.scalajslib, build.scalanativelib)
+    def testModuleDeps =
+      super.testModuleDeps ++ Seq(build.scalalib, build.scalajslib, build.scalanativelib)
   }
 
   object proguard extends ContribModule {
@@ -233,7 +234,8 @@ object `package` extends RootModule {
     def testModuleDeps = super.testModuleDeps ++ Seq(build.scalalib)
     def buildInfoPackageName = "mill.contrib.errorprone"
     def buildInfoObjectName = "BuildInfo"
-    def buildInfoMembers = Seq(BuildInfo.Value("errorProneVersion", Deps.RuntimeDeps.errorProneCore.version))
+    def buildInfoMembers =
+      Seq(BuildInfo.Value("errorProneVersion", Deps.RuntimeDeps.errorProneCore.version))
   }
 
   object checkstyle extends ContribModule {

docs/package.mill

@@ -3,6 +3,7 @@ import mill.util.Jvm
 import mill._, scalalib._
 import build.contrib
 import de.tobiasroeser.mill.vcs.version.VcsVersion
+
 /** Generates the mill documentation with Antora. */
 object `package` extends RootModule {
   // This module isn't really a ScalaModule, but we use it to generate
@@ -36,7 +37,7 @@ object `package` extends RootModule {
   }
 
   def runAntora(npmDir: os.Path, workDir: os.Path, args: Seq[String])(implicit
-                                                                      ctx: mill.api.Ctx.Log
+      ctx: mill.api.Ctx.Log
   ) = {
 
     prepareAntora(npmDir)
@@ -102,11 +103,11 @@ object `package` extends RootModule {
   }
 
   def sanitizeAntoraYml(
-                         dest: os.Path,
-                         version: String,
-                         millVersion: String,
-                         millLastTag: String
-                       ): Unit = {
+      dest: os.Path,
+      version: String,
+      millVersion: String,
+      millLastTag: String
+  ): Unit = {
     val isPreRelease = (millVersion != millLastTag) || Seq("-M", "-RC").exists(millVersion.contains)
     val lines = os.read(dest / "antora.yml").linesIterator.map {
       case s"version:$_" =>
@@ -247,11 +248,11 @@ object `package` extends RootModule {
   }
 
   def sanitizeDevUrls(
-                       dir: os.Path,
-                       sourceDir: os.Path,
-                       newSourceDir: os.Path,
-                       baseDir: os.Path
-                     ): Unit = {
+      dir: os.Path,
+      sourceDir: os.Path,
+      newSourceDir: os.Path,
+      baseDir: os.Path
+  ): Unit = {
 
     val pathToRemove = sourceDir.relativeTo(baseDir).toString()
     val replacePath = newSourceDir.relativeTo(baseDir).toString()

integration/failure/compile-error/resources/bar.mill

@@ -14,4 +14,4 @@ def myScalaVersion = "2.13.8"
 
 println(doesntExist)
 
-// Scattered throughout
+// Scattered throughout

integration/failure/compile-error/resources/build.mill

@@ -6,4 +6,4 @@ object foo extends ScalaModule {
   def scalaVersion = bar.myScalaVersion
 }
 
-foo.noSuchMethod
+foo.noSuchMethod

integration/failure/compile-error/resources/qux.mill

@@ -1,4 +1,4 @@
 package build
 def myMsg = "<h1>world</h1>"
 
-def myOtherMsg = myMsg.substring("0")
+def myOtherMsg = myMsg.substring("0")

integration/failure/invalid-meta-module/resources/mill-build/build.mill

@@ -1,3 +1,3 @@
 package build
 import mill._
-object `package`
+object `package`

integration/failure/invalid-package-declaration/resources/sub-2/package.mill

@@ -1 +1 @@
-package `sub-2`
+package `sub-2`

integration/failure/invalid-subfolder-root-module/resources/build.mill

@@ -1 +1 @@
-package build
+package build

integration/failure/misnamed-root-module/resources/build.mill

@@ -1,4 +1,4 @@
 package build
 import mill._
 
-object foo extends RootModule
+object foo extends RootModule

integration/failure/module-init-error/resources/build.mill

@@ -1,22 +1,22 @@
 package build
 import mill._, scalalib._
 
-def rootTarget = T{ println("Running rootTarget"); "rootTarget" }
-def rootCommand(s: String) = T.command{ println(s"Running rootCommand $s") }
+def rootTarget = T { println("Running rootTarget"); "rootTarget" }
+def rootCommand(s: String) = T.command { println(s"Running rootCommand $s") }
 
-object foo extends Module{
-  def fooTarget = T{ println(s"Running fooTarget"); 123 }
-  def fooCommand(s: String) = T.command{ println(s"Running fooCommand $s") }
+object foo extends Module {
+  def fooTarget = T { println(s"Running fooTarget"); 123 }
+  def fooCommand(s: String) = T.command { println(s"Running fooCommand $s") }
   throw new Exception("Foo Boom")
 }
 
 object bar extends Module {
   def barTarget = T { println(s"Running barTarget"); "abc" }
-  def barCommand(s: String) = T.command{ println(s"Running barCommand $s") }
+  def barCommand(s: String) = T.command { println(s"Running barCommand $s") }
 
-  object qux extends Module{
+  object qux extends Module {
     def quxTarget = T { println(s"Running quxTarget"); "xyz" }
-    def quxCommand(s: String) = T.command{ println(s"Running quxCommand $s") }
+    def quxCommand(s: String) = T.command { println(s"Running quxCommand $s") }
     throw new Exception("Qux Boom")
   }
 }

integration/failure/module-outside-top-level-module/resources/build.mill

@@ -1,7 +1,6 @@
 package build
 import mill._
 
-
 object invalidModule extends Module
 
-object `package` extends RootModule
+object `package` extends RootModule

integration/failure/no-modules-in-helper-file/resources/build.mill

@@ -1 +1 @@
-package build
+package build

integration/failure/no-modules-in-helper-file/resources/helper.mill

@@ -1,3 +1,3 @@
 package build
 import mill._
-object foo extends Module
+object foo extends Module

integration/failure/parse-error/resources/build.mill

@@ -5,4 +5,3 @@ import $file.bar
 object foo extends ScalaModule {
   def scalaVersion = bar.myScalaVersion
 }
-

integration/failure/root-module-compile-error/resources/build.mill

@@ -7,4 +7,4 @@ object `package` extends RootModule with UnknownRootModule {
   def scalaVersion = unknownRootInternalDef
 }
 
-object after extends UnknownAfterModule
+object after extends UnknownAfterModule

integration/failure/root-module-compile-error/resources/foo/package.mill

@@ -7,4 +7,4 @@ object `package` extends RootModule with UnknownFooModule {
   def scalaVersion = unknownFooInternalDef
 }
 
-object after extends UnknownAfterFooModule
+object after extends UnknownAfterFooModule

integration/failure/root-subfolder-module-collision/resources/build.mill

@@ -1,4 +1,4 @@
 package build
 import mill._
 
-object sub extends Module
+object sub extends Module

integration/failure/subfolder-helper-module-collision/resources/build.mill

@@ -1 +1 @@
-package build
+package build

integration/failure/subfolder-helper-module-collision/resources/sub.mill

@@ -1 +1 @@
-package build
+package build

integration/failure/subfolder-missing-build-prefix/resources/build.mill

@@ -1,4 +1,4 @@
 package build
 import mill._
 
-val x = sub.y
+val x = sub.y

integration/failure/subfolder-missing-build-prefix/resources/sub/package.mill

@@ -1,6 +1,6 @@
 package build.sub
 
 import mill._
-object `package` extends RootModule{
+object `package` extends RootModule {
   def y = 1
 }

integration/failure/things-outside-top-level-module/resources/build.mill

@@ -3,5 +3,4 @@ import mill._
 
 def invalidTarget = 123
 
-
-object `package` extends RootModule
+object `package` extends RootModule

integration/feature/import-ivy-worker-invalidation/resources/build.mill

@@ -14,4 +14,4 @@ import mill.playlib._
 object app extends PlayApiModule {
   def scalaVersion = "2.13.10"
   def playVersion = "2.8.19"
-}
+}

integration/feature/scoverage/resources/build.mill

@@ -30,4 +30,4 @@ object extra extends ScalaModule with ScoverageModule {
   override lazy val scoverage: ScoverageData = new ScoverageData {
     // some customizations
   }
-}
+}

integration/feature/shutdown-exit-code/resources/build.mill

@@ -0,0 +1 @@
+

integration/feature/subprocess-stdout/resources/build.mill

@@ -2,7 +2,6 @@ package build
 import scala.util.Properties
 import mill._
 
-
 def inheritInterleaved = T {
   for (i <- Range.inclusive(1, 9)) {
     println("print stdout" + i)
@@ -18,7 +17,7 @@ def inheritInterleaved = T {
   }
 }
 
-def inheritRaw = T{
+def inheritRaw = T {
   println("print stdoutRaw")
   val echoCommandStdoutRaw =
     if (Properties.isWin) Seq("cmd.exe", "/C", "echo proc stdoutRaw")
@@ -29,4 +28,4 @@ def inheritRaw = T{
     if (Properties.isWin) Seq("cmd.exe", "/C", "echo proc stderrRaw>&2")
     else Seq("bash", "-c", "echo proc stderrRaw >&2")
   os.proc(echoCommandStderrRaw).call(stderr = os.InheritRaw)
-}
+}

integration/ide/gen-idea/resources/extended/mill-build/build.mill

@@ -3,4 +3,4 @@ import mill.scalalib._
 
 object `package` extends MillBuildRootModule {
   def ivyDeps = Agg(ivy"org.scalameta::munit:0.7.29")
-}
+}

integration/ide/gen-idea/resources/hello-idea/build.mill

@@ -57,4 +57,4 @@ object moduleE extends JavaModule
 object moduleF extends JavaModule {
   override def compileModuleDeps = Seq(moduleC)
   override def moduleDeps = Seq(moduleB, moduleA)
-}
+}

integration/invalidation/codesig-hello/resources/build.mill

@@ -4,4 +4,4 @@ import mill._
 val valueFoo = 0
 val valueFooUsedInBar = 0
 def helperFoo = { println("running helperFoo"); 1 + valueFoo }
-def foo = T{ println("running foo"); helperFoo }
+def foo = T { println("running foo"); helperFoo }

integration/invalidation/codesig-nested/resources/build.mill

@@ -4,37 +4,39 @@ import mill._
 val valueFoo = 0
 val valueFooUsedInBar = 0
 def helperFoo = { println("running helperFoo"); 1 + valueFoo }
-def foo = T{ println("running foo"); helperFoo }
+def foo = T { println("running foo"); helperFoo }
 
-object outer extends Module{
+object outer extends Module {
   val valueBar = 0
   val valueBarUsedInQux = 0
   def helperBar = { println("running helperBar"); 20 }
-  def bar = T{ println("running bar"); helperBar + valueBar + valueFooUsedInBar }
+  def bar = T { println("running bar"); helperBar + valueBar + valueFooUsedInBar }
 
-  trait InnerModule extends Module{
+  trait InnerModule extends Module {
     val valueQux = 0
     def helperQux = { println("running helperQux"); 300 + valueQux + valueBarUsedInQux }
-    def qux = T{ println("running qux"); foo() + bar() + helperQux }
+    def qux = T { println("running qux"); foo() + bar() + helperQux }
   }
   object inner extends InnerModule
 }
 
-trait TraitOuter extends Module{
+trait TraitOuter extends Module {
   val valueTraitOuter = 0
   def helperTraitOuter = { println("running helperTraitOuter"); 300 + valueTraitOuter }
-  def outer = T{ println("running outer"); foo() + helperTraitOuter }
+  def outer = T { println("running outer"); foo() + helperTraitOuter }
 
-  object traitInner extends Module{
+  object traitInner extends Module {
     val valueTraitInner = 0
-    def helperTraitInner = { println("running helperTraitInner"); 300 + valueTraitOuter + valueTraitInner }
-    def inner = T{ println("running inner"); foo() + outer() + helperTraitInner }
+    def helperTraitInner = {
+      println("running helperTraitInner"); 300 + valueTraitOuter + valueTraitInner
+    }
+    def inner = T { println("running inner"); foo() + outer() + helperTraitInner }
   }
 }
 
 object traitOuter extends TraitOuter
 
 object crossOuter extends Cross[CrossOuter](1337, 31337, 31415926)
-trait CrossOuter extends TraitOuter with Cross.Module[Int]{
+trait CrossOuter extends TraitOuter with Cross.Module[Int] {
   override val valueTraitOuter = crossValue
 }

integration/invalidation/codesig-scalamodule/resources/build.mill

@@ -4,7 +4,7 @@ import mill._, scalalib._
 object foo extends ScalaModule {
   def scalaVersion = "2.13.8"
 
-  def sources = T{
+  def sources = T {
     println("Foo generating sources...")
     os.write(
       T.dest / "Foo.scala",
@@ -91,4 +91,4 @@ object qux extends ScalaModule {
     println("Qux assembly...")
     super.assembly()
   }
-}
+}

integration/invalidation/multi-level-editing/resources/mill-build/build.mill

@@ -2,7 +2,7 @@ package build
 import $meta._
 import mill._, scalalib._
 
-object `package` extends MillBuildRootModule{
+object `package` extends MillBuildRootModule {
   def ivyDeps = Agg(ivy"com.lihaoyi::scalatags:${constant.MetaConstant.scalatagsVersion}")
 
   def generatedSources = T {
@@ -16,4 +16,4 @@ object `package` extends MillBuildRootModule{
     )
     super.generatedSources() ++ Seq(PathRef(T.dest / "Constant.scala"))
   }
-}
+}