Merge pull request #316 from softwaremill/update/scalafmt-core-3.7.17

Update scalafmt-core to 3.7.17
softwaremill · Dec 21, 2023 · 281f551 · 281f551
2 parents b3917b0 + 27bdeed
commit 281f551
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -3,3 +3,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.7.15
 f7dccf8d205c1d4f9bd5dbbf9680a6b9d175b444
+
+# Scala Steward: Reformat with scalafmt 3.7.17
+cc4f48597d3151542ecec3c159159e1793926314
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,3 +1,3 @@
 runner.dialect = scala3
-version = 3.7.15
+version = 3.7.17
 maxColumn = 120
diff --git a/core/src/main/scala/sttp/model/MediaType.scala b/core/src/main/scala/sttp/model/MediaType.scala
@@ -34,7 +34,8 @@ case class MediaType(
       (range.charset == Wildcard || charset.forall(_.equalsIgnoreCase(range.charset))) &&
       // #309: when the main or sub types are wildcard, not taking into account the parameters
       // #3253 from tapir: checking the parameters only if they are present in the range
-      (range.mainType == Wildcard || range.subType == Wildcard || range.otherParameters.isEmpty || (range.otherParameters.size == 1 && range.otherParameters.contains("q")) || {
+      (range.mainType == Wildcard || range.subType == Wildcard || range.otherParameters.isEmpty || (range.otherParameters.size == 1 && range.otherParameters
+        .contains("q")) || {
         // the q value needs to be ignored - it has a different purpose
         val rangeParametersWithoutQ = range.otherParameters - "q"
         // `otherParameters` needs to be fully equal to `range.otherParameters` (ignoring case)

diff --git a/core/src/test/scala/sttp/model/MediaTypeTests.scala b/core/src/test/scala/sttp/model/MediaTypeTests.scala
@@ -69,7 +69,11 @@ class MediaTypeTests extends AnyFlatSpec with Matchers with TableDrivenPropertyC
     (MediaType.ApplicationJson, ContentTypeRange("application", "json", "*", EmptyParameters), true),
     // the q parameter in the range should be ignored
     (MediaType.ApplicationJson, ContentTypeRange("application", "json", "*", Map("q" -> "0.5")), true),
-    (MediaType.ApplicationJson.copy(otherParameters = Map("a" -> "1")), ContentTypeRange("application", "json", "*", Map("q" -> "0.5")), true),
+    (
+      MediaType.ApplicationJson.copy(otherParameters = Map("a" -> "1")),
+      ContentTypeRange("application", "json", "*", Map("q" -> "0.5")),
+      true
+    ),
     // range defines parameters, but they are not equal (ignoring case)
     (MediaType.ApplicationJson, ContentTypeRange("application", "json", "*", Map("a" -> "1")), false),
     (