Include all statements excluded by $COVERAGE-OFF$

Statements surrounded by $COVERAGE-OFF$ / $COVERAGE-ON$ tags are now
included in the scoverage-data/scoverage.coverage.xml and scoverage.xml
files however an "ignored" attribute has been added to the Statement
object to indicate that the statement is contained within the above tags.

Author: rigoford

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

@@ -69,6 +69,9 @@ object Serializer {
           <count>
             {stmt.count.toString}
           </count>
+          <ignored>
+            {stmt.ignored.toString}
+          </ignored>
         </statement>
         Utility.trim(xml) + "\n"
       }
@@ -86,6 +89,7 @@ object Serializer {
     val statements = xml \ "statement" map (node => {
       val source = (node \ "source").text
       val count = (node \ "count").text.toInt
+      val ignored = (node \ "ignored").text.toBoolean
       val branch = (node \ "branch").text.toBoolean
       val _package = (node \ "package").text
       val _class = (node \ "class").text
@@ -112,12 +116,12 @@ object Serializer {
         line,
         desc,
         symbolName,
-        treeName, branch, count)
+        treeName, branch, count, ignored)
     })
 
     val coverage = Coverage()
     for ( statement <- statements )
-      coverage.add(statement)
+      if (!statement.ignored) coverage.add(statement)
     coverage
   }
 

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

@@ -94,7 +94,8 @@ case class Statement(source: String,
                      symbolName: String,
                      treeName: String,
                      branch: Boolean,
-                     var count: Int = 0) extends java.io.Serializable {
+                     var count: Int = 0,
+                     ignored: Boolean = false) extends java.io.Serializable {
   def invoked(): Unit = count = count + 1
   def isInvoked = count > 0
 }

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

@@ -166,22 +166,23 @@ class ScoverageInstrumentationComponent(val global: Global)
           reporter.echo(s"[warn] Could not instrument [${tree.getClass.getSimpleName}/${tree.symbol}]. No pos.")
           tree
         case Some(source) =>
+          val id = statementIds.incrementAndGet
+          val statement = Statement(
+            source.path,
+            location,
+            id,
+            safeStart(tree),
+            safeEnd(tree),
+            safeLine(tree),
+            original.toString,
+            Option(original.symbol).fold("<nosymbol>")(_.fullNameString),
+            tree.getClass.getSimpleName,
+            branch
+          )
           if (tree.pos.isDefined && !isStatementIncluded(tree.pos)) {
+            coverage.add(statement.copy(ignored = true))
             tree
           } else {
-            val id = statementIds.incrementAndGet
-            val statement = Statement(
-              source.path,
-              location,
-              id,
-              safeStart(tree),
-              safeEnd(tree),
-              safeLine(tree),
-              original.toString,
-              Option(original.symbol).fold("<nosymbol>")(_.fullNameString),
-              tree.getClass.getSimpleName,
-              branch
-            )
             coverage.add(statement)
 
             val apply = invokeCall(id)

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

@@ -31,6 +31,7 @@ object ScoverageXmlReader {
       val count = node \ "@invocation-count"
       val symbolName = node \ "@symbol"
       val treeName = node \ "@tree"
+      val ignored = node \ "@ignored"
 
       val location = Location(pkg.text,
         classname.text,
@@ -52,7 +53,8 @@ object ScoverageXmlReader {
         symbolName.text,
         treeName.text,
         branch.text.toBoolean,
-        count.text.toInt
+        count.text.toInt,
+        ignored.text.toBoolean
       )
     }
     coverage

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

@@ -46,7 +46,8 @@ class ScoverageXmlWriter(sourceDirectories: Seq[File], outputDir: File, debug: B
                    symbol={Serializer.escape(stmt.symbolName)}
                    tree={Serializer.escape(stmt.treeName)}
                    branch={stmt.branch.toString}
-                   invocation-count={stmt.count.toString}>
+                   invocation-count={stmt.count.toString}
+                   ignored={stmt.ignored.toString}>
           {Serializer.escape(stmt.desc)}
         </statement>
       case false =>
@@ -60,7 +61,8 @@ class ScoverageXmlWriter(sourceDirectories: Seq[File], outputDir: File, debug: B
                      end={stmt.end.toString}
                      line={stmt.line.toString}
                      branch={stmt.branch.toString}
-                     invocation-count={stmt.count.toString}/>
+                     invocation-count={stmt.count.toString}
+                     ignored={stmt.ignored.toString}/>
     }
   }