From c40a53a676cdc4f52187089916b13c948e844317 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 30 May 2025 18:01:07 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.9.7 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 99f74dc4..fb438cbd 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.9.4" +version = "3.9.7" project.git = true runner.dialect = "scala213" assumeStandardLibraryStripMargin = true From 7da827d0350f9f416a0114baab99f4e526c7382a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 30 May 2025 18:01:17 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.9.7 Executed command: scalafmt --non-interactive --- domain/src/main/scala/scoverage/domain/CodeGrid.scala | 2 +- plugin/src/main/scala/scoverage/CoverageFilter.scala | 2 +- plugin/src/main/scala/scoverage/ScoverageOptions.scala | 2 +- plugin/src/main/scala/scoverage/ScoveragePlugin.scala | 2 +- .../src/main/scala/scoverage/reporter/BaseReportWriter.scala | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/domain/src/main/scala/scoverage/domain/CodeGrid.scala b/domain/src/main/scala/scoverage/domain/CodeGrid.scala index 70b33f96..185d95ae 100644 --- a/domain/src/main/scala/scoverage/domain/CodeGrid.scala +++ b/domain/src/main/scala/scoverage/domain/CodeGrid.scala @@ -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 => diff --git a/plugin/src/main/scala/scoverage/CoverageFilter.scala b/plugin/src/main/scala/scoverage/CoverageFilter.scala index 4d95bb01..7fa7b680 100644 --- a/plugin/src/main/scala/scoverage/CoverageFilter.scala +++ b/plugin/src/main/scala/scoverage/CoverageFilter.scala @@ -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 diff --git a/plugin/src/main/scala/scoverage/ScoverageOptions.scala b/plugin/src/main/scala/scoverage/ScoverageOptions.scala index 6519c3a2..f0c040b6 100644 --- a/plugin/src/main/scala/scoverage/ScoverageOptions.scala +++ b/plugin/src/main/scala/scoverage/ScoverageOptions.scala @@ -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) } diff --git a/plugin/src/main/scala/scoverage/ScoveragePlugin.scala b/plugin/src/main/scala/scoverage/ScoveragePlugin.scala index 6a144e9c..ca3064f1 100644 --- a/plugin/src/main/scala/scoverage/ScoveragePlugin.scala +++ b/plugin/src/main/scala/scoverage/ScoveragePlugin.scala @@ -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") } } diff --git a/reporter/src/main/scala/scoverage/reporter/BaseReportWriter.scala b/reporter/src/main/scala/scoverage/reporter/BaseReportWriter.scala index 6c89b2e4..5e523afd 100644 --- a/reporter/src/main/scala/scoverage/reporter/BaseReportWriter.scala +++ b/reporter/src/main/scala/scoverage/reporter/BaseReportWriter.scala @@ -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)" From 269d6ba538478d2b5431361bca050faf8dbd6b61 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 30 May 2025 18:01:17 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.9.7' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index bdbe9d36..d3555544 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -7,3 +7,6 @@ # Scala Steward: Reformat with scalafmt 3.8.5 6c5f5c6d874d7c9e15bfc78f3c847829297fb8ae + +# Scala Steward: Reformat with scalafmt 3.9.7 +7da827d0350f9f416a0114baab99f4e526c7382a