#88 Improved coverage of match clauses

Author: sksamuel

project/Scoverage.scala

@@ -4,7 +4,7 @@ import sbt._
 object Scoverage extends Build {
 
   val Org = "org.scoverage"
-  val Version = "1.0.1"
+  val Version = "1.0.3-SNAPSHOT"
   val Scala = "2.11.4"
   val MockitoVersion = "1.9.5"
   val ScalatestVersion = "2.2.2"
@@ -73,6 +73,7 @@ object Scoverage extends Build {
     .settings(appSettings: _*)
 
   lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plugin"))
+    .dependsOn(runtime % "test")
     .settings(name := "scalac-scoverage-plugin")
     .settings(appSettings: _*)
     .settings(libraryDependencies ++= Seq(

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

@@ -146,7 +146,7 @@ class ScoverageInstrumentationComponent(val global: Global)
     def transformCases(cases: List[CaseDef]): List[CaseDef] = {
       cases.map(c => {
         treeCopy.CaseDef(
-          c, c.pat, process(c.guard), instrument(process(c.body), c)
+          c, c.pat, process(c.guard), process(c.body)
         )
       })
     }
@@ -431,7 +431,7 @@ class ScoverageInstrumentationComponent(val global: Global)
             treeCopy
               .Match(tree, instrument(selector, selector), transformCases(cases.dropRight(1)) ++ cases.takeRight(1))
           } else {
-            instrument(treeCopy.Match(tree, process(selector), transformCases(cases)), m)
+            treeCopy.Match(tree, process(selector), transformCases(cases))
           }
 
         // a synthetic object is a generated object, such as case class companion

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

@@ -56,6 +56,39 @@ class PluginCoverageTest
     compiler.assertNMeasuredStatements(8)
   }
 
+  test("scoverage should not instrument the match as a statement") {
+    val compiler = ScoverageCompiler.default
+    compiler.compileCodeSnippet( """ object A {
+                                   |    System.currentTimeMillis() match {
+                                   |      case x => println(x)
+                                   |    }
+                                   |} """.stripMargin)
+    assert(!compiler.reporter.hasErrors)
+    assert(!compiler.reporter.hasWarnings)
+
+    /** should have the following statements instrumented:
+      * the selector, clause 1
+      */
+    compiler.assertNMeasuredStatements(2)
+  }
+  test("scoverage should instrument match guards") {
+    val compiler = ScoverageCompiler.default
+    compiler.compileCodeSnippet( """ object A {
+                                   |    System.currentTimeMillis() match {
+                                   |      case l if l < 1000 => println("a")
+                                   |      case l if l > 1000 => println("b")
+                                   |      case _ => println("c")
+                                   |    }
+                                   |} """.stripMargin)
+    assert(!compiler.reporter.hasErrors)
+    assert(!compiler.reporter.hasWarnings)
+
+    /** should have the following statements instrumented:
+      * the selector, guard 1, clause 1, guard 2, clause 2, clause 3
+      */
+    compiler.assertNMeasuredStatements(6)
+  }
+
   test("scoverage should instrument selectors in match") {
     val compiler = ScoverageCompiler.default
     compiler.compileCodeSnippet( """ trait A {