Updated support for blocks

Author: sksamuel

src/main/scala/scales/coverage.scala

@@ -18,7 +18,10 @@ class Coverage
  def add(stmt: MeasuredStatement): Unit = statements.append(stmt)
 
  def avgClassesPerPackage = classCount / packageCount.toDouble
+ def avgClassesPerPackageFormatted: String = "%.2f".format(avgClassesPerPackage * 100)
+
  def avgMethodsPerClass = methodCount / classCount.toDouble
+ def avgMethodsPerClassFormatted: String = "%.2f".format(avgMethodsPerClass * 100)
 
  // returns the classes by least coverage
  def risks(limit: Int) = classes.toSeq.sortBy(_.statementCount).reverse.sortBy(_.statementCoverage).take(limit)
@@ -29,10 +32,10 @@ class Coverage
 
 trait MethodBuilders {
  val statements: Iterable[MeasuredStatement]
- def methodCount = methods.size
  def methods: Seq[MeasuredMethod] = {
  statements.groupBy(_.location.method).map(arg => MeasuredMethod(arg._1, arg._2)).toSeq
  }
+ def methodCount = methods.size
 }
 
 trait PackageBuilders {

src/main/scala/scales/plugin.scala

@@ -122,12 +122,14 @@ class ScalesComponent(val global: Global)
 
  case EmptyTree => super.transform(tree)
 
- // This AST node corresponds to the following Scala code:  fun(args)
+ // This AST node corresponds to the following Scala code: fun(args)
  case apply: Apply =>
  instrument(treeCopy.Apply(apply, apply.fun, transformStatements(apply.args)))
 
  // just carry on as normal with a block, we'll process the children
- case _: Block => super.transform(tree)
+ case b: Block =>
+ treeCopy.Block(b, transformStatements(b.stats), transform(b.expr))
+
  case _: Import => super.transform(tree)
  case p: PackageDef => super.transform(tree)
 
@@ -183,9 +185,9 @@ class ScalesComponent(val global: Global)
  case i: If =>
  treeCopy.If(i, i.cond, transformIf(i.thenp), transformIf(i.elsep))
 
- // handle function bodies. This AST node corresponds to the following Scala code:  vparams => body
+ // handle function bodies. This AST node corresponds to the following Scala code: vparams => body
  case f: Function =>
- treeCopy.Function(tree, f.vparams, transform(f.body))
+ treeCopy.Function(tree, f.vparams, process(f.body))
 
  // labeldefs are never written natively in scala
  case l: LabelDef =>