Used MacroExpansion for better macro detection

Author: sksamuel

src/main/scala/scoverage/plugin.scala

@@ -107,7 +107,7 @@ class ScoverageInstrumentationComponent(val global: Global)
   override def newPhase(prev: scala.tools.nsc.Phase): Phase = new Phase(prev) {
 
     override def run(): Unit = {
-      println("[scoverage]: Cleaning datadir")
+      println(s"[scoverage]: Cleaning datadir [${options.dataDir}]")
       IOUtils.clean(options.dataDir)
 
       println("[scoverage]: Begin instrumentation phase")
@@ -294,7 +294,11 @@ class ScoverageInstrumentationComponent(val global: Global)
       tree match {
 
         // ignore synthetic trees that contain non-syths. Probably macros. Either way breaks due to range validation
-        case t if isSynthetic(t) && containsNonSynthetic(t) && !t.pos.isDefined => super.transform(t)
+        //case t if isSynthetic(t) && containsNonSynthetic(t) && !t.pos.isDefined =>
+        //   super.transform(t)
+
+        // ignore macro expanded code
+        case tree if tree.attachments.all.toString().contains("MacroExpansionAttachment") => tree
 
         /**
          * Object creation from new.

src/test/scala/scoverage/PluginCoverageTest.scala

@@ -94,7 +94,7 @@ class PluginCoverageTest
                           |  }
                           |} """.stripMargin)
     assert(!reporter.hasErrors)
-    assertNoCoverage
+    assertNoCoverage()
   }
 
   // https://github.com/skinny-framework/skinny-framework/issues/97
@@ -109,6 +109,6 @@ class PluginCoverageTest
                           |} """.stripMargin)
     assert(!reporter.hasErrors)
     assert(!reporter.hasWarnings)
-    assertNoCoverage
+    assertNoCoverage()
   }
 }