Merge pull request #548 from jozic/properly-handle-multiple-exclude-entries-for-scala3

Properly handle multiple exclude entries for Scala 3

Author: rolandtritsch

src/main/scala/scoverage/ScoverageSbtPlugin.scala

@@ -197,15 +197,15 @@ object ScoverageSbtPlugin extends AutoPlugin {
                   if isScala3SupportingFilePackageExclusion(
                     scalaVersion.value
                   ) =>
-                s"-coverage-exclude-classlikes:$v"
+                s"-coverage-exclude-classlikes:${v.replace(';', ',')}"
             },
           excludedFiles
             .collect {
               case v
                   if isScala3SupportingFilePackageExclusion(
                     scalaVersion.value
                   ) =>
-                s"-coverage-exclude-files:$v"
+                s"-coverage-exclude-files:${v.replace(';', ',')}"
             }
         ).flatten
       } else if (coverageEnabled.value && !isScala2(scalaVersion.value)) {

src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt

@@ -4,7 +4,7 @@ scalaVersion := "3.4.2"
 
 libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
 
-coverageExcludedFiles := ".*/two/GoodCoverage"
+coverageExcludedFiles := ".*/two/GoodCoverage;.*/three/GoodCoverage"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))

src/sbt-test/scoverage/scala3-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala

@@ -0,0 +1,9 @@
+package three
+
+object GoodCoverage {
+
+  def sum(num1: Int, num2: Int) = {
+    if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2
+  }
+
+}

src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt

@@ -4,7 +4,7 @@ scalaVersion := "3.4.2"
 
 libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
 
-coverageExcludedPackages := "two\\..*"
+coverageExcludedPackages := "two\\..*;three\\..*"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))

src/sbt-test/scoverage/scala3-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala

@@ -0,0 +1,9 @@
+package three
+
+object GoodCoverage {
+
+  def sum(num1: Int, num2: Int) = {
+    if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2
+  }
+
+}