Merge pull request #1169 from scala-steward/update/3.0.x/patches

mkurz · web-flow · commit 487cdbd224cb · 2025-06-10T12:59:51.000+02:00
[3.0.x] Patch updates
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -15,3 +15,6 @@ aea577073fb21a3abae14915dc7c556e13592c16
 
 # Scala Steward: Reformat with scalafmt 3.8.6
 d8bad178bf2c2e6648f67a2094a15e3c4ed17613
+
+# Scala Steward: Reformat with scalafmt 3.9.7
+b660a2f6013796c6f9a5edfe7fce3a93e83b235e
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.9.6
+version = 3.9.7
 runner.dialect = Scala213Source3
 
 align.preset = true
diff --git a/build.sbt b/build.sbt
@@ -22,12 +22,12 @@ def specs2(scalaVersion: String) =
   }
 
 val jacksonDatabindVersion = "2.14.3"
-val jacksonDatabind = Seq(
+val jacksonDatabind        = Seq(
   "com.fasterxml.jackson.core" % "jackson-databind" % jacksonDatabindVersion
 )
 
 val jacksonVersion = "2.14.3"
-val jacksons = Seq(
+val jacksons       = Seq(
   "com.fasterxml.jackson.core"     % "jackson-core",
   "com.fasterxml.jackson.core"     % "jackson-annotations",
   "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8",
@@ -173,7 +173,7 @@ lazy val `play-json` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
       Compile / sourceGenerators += Def.task {
         val dir = (Compile / sourceManaged).value
 
-        val file = dir / "Generated.scala"
+        val file            = dir / "Generated.scala"
         val (writes, reads) = 1
           .to(22)
           .map { i =>
@@ -279,7 +279,7 @@ lazy val benchmarks = project
   .settings(publish / skip := true)
   .dependsOn(`play-jsonJVM`)
 
-val docsP = LocalProject("docs")
+val docsP     = LocalProject("docs")
 lazy val docs = project
   .in(file("docs"))
   .enablePlugins(PlayDocsPlugin)
@@ -288,7 +288,7 @@ lazy val docs = project
   .settings(
     publish / skip := true,
     libraryDependencies ++= specs2(scalaVersion.value),
-    PlayDocsKeys.validateDocs := (if (isScala3.value) () else PlayDocsKeys.validateDocs.value),
+    PlayDocsKeys.validateDocs                 := (if (isScala3.value) () else PlayDocsKeys.validateDocs.value),
     PlayDocsKeys.scalaManualSourceDirectories := {
       val base = baseDirectory.value / "manual" / "working" / "scalaGuide"
       val code = (base ** "code").get
diff --git a/play-json/js-native/src/main/scala/StaticBindingNonJvm.scala b/play-json/js-native/src/main/scala/StaticBindingNonJvm.scala
@@ -82,7 +82,7 @@ private[json] object StaticBindingNonJvm {
       }
 
       case JsObject(fields) => {
-        val il = ilevel + 1
+        val il              = ilevel + 1
         val (before, after) = if (newline) {
           s"\n${indent(il)}" -> s"\n${indent(ilevel)}}"
         } else indent(il) -> "}"
diff --git a/play-json/jvm/src/main/scala/play/api/libs/json/EnvReads.scala b/play-json/jvm/src/main/scala/play/api/libs/json/EnvReads.scala
@@ -74,7 +74,7 @@ trait EnvReads {
         case JsString(s) =>
           parseJDate(pattern, corrector(s)) match {
             case Some(d) => JsSuccess(d)
-            case None =>
+            case None    =>
               JsError(
                 Seq(
                   JsPath ->
@@ -137,7 +137,7 @@ trait EnvReads {
           case _                 => mini        -> parseJDate(mini, s)
         }) match {
           case (_, Some(d)) => JsSuccess(d)
-          case (p, None) =>
+          case (p, None)    =>
             JsError(
               Seq(
                 JsPath ->
@@ -284,7 +284,7 @@ trait EnvReads {
       case JsString(s) =>
         p(parsing).parse(corrector(s)) match {
           case Some(d) => JsSuccess(d)
-          case None =>
+          case None    =>
             JsError(
               Seq(
                 JsPath ->
@@ -371,7 +371,7 @@ trait EnvReads {
       case JsString(s) =>
         p(parsing).parse(corrector(s)) match {
           case Some(d) => JsSuccess(d)
-          case None =>
+          case None    =>
             JsError(
               Seq(
                 JsPath ->
@@ -463,7 +463,7 @@ trait EnvReads {
         case JsString(s) =>
           p(parsing).parse(corrector(s)) match {
             case Some(d) => JsSuccess(d)
-            case _ =>
+            case _       =>
               JsError(
                 Seq(
                   JsPath ->
@@ -552,7 +552,7 @@ trait EnvReads {
         case JsString(s) =>
           p(parsing).parse(corrector(s)) match {
             case Some(d) => JsSuccess(d)
-            case _ =>
+            case _       =>
               JsError(
                 Seq(
                   JsPath ->
diff --git a/play-json/jvm/src/main/scala/play/api/libs/json/jackson/JacksonJson.scala b/play-json/jvm/src/main/scala/play/api/libs/json/jackson/JacksonJson.scala
@@ -145,7 +145,7 @@ private[jackson] case class KeyRead(content: ListBuffer[(String, JsValue)], fiel
 
 // Context for reading one item of an Object (we already red fieldName)
 private[jackson] case class ReadingMap(content: ListBuffer[(String, JsValue)]) extends DeserializerContext {
-  def setField(fieldName: String) = KeyRead(content, fieldName)
+  def setField(fieldName: String)                   = KeyRead(content, fieldName)
   def addValue(value: JsValue): DeserializerContext =
     throw new Exception("Cannot add a value on an object without a key, malformed JSON object!")
 }
diff --git a/play-json/jvm/src/test/scala-3/play/api/libs/json/JsonMemoryFootprintSpec.scala b/play-json/jvm/src/test/scala-3/play/api/libs/json/JsonMemoryFootprintSpec.scala
@@ -82,7 +82,7 @@ class JsonMemoryFootprintSpec extends AnyFreeSpec {
     val layout1  = GraphLayout.parseInstance(a)
     val layout2  = GraphLayout.parseInstance(a)
     val distinct = layout1.subtract(layout2) // shared singletons don't count.
-    val clue =
+    val clue     =
       s"""$a:
          |${distinct.toFootprint}
          |${distinct.toPrintable}""".stripMargin
diff --git a/play-json/jvm/src/test/scala/play/api/libs/json/JsObjectSerializationSpec.scala b/play-json/jvm/src/test/scala/play/api/libs/json/JsObjectSerializationSpec.scala
@@ -17,7 +17,7 @@ class JsObjectSerializationSpec extends Specification {
         "field2" -> "abc",
         "field3" -> JsNull,
         "obj"    -> Json.obj("field1" -> 234),
-        "arr" -> JsArray(
+        "arr"    -> JsArray(
           Seq(
             JsString("abc"),
             JsNumber(123),
diff --git a/play-json/jvm/src/test/scala/play/api/libs/json/JsonSpec.scala b/play-json/jvm/src/test/scala/play/api/libs/json/JsonSpec.scala
@@ -73,7 +73,7 @@ class JsonSpec extends org.specs2.mutable.Specification {
   val preserveZeroDecimal: JsonConfig = {
     val defaultSerializerSettings = JsonConfig.settings.bigDecimalSerializerConfig
     val defaultParserSettings     = JsonConfig.settings.bigDecimalParseConfig
-    val serializerSettings = BigDecimalSerializerConfig(
+    val serializerSettings        = BigDecimalSerializerConfig(
       defaultSerializerSettings.minPlain,
       defaultSerializerSettings.maxPlain,
       preserveZeroDecimal = true
diff --git a/play-json/jvm/src/test/scala/play/api/libs/json/LocaleFixtures.scala b/play-json/jvm/src/test/scala/play/api/libs/json/LocaleFixtures.scala
@@ -36,7 +36,7 @@ object LocaleFixtures {
       "language"   -> "fr",
       "keywords"   -> Json.obj("ka" -> "ipsum", "kb" -> "value"),
       "script"     -> "Latn",
-      "extension" -> Json.obj(
+      "extension"  -> Json.obj(
         "a" -> "foo",
         "b" -> "bar",
         "u" -> "bar-foo-ka-ipsum-kb-value"
diff --git a/play-json/native/src/main/scala/StaticBinding.scala b/play-json/native/src/main/scala/StaticBinding.scala
@@ -9,8 +9,8 @@ import org.typelevel.jawn
 object StaticBinding {
 
   private implicit object JsValueFacade extends jawn.Facade.SimpleFacade[JsValue] {
-    final def jfalse: JsValue = JsFalse
-    final def jnull: JsValue  = JsNull
+    final def jfalse: JsValue                                              = JsFalse
+    final def jnull: JsValue                                               = JsNull
     final def jnum(s: CharSequence, decIndex: Int, expIndex: Int): JsValue = JsNumber(
       new java.math.BigDecimal(s.toString)
     )
diff --git a/play-json/shared/src/main/scala-2/play/api/libs/json/JsMacroImpl.scala b/play-json/shared/src/main/scala-2/play/api/libs/json/JsMacroImpl.scala
@@ -295,7 +295,7 @@ class JsMacroImpl(val c: blackbox.Context) {
         // infers implicit
         val neededImplicitType = appliedType(ctag.typeConstructor, ptpe)
         val tx                 = new ImplicitTransformer(subject)
-        val neededImplicit = if (!selfRef) {
+        val neededImplicit     = if (!selfRef) {
           c.inferImplicitValue(neededImplicitType)
         } else
           c.untypecheck(
@@ -346,7 +346,7 @@ class JsMacroImpl(val c: blackbox.Context) {
 
           case TypeRef(_, _, args) =>
             args.head match {
-              case t @ TypeRef(_, _, Nil) => Some(List(t))
+              case t @ TypeRef(_, _, Nil)  => Some(List(t))
               case t @ TypeRef(_, _, args) =>
                 import c.universe.definitions.TupleClass
                 if (!TupleClass.seq.exists(t.baseType(_).ne(NoType))) Some(List(t))
@@ -436,7 +436,7 @@ class JsMacroImpl(val c: blackbox.Context) {
               val someInitUnapply = unapplyReturnTypes.map(_.init)
               val someUnapplyLast = unapplyReturnTypes.map(_.last)
               val initsMatch      = someInitApply == someInitUnapply
-              val lastMatch = (for {
+              val lastMatch       = (for {
                 lastApply   <- someApplyLast
                 lastUnapply <- someUnapplyLast
               } yield lastApply <:< lastUnapply).getOrElse(false)
@@ -596,7 +596,7 @@ class JsMacroImpl(val c: blackbox.Context) {
         val cases = Match(
           q"dis",
           subTypes.map { t =>
-            val rtpe = appliedType(readsType, List(t))
+            val rtpe   = appliedType(readsType, List(t))
             val reader = resolver
               .createImplicit(
                 atpe,
@@ -636,7 +636,7 @@ class JsMacroImpl(val c: blackbox.Context) {
         val cases = Match(
           q"v",
           subTypes.map { t =>
-            val wtpe = appliedType(writesType, List(t))
+            val wtpe   = appliedType(writesType, List(t))
             val writer = resolver
               .createImplicit(
                 atpe,
@@ -718,7 +718,7 @@ class JsMacroImpl(val c: blackbox.Context) {
         }
 
       val resolvedImplicits = utility.implicits(resolver)
-      val canBuild = resolvedImplicits
+      val canBuild          = resolvedImplicits
         .map { case (name, Implicit(pt, impl, _, _)) =>
           // Equivalent to __ \ "name", but uses a naming scheme
           // of (String) => (String) to find the correct "name"
@@ -768,7 +768,7 @@ class JsMacroImpl(val c: blackbox.Context) {
 
       val syntaxImport      = if (!multiParam && !writes) q"" else q"import $syntax._"
       @inline def buildCall = q"$canBuild.$applyOrMap(..${conditionalList(applyFunction, utility.unapplyFunction)})"
-      def readResult =
+      def readResult        =
         if (multiParam) q"underlying.reads(obj)"
         else q"underlying.flatMap[${atpe}] { v: ${atpe} => $json.Reads.pure(f = v) }.reads(obj)"
 
@@ -875,7 +875,7 @@ class JsMacroImpl(val c: blackbox.Context) {
         atpe match {
           case _: SingletonType    => caseObjectImpl
           case TypeRef(_, _, args) => macroCaseImpl(args)
-          case _ =>
+          case _                   =>
             c.abort(
               c.enclosingPosition,
               s"Type ${atpe.typeSymbol.fullName} is not a valid case class or an object"
diff --git a/play-json/shared/src/main/scala/play/api/libs/json/JsPath.scala b/play-json/shared/src/main/scala/play/api/libs/json/JsPath.scala
@@ -240,7 +240,7 @@ case class JsPath(path: List[PathNode] = List()) {
   def applyTillLast(json: JsValue): Either[JsError, JsResult[JsValue]] = {
     @annotation.tailrec
     def step(path: List[PathNode], json: JsValue): Either[JsError, JsResult[JsValue]] = path match {
-      case Nil => Right(JsSuccess(json))
+      case Nil        => Right(JsSuccess(json))
       case List(node) =>
         node(json) match {
           case Nil      => Right(PathMissingError)
@@ -284,11 +284,11 @@ case class JsPath(path: List[PathNode] = List()) {
 
     def step(json: JsObject, lpath: JsPath): JsResult[JsObject] = {
       lpath.path match {
-        case Nil     => JsSuccess(json)
-        case List(p) => stepNode(json, p).repath(lpath)
+        case Nil          => JsSuccess(json)
+        case List(p)      => stepNode(json, p).repath(lpath)
         case head :: tail =>
           head(json) match {
-            case Nil => JsError(lpath, JsonValidationError("error.path.missing"))
+            case Nil      => JsError(lpath, JsonValidationError("error.path.missing"))
             case List(js) =>
               js match {
                 case o: JsObject =>
diff --git a/play-json/shared/src/main/scala/play/api/libs/json/JsResult.scala b/play-json/shared/src/main/scala/play/api/libs/json/JsResult.scala
@@ -380,7 +380,7 @@ object JsResult {
 
   implicit def alternativeJsResult(implicit a: Applicative[JsResult]): Alternative[JsResult] =
     new Alternative[JsResult] {
-      val app = a
+      val app                                                             = a
       def |[A, B >: A](alt1: JsResult[A], alt2: JsResult[B]): JsResult[B] = (alt1, alt2) match {
         case (JsError(e), JsSuccess(t, p)) => JsSuccess(t, p)
         case (JsSuccess(t, p), _)          => JsSuccess(t, p)
diff --git a/play-json/shared/src/main/scala/play/api/libs/json/Reads.scala b/play-json/shared/src/main/scala/play/api/libs/json/Reads.scala
@@ -221,11 +221,11 @@ object Reads extends ConstraintReads with PathReads with DefaultReads with Gener
     }
 
   implicit def alternative(implicit a: Applicative[Reads]): Alternative[Reads] = new Alternative[Reads] {
-    val app = a
+    val app                                                    = a
     def |[A, B >: A](alt1: Reads[A], alt2: Reads[B]): Reads[B] = new Reads[B] {
       def reads(js: JsValue) = alt1.reads(js) match {
         case r @ JsSuccess(_, _) => r
-        case JsError(es1) =>
+        case JsError(es1)        =>
           alt2.reads(js) match {
             case r2 @ JsSuccess(_, _) => r2
             case JsError(es2)         => JsError(JsError.merge(es1, es2))
diff --git a/play-json/shared/src/test/scala-3/play/api/libs/json/TestMacros.scala b/play-json/shared/src/test/scala-3/play/api/libs/json/TestMacros.scala
@@ -83,7 +83,7 @@ object TestMacros:
       val quotes = q
     }
 
-    val tpe = TypeRepr.of[T]
+    val tpe                    = TypeRepr.of[T]
     val (tupleTpe, withTupled) =
       helper.withTuple[T, P, String](tpe, toProduct)
 
@@ -111,7 +111,7 @@ object TestMacros:
       val quotes = q
     }
 
-    val tpe = TypeRepr.of[T]
+    val tpe         = TypeRepr.of[T]
     val tpeElements = Expr
       .summon[ProductOf[T]]
       .map {
diff --git a/play-json/shared/src/test/scala/play/api/libs/json/FormatSharedSpec.scala b/play-json/shared/src/test/scala/play/api/libs/json/FormatSharedSpec.scala
@@ -10,7 +10,7 @@ import org.scalatest.wordspec.AnyWordSpec
 final class FormatSharedSpec extends AnyWordSpec with Matchers {
   "Format" should {
     "be bimap'ed" in {
-      val strFormat = implicitly[Format[String]]
+      val strFormat              = implicitly[Format[String]]
       val intFormat: Format[Int] =
         strFormat.bimap(_.size, List.fill(_: Int)('X').mkString)
 
diff --git a/play-json/shared/src/test/scala/play/api/libs/json/JsPathSpec.scala b/play-json/shared/src/test/scala/play/api/libs/json/JsPathSpec.scala
@@ -146,7 +146,7 @@ class JsPathSpec extends AnyWordSpec with Matchers {
     "retrieve recursive in jsobject and jsarray #2" in {
       val obj = Json.obj(
         "nothing" -> "really",
-        "array" -> Json.arr(
+        "array"   -> Json.arr(
           Json.obj("field" -> Json.obj("alpha" -> "v11", "beta" -> "v12", "gamma" -> "v13")),
           Json.obj("field" -> Json.obj("alpha" -> "v21", "gamma" -> "v23", "beta" -> "v22")),
           Json.obj("field" -> Json.obj("beta" -> "v32", "alpha" -> "v31", "gamma" -> "v33"))
diff --git a/play-json/shared/src/test/scala/play/api/libs/json/JsonExtensionSpec.scala b/play-json/shared/src/test/scala/play/api/libs/json/JsonExtensionSpec.scala
@@ -412,7 +412,7 @@ class JsonExtensionSpec extends AnyWordSpec with Matchers {
 
       val genericIntString = GenericCaseClass2(obj1 = 1, obj2 = "hello")
       val genericHolder    = WrappedGenericIntString(intString = genericIntString)
-      val expectedJsObj = Json.obj(
+      val expectedJsObj    = Json.obj(
         "intString" -> Json.obj("obj1" -> 1, "obj2" -> "hello")
       )
       Json.toJson(genericHolder).mustEqual(expectedJsObj)
diff --git a/play-json/shared/src/test/scala/play/api/libs/json/JsonSharedSpec.scala b/play-json/shared/src/test/scala/play/api/libs/json/JsonSharedSpec.scala
@@ -254,7 +254,7 @@ class JsonSharedSpec extends AnyWordSpec with Matchers with org.scalatestplus.sc
 
     "can parse recursive object" in json { js =>
       val recursiveJson = """{"foo": {"foo":["bar"]}, "bar": {"foo":["bar"]}}"""
-      val expectedJson = JsObject(
+      val expectedJson  = JsObject(
         List(
           "foo" -> JsObject(
             List(
@@ -367,7 +367,7 @@ class JsonSharedSpec extends AnyWordSpec with Matchers with org.scalatestplus.sc
       case class TestCase(id: String, attr1: String, attr2: String)
 
       def jo = Json.obj(
-        "id" -> "my-id",
+        "id"   -> "my-id",
         "data" -> Json.obj(
           "attr1" -> "foo",
           "attr2" -> "bar"
diff --git a/play-json/shared/src/test/scala/play/api/libs/json/JsonTransSpec.scala b/play-json/shared/src/test/scala/play/api/libs/json/JsonTransSpec.scala
@@ -174,7 +174,7 @@ class JsonTransSpec extends AnyWordSpec with Matchers {
     }
 
     "deepMerge when reducing JsObjects" in {
-      val json = Json.obj("somekey1" -> 11, "somekey2" -> 22)
+      val json                           = Json.obj("somekey1" -> 11, "somekey2" -> 22)
       val jsonTransform: Reads[JsObject] = (
         (__ \ "key1" \ "sk1").json.copyFrom((__ \ "somekey1").json.pick)
           and
diff --git a/play-json/shared/src/test/scala/play/api/libs/json/JsonValidSharedSpec.scala b/play-json/shared/src/test/scala/play/api/libs/json/JsonValidSharedSpec.scala
diff --git a/play-json/shared/src/test/scala/play/api/libs/json/MacroSpec.scala b/play-json/shared/src/test/scala/play/api/libs/json/MacroSpec.scala
diff --git a/play-json/shared/src/test/scala/play/api/libs/json/WritesSharedSpec.scala b/play-json/shared/src/test/scala/play/api/libs/json/WritesSharedSpec.scala
diff --git a/project/Omnidoc.scala b/project/Omnidoc.scala
diff --git a/project/Playdoc.scala b/project/Playdoc.scala

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = 3.9.6`
	`1`	`+version = 3.9.7`
`2`	`2`	`runner.dialect = Scala213Source3`
`3`	`3`
`4`	`4`	`align.preset = true`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private[json] object StaticBindingNonJvm {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`case JsObject(fields) => {`
`85`		`- val il = ilevel + 1`
	`85`	`+ val il = ilevel + 1`
`86`	`86`	`val (before, after) = if (newline) {`
`87`	`87`	`s"\n${indent(il)}" -> s"\n${indent(ilevel)}}"`
`88`	`88`	`} else indent(il) -> "}"`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ private[jackson] case class KeyRead(content: ListBuffer[(String, JsValue)], fiel`
`145`	`145`
`146`	`146`	`// Context for reading one item of an Object (we already red fieldName)`
`147`	`147`	`private[jackson] case class ReadingMap(content: ListBuffer[(String, JsValue)]) extends DeserializerContext {`
`148`		`- def setField(fieldName: String) = KeyRead(content, fieldName)`
	`148`	`+ def setField(fieldName: String) = KeyRead(content, fieldName)`
`149`	`149`	`def addValue(value: JsValue): DeserializerContext =`
`150`	`150`	`throw new Exception("Cannot add a value on an object without a key, malformed JSON object!")`
`151`	`151`	`}`