#23 Fixes for macros (ignore macros)

Author: sksamuel

src/main/scala/scoverage/plugin.scala

@@ -349,10 +349,16 @@ class ScoverageInstrumentationComponent(val global: Global)
             c
           }
 
-        // skip macros
+        // this will catch methods defined as macros, eg def test = macro testImpl
+        // it will not catch macro implemenations
         case d: DefDef if d.symbol != null && d.symbol.annotations.size > 0
           && d.symbol.annotations.head.atp.typeSymbol.nameString == "macroImpl" =>
-          tree.duplicate
+          tree
+
+        // will catch macro implemenations, as they must end with Expr, however will catch
+        // any method that ends in Expr. // todo add way of allowing methods that return Expr
+        case d: DefDef if d.symbol != null && d.tpt.symbol.fullNameString == "scala.reflect.api.Exprs.Expr" =>
+          tree
 
         // todo do we really want to ignore?
         case d: DefDef if d.symbol.isPrimaryConstructor => tree

src/test/scala/scoverage/PluginCoverageTest.scala

@@ -51,6 +51,7 @@ class PluginCoverageTest
                           |  def print1(list: List[String]) = for (string: String <- list) println(string)
                           |} """.stripMargin)
     assert(!reporter.hasErrors)
+    assert(!reporter.hasWarnings)
     // should have one statement for the withFilter invoke, one of the match selector,
     // one of the case block, one for the case string RHS value, one for the foreach block.
     assertNMeasuredStatements(5)
@@ -65,8 +66,26 @@ class PluginCoverageTest
                           |  }
                           |} """.stripMargin)
     assert(!reporter.hasErrors)
+    assert(!reporter.hasWarnings)
     // should have one statement for each literal, one for each case block, and one for the selector.
     assertNMeasuredStatements(7)
   }
 
+  test("scoverage component should not instrument any macro code") {
+    compileCodeSnippet( """
+                          | object MyMacro {
+                          | import scala.language.experimental.macros
+                          | import scala.reflect.macros.Context
+                          |  def test = macro testImpl
+                          |  def testImpl(c: Context): c.Expr[Unit] = {
+                          |    import c.universe._
+                          |    reify {
+                          |      println("macro test")
+                          |    }
+                          |  }
+                          |} """.stripMargin)
+    assert(!reporter.hasErrors)
+    assert(!reporter.hasWarnings)
+    assertNMeasuredStatements(0)
+  }
 }

src/test/scala/scoverage/PluginRunner.scala

@@ -75,6 +75,8 @@ trait PluginSupport {
       assert(compiler.testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked($k,"),
         s"Should be $n invoked statements but missing $k")
     }
+    assert(!compiler.testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked(${n + 1},"),
+      s"Found statement ${n + 1} but only expected $n")
   }
 }