Merge pull request #517 from scalameta/scalafmt351

scalameta · Apr 10, 2022 · 1af9fc7 · 1af9fc7
2 parents d7ab575 + dd21935
commit 1af9fc7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,8 +1,14 @@
-version = "2.7.5"
+version = "3.5.1"
+
 assumeStandardLibraryStripMargin = true
-docstrings = JavaDoc
+
+// Docstring wrapping breaks doctests
+docstrings.wrap = false
+docstrings.style = Asterisk
+
 project.git=true
 project.excludeFilters = [
   ".*scala-3*"
   "LinesSuite.scala"
 ]
+runner.dialect = scala212
diff --git a/munit-scalacheck/shared/src/main/scala/munit/ScalaCheckSuite.scala b/munit-scalacheck/shared/src/main/scala/munit/ScalaCheckSuite.scala
@@ -70,11 +70,12 @@ trait ScalaCheckSuite extends FunSuite {
       if (r.passed) {
         resultMessage
       } else {
-        val seedMessage = s"""|Failing seed: ${initialSeed.toBase64}
-                              |You can reproduce this failure by adding the following override to your suite:
-                              |
-                              |  override val scalaCheckInitialSeed = "${initialSeed.toBase64}"
-                              |""".stripMargin
+        val seedMessage =
+          s"""|Failing seed: ${initialSeed.toBase64}
+              |You can reproduce this failure by adding the following override to your suite:
+              |
+              |  override val scalaCheckInitialSeed = "${initialSeed.toBase64}"
+              |""".stripMargin
         seedMessage + "\n" + resultMessage
       }
     }

diff --git a/munit/shared/src/main/scala/munit/Location.scala b/munit/shared/src/main/scala/munit/Location.scala
@@ -29,7 +29,7 @@ final class Location(
     obj.asInstanceOf[AnyRef].eq(this) || (obj match {
       case l: Location =>
         l.path == path &&
-          l.line == line
+        l.line == line
       case _ =>
         false
     })