chore: update scalafmt config

Author: hugo-vrijswijk

.scalafmt.conf

@@ -19,9 +19,7 @@ newlines.topLevelStatementBlankLines = [
 
 onTestFailure = "To fix this, run './bin/scalafmt' from the project root directory"
 
-# Mill plugin integration-test fixtures are verbatim Mill projects, not project sources
 project.excludePaths = [
-  "glob:**/modules/mill/src/mill-test/**",
   "glob:**/target/**",
   "glob:**/src_managed/*"
 ]
@@ -30,13 +28,13 @@ fileOverride {
   "glob:**/core/src/test/resources/scalaFiles/scala3File.scala" {
     runner.dialect = Scala3
   }
-  "glob:**/src/*/scala-3/**.scala" {
+  "glob:**/src/*/scala-3/**" {
     runner.dialect = Scala3
   }
-  "glob:**/modules/mill/src/**.scala" {
+  "glob:**/modules/{mill,commandRunner}/src/**" {
     runner.dialect = Scala3
   }
-  "glob:**/maven/src/**.scala" {
+  "glob:**/maven/src/**" {
     runner.dialect = Scala3
   }
 }

bin/scalafmt

@@ -27,10 +27,10 @@ class Slf4jLogger() extends Logger {
       onWarn: => Unit,
       onError: => Unit
   ): Unit = level match {
-    case Level.Debug => if (slf4jLogger.isDebugEnabled()) onDebug
-    case Level.Info  => if (slf4jLogger.isInfoEnabled()) onInfo
-    case Level.Warn  => if (slf4jLogger.isWarnEnabled()) onWarn
-    case Level.Error => if (slf4jLogger.isErrorEnabled()) onError
+    case Level.Debug => if slf4jLogger.isDebugEnabled() then onDebug
+    case Level.Info  => if slf4jLogger.isInfoEnabled() then onInfo
+    case Level.Warn  => if slf4jLogger.isWarnEnabled() then onWarn
+    case Level.Error => if slf4jLogger.isErrorEnabled() then onError
   }
 
 }

modules/commandRunner/src/main/scala/stryker4s/log/Slf4jLogger.scala

@@ -25,8 +25,8 @@ class TestProcessRunner(initialTestRunSuccess: Boolean, testRunExitCode: Try[Int
   override def apply(command: Command, workingDir: Path, envVar: (String, String)*)(implicit
       config: Config
   ): IO[Try[Int]] = {
-    if (envVar.isEmpty) {
-      IO.pure(Success(if (initialTestRunSuccess) 0 else 1))
+    if envVar.isEmpty then {
+      IO.pure(Success(if initialTestRunSuccess then 0 else 1))
     } else {
       val _ = timesCalled.next()
       IO.pure(testRunExitCode(envVar.map(_._2).head.toInt))

modules/commandRunner/src/test/scala/stryker4s/testutil/stubs/TestProcessRunner.scala

@@ -1,10 +1,11 @@
 //| mvnDeps:
 //| - io.stryker-mutator::mill-stryker4s::@STRYKER4S_VERSION@
 package build
+
 import mill.*, scalalib.*
 import stryker4s.mill.Stryker4sModule
 
-object foo extends ScalaModule, Stryker4sModule {
+object foo extends ScalaModule with Stryker4sModule {
   def scalaVersion = "3.3.8"
 
   // Sanity-check that build-tool config overrides are picked up. The sample scores ~66%, so a