Merge pull request #11572 from ihostage/scalafmt-2.4.x-step2

Fix comments after bumping Scalafmt to `2.4.2`
playframework · Dec 19, 2022 · 97df2e2 · 97df2e2
2 parents 5edaa77 + eed2d80
commit 97df2e2
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -2,3 +2,4 @@
 7b6f6e6ebf7ca2cb4de903e9590872ec9b16aeb8
 # Upgrade Scalafmt to 2.4.x
 33eee4309ab453f6fd90c929378c7b87444cadc3
+7b5c1ba370cb8e4779247de639905323271d839e
diff --git a/core/play-guice/src/test/scala/play/api/inject/guice/GuiceInjectorBuilderSpec.scala b/core/play-guice/src/test/scala/play/api/inject/guice/GuiceInjectorBuilderSpec.scala
@@ -190,8 +190,8 @@ class GuiceInjectorBuilderSpec extends Specification {
         .disable[GuiceInjectorBuilderSpec.JavaEnvironmentModule]
         .disable(
           classOf[GuiceInjectorBuilderSpec.AModule],
-          classOf[GuiceInjectorBuilderSpec.CModule]
-        ) // C won't be disabled
+          classOf[GuiceInjectorBuilderSpec.CModule] // C won't be disabled
+        )
         .injector()
 
       injector.instanceOf[Environment] must throwA[com.google.inject.ConfigurationException]

diff --git a/core/play-integration-test/src/it/scala/play/it/http/JavaResultsHandlingSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/JavaResultsHandlingSpec.scala
@@ -837,8 +837,8 @@ trait JavaResultsHandlingSpec
             .sendJson(
               objectNode,
               false,
-              Optional.of("file.txt")
-            ) // even though the extension is txt, the content-type is json
+              Optional.of("file.txt") // even though the extension is txt, the content-type is json
+            )
         }
       }) { response =>
         // Use starts with because there is also the charset

diff --git a/core/play-integration-test/src/it/scala/play/it/http/ScalaResultsSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/ScalaResultsSpec.scala
@@ -56,9 +56,8 @@ class ScalaResultsSpec extends PlaySpecification {
 
   "bake cookies should not depends on global state" in withApplication("play.allowGlobalApplication" -> false) {
     implicit app =>
-      Ok.bakeCookies(cookieHeaderEncoding, sessionBaker, flashBaker) must not(
-        beNull
-      ) // we are interested just that it executes without global state
+      Ok.bakeCookies(cookieHeaderEncoding, sessionBaker, flashBaker) must
+        not(beNull) // we are interested just that it executes without global state
   }
 
   "support a custom application context" in {

diff --git a/core/play-integration-test/src/it/scala/play/it/http/assets/AssetsSpec.scala b/core/play-integration-test/src/it/scala/play/it/http/assets/AssetsSpec.scala
@@ -755,8 +755,8 @@ trait AssetsSpec extends PlaySpecification with WsTestClient with ServerIntegrat
             client
               .url("/encoding.js")
               .addHttpHeaders(
-                ACCEPT_ENCODING -> "gzip, deflate, sdch, br, bz2"
-              ) // even with a space, like chrome does it
+                ACCEPT_ENCODING -> "gzip, deflate, sdch, br, bz2" // even with a space, like chrome does it
+              )
               // something is wrong here... if we just have "gzip, deflate, sdch, br", the "br" does not end up in the ACCEPT_ENCODING header
               //          .withHeaders(ACCEPT_ENCODING -> "gzip, deflate, sdch, br")
               .get()

diff --git a/core/play/src/test/scala/play/mvc/MaxLengthBodyParserSpec.scala b/core/play/src/test/scala/play/mvc/MaxLengthBodyParserSpec.scala
@@ -82,8 +82,8 @@ class MaxLengthBodyParserSpec extends Specification with AfterAll with MustMatch
     (
       new BodyParser.Json(15, defaultHttpErrorHandler),
       Some("application/json"),
-      ByteString("""{ "x": "15 b" }""")
-    ),                                                                                                   // 15 bytes
+      ByteString("""{ "x": "15 b" }""") // 15 bytes
+    ),
     (new BodyParser.TolerantJson(15, defaultHttpErrorHandler), None, ByteString("""{ "x": "15 b" }""")), // 15 bytes
     (new BodyParser.FormUrlEncoded(15, defaultHttpErrorHandler), Some("application/x-www-form-urlencoded"), Body15),
     (

diff --git a/web/play-filters-helpers/src/main/scala/play/filters/csrf/CSRFActions.scala b/web/play-filters-helpers/src/main/scala/play/filters/csrf/CSRFActions.scala
@@ -178,9 +178,8 @@ class CSRFAction(
           }
         }))
         .splitWhen(_ => false)
-        .prefixAndTail(
-          0
-        ) // TODO rewrite BodyHandler such that it emits sub-source then we can avoid all these dancing around
+        // TODO rewrite BodyHandler such that it emits sub-source then we can avoid all these dancing around
+        .prefixAndTail(0)
         .map(_._2)
         .concatSubstreams
         .toMat(Sink.head[Source[ByteString, _]])(Keep.right)

diff --git a/web/play-openid/src/main/scala/play/api/libs/openid/OpenIdClient.scala b/web/play-openid/src/main/scala/play/api/libs/openid/OpenIdClient.scala
@@ -310,10 +310,10 @@ private[openid] object Discovery {
           .orElse(delegateRegex.findFirstIn(response.body))
           .flatMap(extractHref(_))
         OpenIDServer(
-          "http://specs.openid.net/auth/2.0/signon",
+          "http://specs.openid.net/auth/2.0/signon", // protocol version due to https://openid.net/specs/openid-authentication-2_0.html#html_disco
           url,
           delegate
-        ) //protocol version due to http://openid.net/specs/openid-authentication-2_0.html#html_disco
+        )
       })
     }