From 902d3651787eee24c80dafbd087858abe9442f70 Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Sat, 23 Oct 2021 10:41:25 +0200
Subject: [PATCH] fix: Some more small fixes on relative paths in the writers

---
 .../src/main/scala/scoverage/report/BaseReportWriter.scala    | 4 +++-
 .../src/main/scala/scoverage/report/CoberturaXmlWriter.scala  | 2 +-
 .../src/main/scala/scoverage/report/ScoverageXmlWriter.scala  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/BaseReportWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/BaseReportWriter.scala
index 3134b20c..ebccb95f 100644
--- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/BaseReportWriter.scala
+++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/BaseReportWriter.scala
@@ -10,7 +10,9 @@ class BaseReportWriter(
 
   // Source paths in canonical form WITH trailing file separator
   private val formattedSourcePaths: Seq[String] =
-    sourceDirectories filter (_.isDirectory) map (_.getCanonicalPath + File.separator)
+    sourceDirectories
+      .filter(_.isDirectory)
+      .map(_.getCanonicalPath + File.separator)
 
   /** Converts absolute path to relative one if any of the source directories is it's parent.
     * If there is no parent directory, the path is returned unchanged (absolute).
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala
index d2f3155f..f6f7d2d2 100644
--- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala
+++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala
@@ -47,7 +47,7 @@ class CoberturaXmlWriter(
 
   def klass(klass: MeasuredClass): Node = {
     <class name={klass.fullClassName}
-           filename={relativeSource(klass.source).replace(File.separator, "/")}
+           filename={klass.source}
            line-rate={twoFractionDigits(klass.statementCoverage)}
            branch-rate={twoFractionDigits(klass.branchCoverage)}
            complexity="0">
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala
index da2adc26..9f4866c8 100644
--- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala
+++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala
@@ -91,7 +91,7 @@ class ScoverageXmlWriter(
 
   private def klass(klass: MeasuredClass): Node = {
     <class name={klass.fullClassName}
-           filename={relativeSource(klass.source)}
+           filename={klass.source}
            statement-count={klass.statementCount.toString}
            statements-invoked={klass.invokedStatementCount.toString}
            statement-rate={klass.statementCoverageFormatted}