Merge pull request #375 from scala-steward/update/scalafmt-core-2.7.5

Update scalafmt-core to 2.7.5
playframework · Nov 16, 2020 · b0fd7d3 · b0fd7d3
2 parents 849436c + a50393e
commit b0fd7d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 2.6.4
+version = 2.7.5
 
 align.preset = true
 danglingParentheses.preset = true

diff --git a/parser/src/test/scala/play/twirl/parser/test/ParserSpec.scala b/parser/src/test/scala/play/twirl/parser/test/ParserSpec.scala
@@ -35,12 +35,11 @@ class ParserSpec extends AnyWordSpec with Matchers with Inside {
     }
 
   def parseFailure(templateName: String, message: String, line: Int, column: Int) =
-    inside(parse(templateName)) {
-      case parser.Error(_, rest, errors) =>
-        val e = errors.head
-        e.str mustBe message
-        e.pos.line mustBe line
-        e.pos.column mustBe column
+    inside(parse(templateName)) { case parser.Error(_, rest, errors) =>
+      val e = errors.head
+      e.str mustBe message
+      e.pos.line mustBe line
+      e.pos.column mustBe column
     }
 
   def parseTemplate(templateName: String): Template = {

diff --git a/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplateMappingSpec.scala b/sbt-twirl/src/test/scala/play/twirl/sbt/test/TemplateMappingSpec.scala
@@ -48,9 +48,8 @@ class TemplateMappingSpec extends AnyWordSpec with Matchers with Inspectors {
         10 -> Location(4, 1, 7, "d")
       )
 
-      forAll(testOffsets) {
-        case (offset, location) =>
-          mapping.location(offset) mustBe Some(location)
+      forAll(testOffsets) { case (offset, location) =>
+        mapping.location(offset) mustBe Some(location)
       }
 
       val testPositions = Seq(
@@ -63,9 +62,8 @@ class TemplateMappingSpec extends AnyWordSpec with Matchers with Inspectors {
         (5, 0)  -> Location(4, 1, 7, "d")
       )
 
-      forAll(testPositions) {
-        case ((line, column), location) =>
-          mapping.location(line, column) mustBe Some(location)
+      forAll(testPositions) { case ((line, column), location) =>
+        mapping.location(line, column) mustBe Some(location)
       }
     }
   }