#45 No need for pre-component now

Author: sksamuel

src/main/scala/scoverage/plugin.scala

@@ -13,9 +13,8 @@ class ScoveragePlugin(val global: Global) extends Plugin {
 
   override val name: String = "scoverage"
   override val description: String = "scoverage code coverage compiler plugin"
-  val preComponent = new ScoveragePreComponent(global)
   val instrumentationComponent = new ScoverageInstrumentationComponent(global)
-  override val components: List[PluginComponent] = List(preComponent, instrumentationComponent)
+  override val components: List[PluginComponent] = List(instrumentationComponent)
 
   override def processOptions(opts: List[String], error: String => Unit) {
     val options = new ScoverageOptions
@@ -46,35 +45,6 @@ class ScoverageOptions {
   var dataDir: String = File.createTempFile("scoverage_datadir_not_defined", ".tmp").getParent
 }
 
-class ScoveragePreComponent(val global: Global) extends PluginComponent with TypingTransformers with Transform {
-
-  import global._
-
-  override val phaseName: String = "scoverage-pre"
-  override val runsAfter: List[String] = List("parser")
-  override val runsBefore = List[String]("namer")
-
-  override def newPhase(prev: scala.tools.nsc.Phase): Phase = new Phase(prev) {
-    override def run(): Unit = {
-      println("[scoverage]: Begin pre-instrumentation phase")
-      super.run()
-      println("[scoverage]: Pre-instrumentation complete")
-    }
-  }
-
-  protected def newTransformer(unit: CompilationUnit): Transformer = new Transformer(unit)
-  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 _ =>
-          super.transform(tree)
-      }
-    }
-  }
-}
-
 class ScoverageInstrumentationComponent(val global: Global)
   extends PluginComponent
   with TypingTransformers

src/test/scala/scoverage/PluginRunner.scala

@@ -1,11 +1,12 @@
 package scoverage
 
-import java.io.{FileNotFoundException, File}
-import scala.tools.nsc.transform.{TypingTransformers, Transform}
+import java.io.{File, FileNotFoundException}
 import java.net.URL
-import scala.tools.nsc.plugins.PluginComponent
-import scala.tools.nsc.{Phase, Global}
+
 import scala.collection.mutable.ListBuffer
+import scala.tools.nsc.Global
+import scala.tools.nsc.plugins.PluginComponent
+import scala.tools.nsc.transform.{Transform, TypingTransformers}
 
 /** @author Stephen Samuel */
 trait PluginSupport {
@@ -87,7 +88,6 @@ trait PluginSupport {
 class ScoverageAwareCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools.nsc.reporters.Reporter)
   extends scala.tools.nsc.Global(settings, reporter) {
 
-  val preComponent = new ScoveragePreComponent(this)
   val instrumentationComponent = new ScoverageInstrumentationComponent(this)
   instrumentationComponent.setOptions(new ScoverageOptions())
   val testStore = new ScoverageTestStoreComponent(this)
@@ -130,7 +130,6 @@ class ScoverageAwareCompiler(settings: scala.tools.nsc.Settings, reporter: scala
   override def computeInternalPhases() {
     val phs = List(
       syntaxAnalyzer -> "parse source into ASTs, perform simple desugaring",
-      preComponent -> "scoverage preComponent",
       analyzer.namerFactory -> "resolve names, attach symbols to named trees",
       analyzer.packageObjects -> "load package objects",
       analyzer.typerFactory -> "the meat and potatoes: type the trees",