Use Phase::isRunnable infrastructure in sbt phases

Author: allanrenucci

compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala

@@ -41,6 +41,11 @@ import scala.collection.mutable
 class ExtractAPI extends Phase {
   override def phaseName: String = "sbt-api"
 
+  override def isRunnable(implicit ctx: Context): Boolean = {
+    def forceRun = ctx.settings.YdumpSbtInc.value || ctx.settings.YforceSbtPhases.value
+    super.isRunnable && (ctx.sbtCallback != null || forceRun)
+  }
+
   // SuperAccessors need to be part of the API (see the scripted test
   // `trait-super` for an example where this matters), this is only the case
   // after `PostTyper` (unlike `ExtractDependencies`, the simplication to trees
@@ -50,9 +55,7 @@ class ExtractAPI extends Phase {
 
   override def run(implicit ctx: Context): Unit = {
     val unit = ctx.compilationUnit
-    val dumpInc = ctx.settings.YdumpSbtInc.value
-    val forceRun = dumpInc || ctx.settings.YforceSbtPhases.value
-    if ((ctx.sbtCallback != null || forceRun) && !unit.isJava) {
+    if (!unit.isJava) {
       val sourceFile = unit.source.file
       if (ctx.sbtCallback != null)
         ctx.sbtCallback.startSource(sourceFile.file)
@@ -61,7 +64,7 @@ class ExtractAPI extends Phase {
       val classes = apiTraverser.apiSource(unit.tpdTree)
       val mainClasses = apiTraverser.mainClasses
 
-      if (dumpInc) {
+      if (ctx.settings.YdumpSbtInc.value) {
         // Append to existing file that should have been created by ExtractDependencies
         val pw = new PrintWriter(File(sourceFile.jpath).changeExtension("inc").toFile
           .bufferedWriter(append = true), true)

compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala

@@ -49,22 +49,23 @@ class ExtractDependencies extends Phase {
 
   override def phaseName: String = "sbt-deps"
 
+  override def isRunnable(implicit ctx: Context): Boolean = {
+    def forceRun = ctx.settings.YdumpSbtInc.value || ctx.settings.YforceSbtPhases.value
+    super.isRunnable && (ctx.sbtCallback != null || forceRun)
+  }
+
   // This phase should be run directly after `Frontend`, if it is run after
   // `PostTyper`, some dependencies will be lost because trees get simplified.
   // See the scripted test `constants` for an example where this matters.
   // TODO: Add a `Phase#runsBefore` method ?
 
   override def run(implicit ctx: Context): Unit = {
     val unit = ctx.compilationUnit
-    val dumpInc = ctx.settings.YdumpSbtInc.value
-    val forceRun = dumpInc || ctx.settings.YforceSbtPhases.value
-    val shouldRun = !unit.isJava && (ctx.sbtCallback != null || forceRun)
-
-    if (shouldRun) {
+    if (!unit.isJava) {
       val collector = new ExtractDependenciesCollector
       collector.traverse(unit.tpdTree)
 
-      if (dumpInc) {
+      if (ctx.settings.YdumpSbtInc.value) {
         val deps = collector.dependencies.map(_.toString).toArray[Object]
         val names = collector.usedNames.map { case (clazz, names) => s"$clazz: $names" }.toArray[Object]
         Arrays.sort(deps)