Merge pull request #2423 from tgodzik/remove-tempdirs-always

bugfix: Make sure tmp directories are removed
scalacenter · Sep 9, 2024 · a622b85 · a622b85
2 parents c6630f1 + c8afe70
commit a622b85
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/backend/src/main/scala/bloop/BloopClassFileManager.scala b/backend/src/main/scala/bloop/BloopClassFileManager.scala
@@ -57,6 +57,10 @@ final class BloopClassFileManager(
     allInvalidatedClassFilesForProject
   }
 
+  def deleteTemporaryFiles(): Unit = {
+    BloopPaths.delete(AbsolutePath(backupDir))
+  }
+
   private[this] val invalidatedClassFilesInDependentProjects: Set[File] = {
     inputs.invalidatedClassFilesInDependentProjects --
       inputs.generatedClassFilePathsInDependentProjects.valuesIterator

diff --git a/backend/src/main/scala/bloop/Compiler.scala b/backend/src/main/scala/bloop/Compiler.scala
@@ -275,7 +275,7 @@ object Compiler {
     val backgroundTasksForFailedCompilation =
       new mutable.ListBuffer[CompileBackgroundTasks.Sig]()
 
-    def newFileManager: ClassFileManager = {
+    def newFileManager: BloopClassFileManager = {
       new BloopClassFileManager(
         Files.createTempDirectory("bloop"),
         compileInputs,
@@ -544,6 +544,7 @@ object Compiler {
                 }
 
                 val deleteNewClassesDir = Task(BloopPaths.delete(AbsolutePath(newClassesDir)))
+                val cleanUpTemporaryFiles = Task(fileManager.deleteTemporaryFiles())
                 val publishClientAnalysis = Task {
                   rebaseAnalysisClassFiles(
                     analysis,
@@ -555,7 +556,12 @@ object Compiler {
                   .flatMap(clientClassesObserver.nextAnalysis)
                 Task
                   .gatherUnordered(
-                    List(deleteNewClassesDir, updateClientState, writeAnalysisIfMissing)
+                    List(
+                      deleteNewClassesDir,
+                      updateClientState,
+                      writeAnalysisIfMissing,
+                      cleanUpTemporaryFiles
+                    )
                   )
                   .flatMap(_ => publishClientAnalysis)
                   .onErrorHandleWith(err => {
@@ -565,7 +571,6 @@ object Compiler {
                   .doOnFinish(_ => Task(clientReporter.reportEndCompilation()))
               }
             }
-
             Result.Success(
               compileInputs.uniqueInputs,
               compileInputs.reporter,