#45 Fixing final vals in annotations

Author: sksamuel

src/main/scala/scoverage/plugin.scala

@@ -66,8 +66,8 @@ class ScoveragePreComponent(val global: Global) extends PluginComponent with Typ
   class Transformer(unit: global.CompilationUnit) extends TypingTransformer(unit) {
     override def transform(tree: Tree) = {
       tree match {
-        case v: ValDef if v.mods.isFinal =>
-          treeCopy.ValDef(v, v.mods.&~(ModifierFlags.FINAL), v.name, v.tpt, v.rhs)
+      //  case v: ValDef if v.mods.isFinal =>
+      //    treeCopy.ValDef(v, v.mods.&~(ModifierFlags.FINAL), v.name, v.tpt, v.rhs)
         case _ =>
           super.transform(tree)
       }

src/main/scala/scoverage/report/CodeGrid.scala

@@ -89,6 +89,18 @@ class PluginASTSupportTest
     assert(!reporter.hasWarnings)
   }
 
+  // https://github.com/scoverage/scalac-scoverage-plugin/issues/45
+  test("compile final vals in annotations") {
+    compileCodeSnippet( """object Foo  {
+                          |  final val foo = 1L
+                          |}
+                          |@SerialVersionUID(value = Foo.foo)
+                          |class Bar
+                          |""".stripMargin)
+    assert(!reporter.hasErrors)
+    assert(!reporter.hasWarnings)
+  }
+
   //test("type param with default arg supported") {
   // compileCodeSnippet( """   class TypeTreeObjects {
   //                       |      class Container {

src/test/scala/scoverage/PluginASTSupportTest.scala

@@ -23,14 +23,19 @@ class PluginCoverageTest
     assertNMeasuredStatements(2)
   }
 
-  test("scoverage should instrument private final vals") {
+  test("scoverage should instrument final vals") {
     compileCodeSnippet( """ object FinalVals {
-                          |  private final val name = "sammy"
+                          |  final val name = {
+                          |     val name = "sammy"
+                          |     if (System.currentTimeMillis() > 0) {
+                          |      println(name)
+                          |     }
+                          |  }
                           |  println(name)
                           |} """.stripMargin)
     assert(!reporter.hasErrors)
     // we should have 3 statements - initialising the val, executing println, and executing the parameter
-    assertNMeasuredStatements(3)
+    assertNMeasuredStatements(8)
   }
 
   test("scoverage should instrument selectors in match") {