Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt to 3.5.1 #517

Merged
merged 2 commits into from
Apr 10, 2022
Merged

Update scalafmt to 3.5.1 #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f70ddc
Update scalafmt to 3.5.1
valencik Apr 10, 2022
dd21935
Apply new scalafmt (3.5.1)
valencik Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
11 changes: 6 additions & 5 deletions munit-scalacheck/shared/src/main/scala/munit/ScalaCheckSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
2 changes: 1 addition & 1 deletion munit/shared/src/main/scala/munit/Location.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand Down