scoverage · Oct 18, 2022 · Oct 20, 2022 · Oct 20, 2022 · Oct 22, 2022 · Nov 1, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,12 +19,12 @@ jobs:
         os: [ 'ubuntu-latest', 'windows-latest' ]
         java: ['8', '17']
         scala: [
+            { version: '2.12.18' },
             { version: '2.12.17' },
             { version: '2.12.16' },
-            { version: '2.12.15' },
+            { version: '2.13.11' },
             { version: '2.13.10' },
-            { version: '2.13.9' },
-            { version: '2.13.8' },
+            { version: '2.13.9' }
           ]
     steps:
       - name: checkout the repo

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,8 @@
 *.log
 
+# Build Server Protocol
+.bsp/
+
 # SBT specific
 target/
 project/boot/

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.5.9"
+version = "3.7.4"
 project.git = true
 runner.dialect = "scala213"
 assumeStandardLibraryStripMargin = true

diff --git a/bin/test-release.sh b/bin/test-release.sh
@@ -12,18 +12,14 @@ coursier fetch \
   org.scoverage:scalac-scoverage-plugin_2.12.15:$version \
   org.scoverage:scalac-scoverage-plugin_2.12.16:$version \
   org.scoverage:scalac-scoverage-plugin_2.12.17:$version \
-  org.scoverage:scalac-scoverage-plugin_2.13.0:$version \
-  org.scoverage:scalac-scoverage-plugin_2.13.1:$version \
-  org.scoverage:scalac-scoverage-plugin_2.13.2:$version \
-  org.scoverage:scalac-scoverage-plugin_2.13.3:$version \
-  org.scoverage:scalac-scoverage-plugin_2.13.4:$version \
   org.scoverage:scalac-scoverage-plugin_2.13.5:$version \
   org.scoverage:scalac-scoverage-plugin_2.13.5:$version \
   org.scoverage:scalac-scoverage-plugin_2.13.6:$version \
   org.scoverage:scalac-scoverage-plugin_2.13.7:$version \
   org.scoverage:scalac-scoverage-plugin_2.13.8:$version \
   org.scoverage:scalac-scoverage-plugin_2.13.9:$version \
   org.scoverage:scalac-scoverage-plugin_2.13.10:$version \
+  org.scoverage:scalac-scoverage-plugin_2.13.11:$version \
   org.scoverage:scalac-scoverage-runtime_2.12:$version \
   org.scoverage:scalac-scoverage-runtime_2.13:$version \
   org.scoverage:scalac-scoverage-runtime_sjs1_2.12:$version \

diff --git a/build.sbt b/build.sbt
@@ -2,13 +2,14 @@ import sbtcrossproject.CrossProject
 import sbtcrossproject.CrossType
 
 lazy val munitVersion = "0.7.29"
-lazy val scalametaVersion = "4.6.0"
-lazy val defaultScala212 = "2.12.17"
-lazy val defaultScala213 = "2.13.10"
-lazy val defaultScala3 = "3.1.3"
+lazy val scalametaVersion = "4.7.8"
+lazy val defaultScala212 = "2.12.18"
+lazy val defaultScala213 = "2.13.11"
+lazy val defaultScala3 = "3.3.0"
 lazy val bin212 =
   Seq(
     defaultScala212,
+    "2.12.17",
     "2.12.16",
     "2.12.15",
     "2.12.14",
@@ -20,16 +21,12 @@ lazy val bin212 =
 lazy val bin213 =
   Seq(
     defaultScala213,
+    "2.13.10",
     "2.13.9",
     "2.13.8",
     "2.13.7",
     "2.13.6",
-    "2.13.5",
-    "2.13.4",
-    "2.13.3",
-    "2.13.2",
-    "2.13.1",
-    "2.13.0"
+    "2.13.5"
   )
 
 inThisBuild(
@@ -151,7 +148,14 @@ lazy val plugin =
       sharedSettings
     )
     .settings(
-      Test / unmanagedSourceDirectories += (Test / sourceDirectory).value / "scala-2.12+"
+      Test / unmanagedSourceDirectories += (Test / sourceDirectory).value / "scala-2.12+",
+      Test / unmanagedSourceDirectories ++= {
+        val sourceDir = (Test / sourceDirectory).value
+        CrossVersion.partialVersion(scalaVersion.value) match {
+          case Some((2, n)) if n >= 13 => Seq(sourceDir / "scala-2.13+")
+          case _                       => Seq.empty
+        }
+      }
     )
     .dependsOn(domain, reporter % "test->compile", serializer, buildInfo % Test)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "jsdom": "^20.0.0"
+    "jsdom": "^22.1.0"
   }
 }
diff --git a/plugin/src/main/scala/scoverage/ScoveragePlugin.scala b/plugin/src/main/scala/scoverage/ScoveragePlugin.scala
@@ -660,7 +660,20 @@ class ScoverageInstrumentationComponent(
 
         // handle function bodies. This AST node corresponds to the following Scala code: vparams => body
         case f: Function =>
-          treeCopy.Function(tree, f.vparams, process(f.body))
+          f.body match {
+            case b: Match =>
+              // anonymous function bodies with pattern matching needs to account for branches
+              treeCopy.Function(
+                tree,
+                f.vparams,
+                treeCopy.Match(
+                  b,
+                  b.selector,
+                  transformCases(b.cases, branch = true)
+                )
+              )
+            case _ => treeCopy.Function(tree, f.vparams, process(f.body))
+          }
 
         case _: Ident => tree
 
@@ -777,6 +790,14 @@ class ScoverageInstrumentationComponent(
           */
         case s: Select if s.symbol.isLazy => tree
 
+        // Generated by compiler for lazy definitions involving
+        // by-name implicit parameters. More on that here:
+        // https://docs.scala-lang.org/sips/byname-implicits.html
+        //
+        // final <synthetic> val lazyDefns$1: LazyDefns$1 = new LazyDefns$1();
+        // lazyDefns$1.rec$1()
+        case s: Select if s.symbol.isSynthetic => tree
+
         case s: Select =>
           instrument(
             treeCopy.Select(s, traverseApplication(s.qualifier), s.name),

diff --git a/plugin/src/test/scala-2.13+/scoverage/Scala213PluginCoverageTest.scala b/plugin/src/test/scala-2.13+/scoverage/Scala213PluginCoverageTest.scala
@@ -0,0 +1,33 @@
+package scoverage
+
+import munit.FunSuite
+
+class Scala213PluginCoverageTest extends FunSuite with MacroSupport {
+
+  test(
+    "scoverage should ignore synthetic lazy definitions generated by compiler from by-name implicits"
+  ) {
+    val compiler = ScoverageCompiler.noPositionValidation
+    compiler.compileCodeSnippet(
+      """
+        |object test {
+        |
+        |  trait Foo {
+        |    def next: Foo
+        |  }
+        |
+        |  object Foo {
+        |    implicit def foo(implicit rec: => Foo): Foo =
+        |      new Foo { def next = rec }
+        |  }
+        |
+        |  val foo = implicitly[Foo]
+        |
+        |}
+        |
+      """.stripMargin
+    )
+    assert(!compiler.reporter.hasErrors)
+    assert(!compiler.reporter.hasWarnings)
+  }
+}
diff --git a/plugin/src/test/scala/scoverage/PluginCoverageTest.scala b/plugin/src/test/scala/scoverage/PluginCoverageTest.scala
@@ -130,15 +130,41 @@ class PluginCoverageTest extends FunSuite with MacroSupport {
     assert(!compiler.reporter.hasErrors)
     // should instrument:
     // the if clause,
-    // thenp block,
-    // thenp literal "1",
-    // elsep block,
-    // elsep literal "2",
+    // then block,
+    // then literal "1",
+    // else block,
+    // else literal "2",
     // case block "yes" literal
     // skip case block "yes" literal
     compiler.assertNMeasuredStatements(7)
   }
 
+  test(
+    "scoverage should instrument anonymous function with pattern matching body"
+  ) {
+    val compiler = ScoverageCompiler.default
+    compiler.compileCodeSnippet(
+      """ object A {
+        |  def foo(a: List[Option[Int]]) = a.map {
+        |    case Some(value) => value + 1
+        |    case None => 0
+        |  }
+        |} """.stripMargin
+    )
+    assert(!compiler.reporter.hasErrors)
+    // should instrument:
+    // the def method entry,
+    // case Some,
+    // case block expression
+    // case none,
+    // case block literal "0"
+
+    // account for canbuildfrom statement
+    val expectedStatementsCount =
+      if (ScoverageCompiler.ShortScalaVersion < "2.13") 6 else 5
+    compiler.assertNMeasuredStatements(expectedStatementsCount)
+  }
+
   // https://github.com/scoverage/sbt-scoverage/issues/16
   test(
     "scoverage should instrument for-loops but not the generated scaffolding"
@@ -246,9 +272,9 @@ class PluginCoverageTest extends FunSuite with MacroSupport {
 
     assert(!compiler.reporter.hasErrors)
     assert(!compiler.reporter.hasWarnings)
-    // should have 4 profiled statements: the outer apply, the true, the a < b, the false
+    // should have 7 profiled statements: the outer apply, and three pairs of case patterns & blocks
     // we are testing that we don't instrument the tuple2 call used here
-    compiler.assertNMeasuredStatements(4)
+    compiler.assertNMeasuredStatements(7)
   }
 
   test("scoverage should instrument all case statements in an explicit match") {

diff --git a/plugin/src/test/scala/scoverage/ScoverageCompiler.scala b/plugin/src/test/scala/scoverage/ScoverageCompiler.scala
@@ -57,12 +57,17 @@ private[scoverage] object ScoverageCompiler {
 
   def default: ScoverageCompiler = {
     val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings)
-    new ScoverageCompiler(settings, reporter)
+    new ScoverageCompiler(settings, reporter, validatePositions = true)
+  }
+
+  def noPositionValidation: ScoverageCompiler = {
+    val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings)
+    new ScoverageCompiler(settings, reporter, validatePositions = false)
   }
 
   def defaultJS: ScoverageCompiler = {
     val reporter = new scala.tools.nsc.reporters.ConsoleReporter(jsSettings)
-    new ScoverageCompiler(jsSettings, reporter)
+    new ScoverageCompiler(jsSettings, reporter, validatePositions = true)
   }
 
   def locationCompiler: LocationCompiler = {
@@ -152,7 +157,8 @@ private[scoverage] object ScoverageCompiler {
 
 class ScoverageCompiler(
     settings: scala.tools.nsc.Settings,
-    rep: scala.tools.nsc.reporters.Reporter
+    rep: scala.tools.nsc.reporters.Reporter,
+    validatePositions: Boolean
 ) extends scala.tools.nsc.Global(settings, rep) {
 
   def addToClassPath(file: File): Unit = {
@@ -268,7 +274,8 @@ class ScoverageCompiler(
 
   override def computeInternalPhases(): Unit = {
     super.computeInternalPhases()
-    addToPhasesSet(validator, "scoverage validator")
+    if (validatePositions)
+      addToPhasesSet(validator, "scoverage validator")
     addToPhasesSet(
       instrumentationComponent,
       "scoverage instrumentationComponent"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,12 +1,12 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
 
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7")
-addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")
 
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33")
 

diff --git a/reporter/src/main/scala/scoverage/reporter/CoberturaXmlWriter.scala b/reporter/src/main/scala/scoverage/reporter/CoberturaXmlWriter.scala
@@ -26,7 +26,7 @@ class CoberturaXmlWriter(
     val file = new File(outputDir, "cobertura.xml")
     IOUtils.writeToFile(
       file,
-      "<?xml version=\"1.0\"?>\n<!DOCTYPE coverage SYSTEM \"http://cobertura.sourceforge.net/xml/coverage-04.dtd\">\n" +
+      "<?xml version=\"1.0\"?>\n<!DOCTYPE coverage SYSTEM \"https://cobertura.sourceforge.net/xml/coverage-04.dtd\">\n" +
         new PrettyPrinter(120, 4).format(xml(coverage)),
       sourceEncoding
     )

diff --git a/reporter/src/test/resources/scoverage/reporter/cobertura.sample.xml b/reporter/src/test/resources/scoverage/reporter/cobertura.sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
+<!DOCTYPE coverage SYSTEM "https://cobertura.sourceforge.net/xml/coverage-04.dtd">
 
 <coverage line-rate="0.9" branch-rate="0.75" version="1.9" timestamp="1187350905008">
     <sources>

diff --git a/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala b/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
@@ -112,7 +112,7 @@ class CoberturaXmlWriterTest extends FunSuite {
     )
   }
 
-  test("cobertura output validates".ignore) {
+  test("cobertura output validates") {
 
     val dir = tempDir()
 
@@ -298,8 +298,6 @@ class CoberturaXmlWriterTest extends FunSuite {
     writer.write(coverage)
 
     val domFactory = DocumentBuilderFactory.newInstance()
-    // TODO set validating here is no longer working as of 2.13.10. Not fully sure why but I don't use
-    // cobertura, so if someone wants to fix this, please do. I'll move forward with this not to block the release.
     domFactory.setValidating(true)
     val builder = domFactory.newDocumentBuilder()
     builder.setErrorHandler(new ErrorHandler() {