diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 27230e9..7518c3b 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # scalafmt changes b128c8a617dfc391b17e0c6422bc07bf4ad9356b + +# Scala Steward: Reformat with scalafmt 3.8.4-RC4 +4d04349e2de81bd5f4823e5283961bf07ca3b69e diff --git a/.scalafmt.conf b/.scalafmt.conf index 4cc3c4a..1f3b552 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=3.8.4-RC3 +version=3.8.4-RC4 assumeStandardLibraryStripMargin = true align.preset = none diff --git a/metaconfig-core/shared/src/main/scala/metaconfig/internal/HoconPrinter.scala b/metaconfig-core/shared/src/main/scala/metaconfig/internal/HoconPrinter.scala index 055cd6d..c54c198 100644 --- a/metaconfig-core/shared/src/main/scala/metaconfig/internal/HoconPrinter.scala +++ b/metaconfig-core/shared/src/main/scala/metaconfig/internal/HoconPrinter.scala @@ -36,8 +36,9 @@ object HoconPrinter { case Conf.Obj(obj) => val flattened = obj.map { case (k, v) => (k, flatten(v)) } val next = flattened.flatMap { - case (key, Conf.Obj(nested)) => nested - .map { case (k, v) => s"${quote(key)}.$k" -> v } + case (key, Conf.Obj(nested)) => nested.map { case (k, v) => + s"${quote(key)}.$k" -> v + } case (key, value) => (quote(key), value) :: Nil } Conf.Obj(next) diff --git a/metaconfig-pprint/shared/src/main/scala-3/metaconfig/pprint/TPrintImpl.scala b/metaconfig-pprint/shared/src/main/scala-3/metaconfig/pprint/TPrintImpl.scala index 6934f0e..b1e8010 100644 --- a/metaconfig-pprint/shared/src/main/scala-3/metaconfig/pprint/TPrintImpl.scala +++ b/metaconfig-pprint/shared/src/main/scala-3/metaconfig/pprint/TPrintImpl.scala @@ -88,9 +88,9 @@ object TPrintLowPri { object RefinedType { def unapply(tpe: TypeRepr): Option[(TypeRepr, List[(String, TypeRepr)])] = tpe match { - case Refinement(p, i, b) => unapply(p) - .map { case (pp, bs) => (pp, (i -> b) :: bs) } - .orElse(Some((p, (i -> b) :: Nil))) + case Refinement(p, i, b) => unapply(p).map { case (pp, bs) => + (pp, (i -> b) :: bs) + }.orElse(Some((p, (i -> b) :: Nil))) case _ => None } }