Upgrade Scalafmt

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "2.0.0"
+version = "2.4.2"
 assumeStandardLibraryStripMargin = true
 align = none
 project.git = true

build.sbt

@@ -13,9 +13,7 @@ inThisBuild(
     scalaVersion := scala212,
     scalacOptions += "-Yrangepos",
     organization := "com.geirsson",
-    version ~= { old =>
-      old.replace('+', '-')
-    },
+    version ~= { old => old.replace('+', '-') },
     licenses := Seq(
       "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")
     ),

metaconfig-core/shared/src/main/scala/metaconfig/Conf.scala

@@ -107,9 +107,7 @@ object Conf {
     ): Configured[Option[T]] =
       ConfGet
         .getKey(this, path +: extraNames)
-        .map(
-          value => ev.read(value).map(Some(_))
-        )
+        .map(value => ev.read(value).map(Some(_)))
         .getOrElse(Configured.Ok(None))
   }
   object Obj {

metaconfig-core/shared/src/main/scala/metaconfig/Input.scala

@@ -23,7 +23,8 @@ sealed abstract class Input(val path: String, val text: String)
         buf += (i + 1)
       i += 1
     }
-    if (buf.last != chars.length) buf += chars.length // sentinel value used for binary search
+    if (buf.last != chars.length)
+      buf += chars.length // sentinel value used for binary search
     buf.toArray
   }
 

metaconfig-core/shared/src/main/scala/metaconfig/cli/CliApp.scala

@@ -47,9 +47,7 @@ case class CliApp(
               case Ok(value) =>
                 command.run(value, app)
               case NotOk(error) =>
-                error.all.foreach { message =>
-                  app.error(message)
-                }
+                error.all.foreach { message => app.error(message) }
                 1
             }
           case None =>

metaconfig-core/shared/src/main/scala/metaconfig/cli/TabCompleteCommand.scala

@@ -45,8 +45,8 @@ object TabCompleteCommand extends Command[TabCompleteOptions]("tab-complete") {
       case flag :: last :: Nil => Some(flag)
       case _ => None
     }
-    val setting = secondLast.flatMap(
-      flag => inlined.get(Case.kebabToCamel(flag.stripPrefix("--")))
+    val setting = secondLast.flatMap(flag =>
+      inlined.get(Case.kebabToCamel(flag.stripPrefix("--")))
     )
     val context = TabCompletionContext(
       options.format,
@@ -63,9 +63,7 @@ object TabCompleteCommand extends Command[TabCompleteOptions]("tab-complete") {
     }
   }
   private def renderCompletions(items: List[String], app: CliApp): Unit = {
-    items.foreach { item =>
-      renderCompletion(TabCompletionItem(item), app)
-    }
+    items.foreach { item => renderCompletion(TabCompletionItem(item), app) }
   }
 
   private def renderCompletion(item: TabCompletionItem, app: CliApp): Unit = {

metaconfig-core/shared/src/main/scala/metaconfig/internal/ConfGet.scala

@@ -54,7 +54,8 @@ object ConfGet {
       if (chars(i) == '\n') buf += (i + 1)
       i += 1
     }
-    if (buf.last != chars.length) buf += chars.length // sentinel value used for binary search
+    if (buf.last != chars.length)
+      buf += chars.length // sentinel value used for binary search
     buf.toArray
   }
 

metaconfig-core/shared/src/main/scala/metaconfig/internal/Macros.scala

@@ -167,7 +167,8 @@ class Macros(val c: blackbox.Context) {
             Nil
           }
 
-        val finalAnnots = repeated ::: dynamic ::: flag ::: tabCompletePath ::: baseAnnots
+        val finalAnnots =
+          repeated ::: dynamic ::: flag ::: tabCompletePath ::: baseAnnots
         val fieldsParamTpe = c.internal.typeRef(
           NoPrefix,
           weakTypeOf[Surface[_]].typeSymbol,

metaconfig-tests/jvm/src/test/scala/metaconfig/CodecRoundtripSuite.scala

@@ -12,15 +12,11 @@ class CodecRoundtripSuite extends munit.ScalaCheckSuite {
   }
 
   property("roundtrip AllTheAnnotations") {
-    forAll { a: AllTheAnnotations =>
-      checkRoundtrip(a)
-    }
+    forAll { a: AllTheAnnotations => checkRoundtrip(a) }
   }
 
   property("roundtrip Outer") {
-    forAll { a: Outer =>
-      checkRoundtrip(a)
-    }
+    forAll { a: Outer => checkRoundtrip(a) }
   }
 
 }

metaconfig-tests/jvm/src/test/scala/metaconfig/sconfig/HoconPrinterRoundtripSuite.scala

@@ -35,8 +35,6 @@ class HoconPrinterRoundtripSuite extends munit.ScalaCheckSuite {
   )
 
   property("roundtrip") {
-    forAll { conf: ConfShow =>
-      assertRoundtrip(conf.str)
-    }
+    forAll { conf: ConfShow => assertRoundtrip(conf.str) }
   }
 }

metaconfig-tests/jvm/src/test/scala/metaconfig/sconfig/SconfigPropertySuite.scala

@@ -34,8 +34,6 @@ class SconfigPropertySuite extends munit.ScalaCheckSuite {
   )
 
   property("roundtrip") {
-    forAll { (a: ConfShow, b: ConfShow) =>
-      assertRoundtrip(a.str, b.str)
-    }
+    forAll { (a: ConfShow, b: ConfShow) => assertRoundtrip(a.str, b.str) }
   }
 }

metaconfig-tests/jvm/src/test/scala/metaconfig/typesafeconfig/HoconPrinterRoundtripSuite.scala

@@ -21,9 +21,7 @@ class HoconPrinterRoundtripSuite extends munit.ScalaCheckSuite {
     }
 
   property("roundtrip") {
-    forAll { conf: ConfShow =>
-      assertRoundtrip(conf.str)
-    }
+    forAll { conf: ConfShow => assertRoundtrip(conf.str) }
   }
   ignore(
     """

metaconfig-tests/jvm/src/test/scala/metaconfig/typesafeconfig/TypesafeConfigPropertySuite.scala

@@ -22,9 +22,7 @@ class TypesafeConfigPropertySuite extends munit.ScalaCheckSuite {
   }
 
   property("roundtrip") {
-    forAll { (a: ConfShow, b: ConfShow) =>
-      assertRoundtrip(a.str, b.str)
-    }
+    forAll { (a: ConfShow, b: ConfShow) => assertRoundtrip(a.str, b.str) }
   }
 
   check(

metaconfig-tests/shared/src/test/scala/metaconfig/DeriveSurfaceSuite.scala

@@ -70,25 +70,19 @@ class DeriveSurfaceSuite extends munit.FunSuite {
     assert(settings.settings.length == 4)
     val notIterable :: tail = settings.settings
     assert(!notIterable.isRepeated)
-    tail.foreach { setting =>
-      assert(setting.isRepeated, setting.name)
-    }
+    tail.foreach { setting => assert(setting.isRepeated, setting.name) }
   }
 
   case class CustomTypePrinting(a: Int, b: Option[Int], c: List[String])
   test("tprint") {
     import pprint.TPrint
     implicit val intPrint = TPrint.literal[Int]("number")
     implicit def optionPrint[T](implicit ev: TPrint[T]): TPrint[Option[T]] =
-      TPrint.make { implicit colors =>
-        "(" + ev.render + ")"
-      }
+      TPrint.make { implicit colors => "(" + ev.render + ")" }
     implicit def iterablePrint[C[x] <: Iterable[x], T](
         implicit ev: TPrint[T]
     ): TPrint[C[T]] =
-      TPrint.make { implicit colors =>
-        "[" + ev.render + " ...]"
-      }
+      TPrint.make { implicit colors => "[" + ev.render + " ...]" }
     implicit val surface = generic.deriveSurface[CustomTypePrinting]
     val a :: b :: c :: Nil = Settings[CustomTypePrinting].settings
     assert(a.tpe == "number")