Remove redundant scoverage.Statement.source field

It's value is always equal to `scoverage.Location.sourcePath`. Replace it with delegating method with the same name.

Author: gslowikowski

scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala

@@ -108,7 +108,7 @@ object Serializer {
         case "Object" => ClassType.Object
         case _ => ClassType.Class
       }
-      Statement(source,
+      Statement(
         Location(_package, _class, fullClassName, classType, method, path),
         id,
         start,

scalac-scoverage-plugin/src/main/scala/scoverage/coverage.scala

@@ -109,8 +109,7 @@ case class MeasuredFile(source: String, statements: Iterable[Statement])
   override def ignoredStatements: Iterable[Statement] = Seq()
 }
 
-case class Statement(source: String,
-                     location: Location,
+case class Statement(location: Location,
                      id: Int,
                      start: Int,
                      end: Int,
@@ -121,6 +120,7 @@ case class Statement(source: String,
                      branch: Boolean,
                      var count: Int = 0,
                      ignored: Boolean = false) extends java.io.Serializable {
+  def source = location.sourcePath
   def invoked(): Unit = count = count + 1
   def isInvoked = count > 0
 }

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

@@ -202,7 +202,6 @@ class ScoverageInstrumentationComponent(val global: Global, extraAfterPhase: Opt
         case Some(source) =>
           val id = statementIds.incrementAndGet
           val statement = Statement(
-            source.path,
             location,
             id,
             safeStart(tree),

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

@@ -43,7 +43,6 @@ object ScoverageXmlReader {
       id = id + 1
 
       coverage add Statement(
-        source.text,
         location,
         id,
         start.text.toInt,

scalac-scoverage-plugin/src/test/scala/scoverage/CoberturaXmlWriterTest.scala

@@ -32,29 +32,28 @@ class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstan
 
     val coverage = scoverage.Coverage()
     coverage
-      .add(Statement(canonicalPath("a.scala"), Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create", canonicalPath("a.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create", canonicalPath("a.scala")),
       1, 2, 3, 12, "", "", "", false, 3))
     coverage
-      .add(Statement(canonicalPath("a.scala"), Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create2", canonicalPath("a.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create2", canonicalPath("a.scala")),
       2, 2, 3, 16, "", "", "", false, 3))
     coverage
-      .add(Statement(canonicalPath("b.scala"), Location("com.sksamuel.scoverage2", "B", "com.sksamuel.scoverage2.B", ClassType.Object, "retrieve", canonicalPath("b.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage2", "B", "com.sksamuel.scoverage2.B", ClassType.Object, "retrieve", canonicalPath("b.scala")),
       3, 2, 3, 21, "", "", "", false, 0))
     coverage
-      .add(Statement(canonicalPath("b.scala"),
-      Location("com.sksamuel.scoverage2", "B", "B", ClassType.Object, "retrieve2", canonicalPath("b.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage2", "B", "B", ClassType.Object, "retrieve2", canonicalPath("b.scala")),
       4, 2, 3, 9, "", "", "", false, 3))
     coverage
-      .add(Statement(canonicalPath("c.scala"), Location("com.sksamuel.scoverage3", "C", "com.sksamuel.scoverage3.C", ClassType.Object, "update", canonicalPath("c.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage3", "C", "com.sksamuel.scoverage3.C", ClassType.Object, "update", canonicalPath("c.scala")),
       5, 2, 3, 66, "", "", "", true, 3))
     coverage
-      .add(Statement(canonicalPath("c.scala"), Location("com.sksamuel.scoverage3", "C", "com.sksamuel.scoverage3.C", ClassType.Object, "update2", canonicalPath("c.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage3", "C", "com.sksamuel.scoverage3.C", ClassType.Object, "update2", canonicalPath("c.scala")),
       6, 2, 3, 6, "", "", "", true, 3))
     coverage
-      .add(Statement(canonicalPath("d.scala"), Location("com.sksamuel.scoverage4", "D", "com.sksamuel.scoverage4.D", ClassType.Object, "delete", canonicalPath("d.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage4", "D", "com.sksamuel.scoverage4.D", ClassType.Object, "delete", canonicalPath("d.scala")),
       7, 2, 3, 4, "", "", "", false, 0))
     coverage
-      .add(Statement(canonicalPath("d.scala"), Location("com.sksamuel.scoverage4", "D", "com.sksamuel.scoverage4.D", ClassType.Object, "delete2", canonicalPath("d.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage4", "D", "com.sksamuel.scoverage4.D", ClassType.Object, "delete2", canonicalPath("d.scala")),
       8, 2, 3, 14, "", "", "", false, 0))
 
     val writer = new CoberturaXmlWriter(sourceRoot, dir)
@@ -87,13 +86,13 @@ class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstan
 
     val coverage = Coverage()
     coverage
-      .add(Statement(canonicalPath("a.scala"), Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create", canonicalPath("a.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create", canonicalPath("a.scala")),
       1, 2, 3, 12, "", "", "", false))
     coverage
-      .add(Statement(canonicalPath("a.scala"), Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create2", canonicalPath("a.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create2", canonicalPath("a.scala")),
       2, 2, 3, 16, "", "", "", true))
     coverage
-      .add(Statement(canonicalPath("a.scala"), Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create3", canonicalPath("a.scala")),
+      .add(Statement(Location("com.sksamuel.scoverage", "A", "com.sksamuel.scoverage.A", ClassType.Object, "create3", canonicalPath("a.scala")),
       3, 3, 3, 20, "", "", "", true, 1))
 
     val writer = new CoberturaXmlWriter(sourceRoot, dir)

scalac-scoverage-plugin/src/test/scala/scoverage/CoverageAggregatorTest.scala

@@ -24,20 +24,20 @@ class CoverageAggregatorTest extends FreeSpec with Matchers {
         source)
 
       val coverage1 = Coverage()
-      coverage1.add(Statement(source, location, 1, 155, 176, 4, "", "", "", true, 1))
-      coverage1.add(Statement(source, location, 2, 200, 300, 5, "", "", "", false, 2))
+      coverage1.add(Statement(location, 1, 155, 176, 4, "", "", "", true, 1))
+      coverage1.add(Statement(location, 2, 200, 300, 5, "", "", "", false, 2))
       val dir1 = new File(IOUtils.getTempPath, UUID.randomUUID.toString)
       dir1.mkdir()
       new ScoverageXmlWriter(sourceRoot, dir1, false).write(coverage1)
 
       val coverage2 = Coverage()
-      coverage2.add(Statement(source, location, 1, 95, 105, 19, "", "", "", false, 0))
+      coverage2.add(Statement(location, 1, 95, 105, 19, "", "", "", false, 0))
       val dir2 = new File(IOUtils.getTempPath, UUID.randomUUID.toString)
       dir2.mkdir()
       new ScoverageXmlWriter(sourceRoot, dir2, false).write(coverage2)
 
       val coverage3 = Coverage()
-      coverage3.add(Statement(source, location, 2, 14, 1515, 544, "", "", "", false, 1))
+      coverage3.add(Statement(location, 2, 14, 1515, 544, "", "", "", false, 1))
       val dir3 = new File(IOUtils.getTempPath, UUID.randomUUID.toString)
       dir3.mkdir()
       new ScoverageXmlWriter(sourceRoot, dir3, false).write(coverage3)

scalac-scoverage-plugin/src/test/scala/scoverage/CoverageMetricsTest.scala

@@ -6,7 +6,7 @@ class CoverageMetricsTest extends FreeSpec with Matchers {
 
   "no branches with at least one invoked statement should have 100% branch coverage" in {
     val metrics = new CoverageMetrics {
-      override def statements: Iterable[Statement] = Seq(Statement(null,
+      override def statements: Iterable[Statement] = Seq(Statement(
         null,
         0,
         0,
@@ -26,7 +26,7 @@ class CoverageMetricsTest extends FreeSpec with Matchers {
 
   "no branches with no invoked statements should have 0% branch coverage" in {
     val metrics = new CoverageMetrics {
-      override def statements: Iterable[Statement] = Seq(Statement(null,
+      override def statements: Iterable[Statement] = Seq(Statement(
         null,
         0,
         0,

scalac-scoverage-plugin/src/test/scala/scoverage/CoverageTest.scala

@@ -12,16 +12,16 @@ class CoverageTest extends FunSuite with BeforeAndAfter with OneInstancePerTest
 
   test("coverage for no invoked statements is 0") {
     val coverage = Coverage()
-    coverage.add(Statement("", Location("", "","",  ClassType.Object, "", ""), 1, 2, 3, 4, "", "", "", false, 0))
+    coverage.add(Statement(Location("", "","",  ClassType.Object, "", ""), 1, 2, 3, 4, "", "", "", false, 0))
     assert(0 === coverage.statementCoverage)
   }
 
   test("coverage for invoked statements") {
     val coverage = Coverage()
-    coverage.add(Statement("", Location("", "","", ClassType.Object, "", ""), 1, 2, 3, 4, "", "", "", false, 3))
-    coverage.add(Statement("", Location("", "", "", ClassType.Object, "", ""), 2, 2, 3, 4, "", "", "", false, 0))
-    coverage.add(Statement("", Location("", "", "", ClassType.Object, "", ""), 3, 2, 3, 4, "", "", "", false, 0))
-    coverage.add(Statement("", Location("", "", "", ClassType.Object, "", ""), 4, 2, 3, 4, "", "", "", false, 0))
+    coverage.add(Statement(Location("", "","", ClassType.Object, "", ""), 1, 2, 3, 4, "", "", "", false, 3))
+    coverage.add(Statement(Location("", "", "", ClassType.Object, "", ""), 2, 2, 3, 4, "", "", "", false, 0))
+    coverage.add(Statement(Location("", "", "", ClassType.Object, "", ""), 3, 2, 3, 4, "", "", "", false, 0))
+    coverage.add(Statement(Location("", "", "", ClassType.Object, "", ""), 4, 2, 3, 4, "", "", "", false, 0))
     assert(0.25 === coverage.statementCoverage)
   }
 }

scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageHtmlWriterTest.scala

@@ -21,15 +21,15 @@ class ScoverageHtmlWriterTest extends FunSuite {
   val pathToClassInSubDir = pathToClassFile("subdir/ClassInSubDir.scala")
   val pathToClassInMainDir = pathToClassFile("ClassInMainDir.scala")
 
-  val statementForClassContainingHtml = Statement(pathToClassContainingHtml,
-    Location("coverage.sample", "ClassContainingHtml", "ClassContainingHtml", ClassType.Class, "some_html", pathToClassInSubDir),
+  val statementForClassContainingHtml = Statement(
+    Location("coverage.sample", "ClassContainingHtml", "ClassContainingHtml", ClassType.Class, "some_html", pathToClassContainingHtml),
     3, 74, 97, 4, "<div>HTML content</div>",
     "scala.Predef.println", "Apply", false, 0)
-  val statementForClassInSubDir = Statement(pathToClassInSubDir,
+  val statementForClassInSubDir = Statement(
     Location("coverage.sample", "ClassInSubDir", "ClassInSubDir", ClassType.Class, "msg_test", pathToClassInSubDir),
     2, 64, 84, 4, "scala.this.Predef.println(\"test code\")",
     "scala.Predef.println", "Apply", false, 0)
-  val statementForClassInMainDir = Statement(pathToClassInMainDir,
+  val statementForClassInMainDir = Statement(
     Location("coverage.sample", "ClassInMainDir", "ClassInMainDir", ClassType.Class, "msg_coverage", pathToClassInMainDir),
     1, 69, 104, 4, "scala.this.Predef.println(\"measure coverage of code\")",
     "scala.Predef.println", "Apply", false, 0)

scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageXmlReaderTest.scala

@@ -17,7 +17,7 @@ class ScoverageXmlReaderTest extends FreeSpec with Matchers {
 
       val coverage = Coverage()
 
-      coverage.add(Statement(canonicalPath("com/scoverage/class.scala"),
+      coverage.add(Statement(
         Location("com.scoverage",
           "Test",
           "com.scoverage.TopLevel.Test",
@@ -34,7 +34,7 @@ class ScoverageXmlReaderTest extends FreeSpec with Matchers {
         true,
         2))
 
-      coverage.add(Statement(canonicalPath("com/scoverage/foo/class.scala"),
+      coverage.add(Statement(
         Location("com.scoverage.foo",
           "ServiceState",
           "com.scoverage.foo.Service.ServiceState",

scalac-scoverage-plugin/src/test/scala/scoverage/SerializerTest.scala

@@ -13,14 +13,13 @@ class SerializerTest extends FunSuite with MockitoSugar with OneInstancePerTest
     val coverage = Coverage()
     coverage.add(
       Statement(
-        "mysource",
         Location("org.scoverage", "test", "org.scoverage.test", ClassType.Trait, "mymethod", "mypath"),
         14, 100, 200, 4, "def test : String", "test", "DefDef", true, 32
       )
     )
     val expected = <statements>
       <statement>
-        <source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <fullClassName>org.scoverage.test</fullClassName> <method>mymethod</method> <path>mypath</path> <id>14</id> <start>100</start> <end>200</end> <line>4</line> <description>def test : String</description> <symbolName>test</symbolName> <treeName>DefDef</treeName> <branch>true</branch> <count>32</count> <ignored>false</ignored>
+        <source>mypath</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <fullClassName>org.scoverage.test</fullClassName> <method>mymethod</method> <path>mypath</path> <id>14</id> <start>100</start> <end>200</end> <line>4</line> <description>def test : String</description> <symbolName>test</symbolName> <treeName>DefDef</treeName> <branch>true</branch> <count>32</count> <ignored>false</ignored>
       </statement>
     </statements>
     val writer = new StringWriter()
@@ -31,11 +30,10 @@ class SerializerTest extends FunSuite with MockitoSugar with OneInstancePerTest
   test("coverage should be deserializable from xml") {
     val input = <statements>
       <statement>
-        <source>mysource</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <fullClassName>org.scoverage.test</fullClassName> <method>mymethod</method> <path>mypath</path> <id>14</id> <start>100</start> <end>200</end> <line>4</line> <description>def test : String</description> <symbolName>test</symbolName> <treeName>DefDef</treeName> <branch>true</branch> <count>32</count> <ignored>false</ignored>
+        <source>mypath</source> <package>org.scoverage</package> <class>test</class> <classType>Trait</classType> <fullClassName>org.scoverage.test</fullClassName> <method>mymethod</method> <path>mypath</path> <id>14</id> <start>100</start> <end>200</end> <line>4</line> <description>def test : String</description> <symbolName>test</symbolName> <treeName>DefDef</treeName> <branch>true</branch> <count>32</count> <ignored>false</ignored>
       </statement>
     </statements>
     val statements = List(Statement(
-      "mysource",
       Location("org.scoverage", "test", "org.scoverage.test", ClassType.Trait, "mymethod", "mypath"),
       14, 100, 200, 4, "def test : String", "test", "DefDef", true, 32
     ))