diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f0b9c4..c24aba3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ jobs: submodules: true - uses: VirtusLab/scala-cli-setup@v1 - run: scala-cli fmt . --check + - run: ./mill -i mill.scalalib.scalafmt/checkFormatAll scalafix: timeout-minutes: 15 diff --git a/.gitignore b/.gitignore index 5ea7f48..9b0f8e9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ out/ .metals .vscode .bloop +.scala-build diff --git a/.scalafmt.conf b/.scalafmt.conf index af91ba2..1717a3d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -12,7 +12,16 @@ newlines.beforeMultiline = keep newlines.afterCurlyLambdaParams = keep newlines.alwaysBeforeElseAfterCurlyIf = true -runner.dialect = scala3 +runner.dialect = scala213 + +fileOverride { + "glob:**/*.mill" { + runner.dialect = scala3 + } + "glob:**/*.sc" { + runner.dialect = scala3 + } +} rewrite.rules = [ RedundantBraces diff --git a/cli/src/org/scalajs/cli/Scalajsld.scala b/cli/src/org/scalajs/cli/Scalajsld.scala index 0d0a82a..6e67234 100644 --- a/cli/src/org/scalajs/cli/Scalajsld.scala +++ b/cli/src/org/scalajs/cli/Scalajsld.scala @@ -153,8 +153,9 @@ object Scalajsld { opt[String]("moduleSplitStyle") .action((x, c) => c.copy(moduleSplitStyle = x)) .text( - "Module splitting style " + ModuleSplitStyleRead.All - .mkString("(", ", ", ")") + "Module splitting style " + + ModuleSplitStyleRead.All + .mkString("(", ", ", ")") ) opt[Seq[String]]("smallModuleForPackages") .valueName(",...")