Issues with 1.0.4 locally, now fixed

Author: sksamuel

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

@@ -23,11 +23,15 @@ class CodeGrid(mfile: MeasuredFile) {
   mfile.statements.foreach(stmt => {
     for ( k <- stmt.start until stmt.end ) {
       if (k < cells.size) {
-        // if the cell is set to NotInvoked, then it cannot be changed further, even if an outer statement
-        // is green. This is because, for example, a block may be entered, but not all contained statements
+        // if the cell is set to Invoked, then it be changed to NotInvoked, as an inner statement will override
+        // outer containing statments. If a cell is NotInvoked then it can not be changed further.
         // in that block were executed
-        if (cells(k).status != NotInvoked) {
-          if (stmt.isInvoked) cells(k).status = Invoked
+        cells(k).status match {
+          case Invoked => if (!stmt.isInvoked) cells(k).status = NotInvoked
+          case NoData =>
+            if (!stmt.isInvoked) cells(k).status = NotInvoked
+            else if (stmt.isInvoked) cells(k).status = Invoked
+          case NotInvoked =>
         }
       }
     }

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

@@ -19,10 +19,10 @@ class StatementWriter(mfile: MeasuredFile) {
 
     <table cellspacing="0" cellpadding="0" class="table statementlist">
       <tr>
-        <th>Line Number</th>
-        <th>Statement Id</th>
+        <th>Line</th>
+        <th>Stmt Id</th>
         <th>Pos</th>
-        <th>Tree Type</th>
+        <th>Tree</th>
         <th>Symbol</th>
         <th>Code</th>
       </tr>{mfile.statements.toSeq.sortBy(_.line).map(stmt => {