Added support for multiple source directories. Version changed from 1.0.4 to 1.0.5-SNAPSHOT.

Author: gslowikowski

project/Scoverage.scala

@@ -4,7 +4,7 @@ import sbt._
 object Scoverage extends Build {
 
   val Org = "org.scoverage"
-  val Version = "1.0.4"
+  val Version = "1.0.5-SNAPSHOT"
   val Scala = "2.11.4"
   val MockitoVersion = "1.9.5"
   val ScalatestVersion = "2.2.2"

scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala

@@ -8,7 +8,11 @@ import scoverage._
 import scala.xml.Node
 
 /** @author Stephen Samuel */
-class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) {
+class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File) {
+
+  def this (sourceDirectory: File, outputDir: File) {
+    this(Seq(sourceDirectory), outputDir);
+  }
 
   def write(coverage: Coverage): Unit = {
     val indexFile = new File(outputDir.getAbsolutePath + "/index.html")
@@ -23,7 +27,18 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) {
     coverage.packages.foreach(writePackage)
   }
 
-  private def relativeSource(src: String): String = src.replace(sourceDirectory.getCanonicalPath + File.separator, "")
+  private def isRelativeTo = (directory: File, file: File) => file.getCanonicalPath.startsWith(directory.getCanonicalPath)
+
+  private def relativeSource(src: String): String = {
+    val absoluteSrcPath: String = new File(src).getCanonicalPath;
+    val sourceRoot: Option[File] = sourceDirectories.find(
+      sourceDirectory => isRelativeTo(sourceDirectory, new File(src))
+    );
+    sourceRoot match {
+      case Some(dir: File) => return absoluteSrcPath.replace(dir.getCanonicalPath + File.separator, "");
+      case _ => throw new RuntimeException(s"No source root found for '$src'");
+    }
+  }
 
   private def writePackage(pkg: MeasuredPackage): Unit = {
     // package overview files are written out using a filename that respects the package name

scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala

@@ -7,7 +7,11 @@ import _root_.scoverage._
 import scala.xml.{Node, PrettyPrinter}
 
 /** @author Stephen Samuel */
-class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
+class ScoverageXmlWriter(sourceDirectories: Seq[File], outputDir: File, debug: Boolean) {
+
+  def this (sourceDir: File, outputDir: File, debug: Boolean) {
+    this(Seq(sourceDir), outputDir, debug);
+  }
 
   def write(coverage: Coverage): Unit = {
     val file = IOUtils.reportFile(outputDir, debug)
@@ -72,9 +76,22 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
     </method>
   }
 
+  private def isRelativeTo = (directory: File, file: File) => file.getCanonicalPath.startsWith(directory.getCanonicalPath)
+
+  private def relativeSource(src: String): String = {
+    val absoluteSrcPath: String = new File(src).getCanonicalPath;
+    val sourceRoot: Option[File] = sourceDirectories.find(
+      sourceDirectory => isRelativeTo(sourceDirectory, new File(src))
+    );
+    sourceRoot match {
+      case Some(dir: File) => return absoluteSrcPath.replace(dir.getCanonicalPath + File.separator, "");
+      case _ => throw new RuntimeException(s"No source root found for '$src'");
+    }
+  }
+
   private def klass(klass: MeasuredClass): Node = {
     <class name={klass.name}
-           filename={klass.source.replace(sourceDir.getAbsolutePath, "")}
+           filename={relativeSource(klass.source)/*klass.source.replace(sourceDir.getAbsolutePath, "")*/}
            statement-count={klass.statementCount.toString}
            statements-invoked={klass.invokedStatementCount.toString}
            statement-rate={klass.statementCoverageFormatted}