add progress tracking/cancellation to extractSemanticDB

scala · Oct 25, 2023 · 51abd42 · 51abd42
1 parent 7ccdd40
commit 51abd42
Showing 1 changed file with 37 additions and 28 deletions.
diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
@@ -29,6 +29,7 @@ import dotty.tools.dotc.{semanticdb => s}
 import dotty.tools.io.{AbstractFile, JarArchive}
 import dotty.tools.dotc.semanticdb.DiagnosticOps.*
 import scala.util.{Using, Failure, Success}
+import java.nio.file.Path
 
 
 /** Extract symbol references and uses to semanticdb files.
@@ -65,41 +66,49 @@ class ExtractSemanticDB private (phaseMode: ExtractSemanticDB.PhaseMode) extends
     val appendDiagnostics = phaseMode == ExtractSemanticDB.PhaseMode.AppendDiagnostics
     if (appendDiagnostics)
       val warnings = ctx.reporter.allWarnings.groupBy(w => w.pos.source)
-      units.flatMap { unit =>
-        warnings.get(unit.source).map { ws =>
-          val unitCtx = ctx.fresh.setCompilationUnit(unit).withRootImports
-          val outputDir =
-            ExtractSemanticDB.semanticdbPath(
-              unit.source,
-              ExtractSemanticDB.semanticdbOutDir(using unitCtx),
-              sourceRoot
-            )
-          (outputDir, ws.map(_.toSemanticDiagnostic))
+      val buf = mutable.ListBuffer.empty[(Path, Seq[Diagnostic])]
+      units.foreach { unit =>
+        val unitCtx = ctx.fresh.setCompilationUnit(unit).withRootImports
+        monitor(phaseName) {
+          warnings.get(unit.source).foreach { ws =>
+            val outputDir =
+              ExtractSemanticDB.semanticdbPath(
+                unit.source,
+                ExtractSemanticDB.semanticdbOutDir(using unitCtx),
+                sourceRoot
+              )
+            buf += ((outputDir, ws.map(_.toSemanticDiagnostic)))
+          }
+        }(using unitCtx)
+      }
+      cancellable {
+        buf.toList.asJava.parallelStream().forEach { case (out, warnings) =>
+          ExtractSemanticDB.appendDiagnostics(warnings, out)
         }
-      }.asJava.parallelStream().forEach { case (out, warnings) =>
-        ExtractSemanticDB.appendDiagnostics(warnings, out)
       }
     else
       val writeSemanticdbText = ctx.settings.semanticdbText.value
       units.foreach { unit =>
         val unitCtx = ctx.fresh.setCompilationUnit(unit).withRootImports
-        val outputDir =
-          ExtractSemanticDB.semanticdbPath(
+        monitor(phaseName) {
+          val outputDir =
+            ExtractSemanticDB.semanticdbPath(
+              unit.source,
+              ExtractSemanticDB.semanticdbOutDir(using unitCtx),
+              sourceRoot
+            )
+          val extractor = ExtractSemanticDB.Extractor()
+          extractor.extract(unit.tpdTree)(using unitCtx)
+          ExtractSemanticDB.write(
             unit.source,
-            ExtractSemanticDB.semanticdbOutDir(using unitCtx),
-            sourceRoot
+            extractor.occurrences.toList,
+            extractor.symbolInfos.toList,
+            extractor.synthetics.toList,
+            outputDir,
+            sourceRoot,
+            writeSemanticdbText
           )
-        val extractor = ExtractSemanticDB.Extractor()
-        extractor.extract(unit.tpdTree)(using unitCtx)
-        ExtractSemanticDB.write(
-          unit.source,
-          extractor.occurrences.toList,
-          extractor.symbolInfos.toList,
-          extractor.synthetics.toList,
-          outputDir,
-          sourceRoot,
-          writeSemanticdbText
-        )
+        }(using unitCtx)
       }
     units
   }
@@ -611,4 +620,4 @@ object ExtractSemanticDB:
         traverse(vparam.tpt)
       tparams.foreach(tp => traverse(tp.rhs))
   end Extractor
-end ExtractSemanticDB
+end ExtractSemanticDB