Skip to content

Update scalafmt-core to 3.9.7 #691

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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@

# Scala Steward: Reformat with scalafmt 3.8.5
6c5f5c6d874d7c9e15bfc78f3c847829297fb8ae

# Scala Steward: Reformat with scalafmt 3.9.7
7da827d0350f9f416a0114baab99f4e526c7382a
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.9.4"
version = "3.9.7"
project.git = true
runner.dialect = "scala213"
assumeStandardLibraryStripMargin = true
Expand Down
2 changes: 1 addition & 1 deletion domain/src/main/scala/scoverage/domain/CodeGrid.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class CodeGrid(mFile: MeasuredFile, sourceEncoding: Option[String]) {
// in that block were executed
cells(k).status match {
case Invoked => if (!stmt.isInvoked) cells(k).status = NotInvoked
case NoData =>
case NoData =>
if (!stmt.isInvoked) cells(k).status = NotInvoked
else if (stmt.isInvoked) cells(k).status = Invoked
case NotInvoked =>
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/scala/scoverage/CoverageFilter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class RegexCoverageFilter(
def getExcludedLineNumbers(sourceFile: SourceFile): List[Range] = {
linesExcludedByScoverageCommentsCache.get(sourceFile) match {
case Some(lineNumbers) => lineNumbers
case None =>
case None =>
val lineNumbers = compatFindAllIn(
scoverageExclusionCommentsRegex,
sourceFile.content
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/scala/scoverage/ScoverageOptions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ object ScoverageOptions {
// we just ignore them here
case ExtraAfterPhase(afterPhase) => ()
case ExtraBeforePhase(beforePhase) => ()
case "reportTestName" =>
case "reportTestName" =>
options = options.copy(reportTestName = true)
case opt => errFn("Unknown option: " + opt)
}
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/scala/scoverage/ScoveragePlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ class ScoverageInstrumentationComponent(
def updateLocation(t: Tree): Unit = {
Location.fromGlobal(global)(t) match {
case Some(loc) => this.location = loc
case _ =>
case _ =>
reporter.warning(t.pos, s"Cannot update location for $t")
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class BaseReportWriter(
sourcePaths.find(sourcePath => canonicalSrc.startsWith(sourcePath))
sourceRoot match {
case Some(path: String) => canonicalSrc.replace(path, "")
case _ =>
case _ =>
val fmtSourcePaths: String = sourcePaths.mkString("'", "', '", "'")
throw new RuntimeException(
s"No source root found for '$canonicalSrc' (source roots: $fmtSourcePaths)"
Expand Down