Merge pull request #159 from lloydmeta/feature/canonical-relativeSource-src

Resolve canonical path for src in BaseReportWriter.relativeSource

Author: gslowikowski

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.11

project/plugins.sbt

@@ -2,7 +2,7 @@ resolvers += Classpaths.sbtPluginReleases
 
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.3.2")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
 

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

@@ -18,14 +18,16 @@ class BaseReportWriter(sourceDirectories: Seq[File], outputDir: File, ignoreStat
   def relativeSource(src: String): String = relativeSource(src, formattedSourcePaths)
 
   private def relativeSource(src: String, sourcePaths: Seq[String]): String = {
+    // We need the canonical path for the given src because our formattedSourcePaths are canonical
+    val canonicalSrc = new File(src).getCanonicalPath
     val sourceRoot: Option[String] = sourcePaths.find(
-      sourcePath => src.startsWith(sourcePath)
+      sourcePath => canonicalSrc.startsWith(sourcePath)
     )
     sourceRoot match {
-      case Some(path: String) => src.replace(path, "")
+      case Some(path: String) => canonicalSrc.replace(path, "")
       case _ =>
         val fmtSourcePaths: String = sourcePaths.mkString("'", "', '", "'")
-        throw new RuntimeException(s"No source root found for '$src' (source roots: $fmtSourcePaths)");
+        throw new RuntimeException(s"No source root found for '$canonicalSrc' (source roots: $fmtSourcePaths)");
     }
   }