Merge pull request #146 from tgodzik/updates

Update fork with all the newest changes

Author: tgodzik

.github/workflows/ci.yml

@@ -67,8 +67,8 @@ jobs:
           .github/setup-test-projects.sh &&\
           ./mill -i 'backend[_].test.compile' &&\
           ./mill -i 'frontend[_].test.compile' &&\
-          ./mill -i 'backend[2.12.17].test' &&\
-          ./mill -i 'frontend[2.12.17].test'
+          ./mill -i 'backend[2.12.18].test' &&\
+          ./mill -i 'frontend[2.12.18].test'
         shell: bash
 
   jvm-tests:

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.7.3"
+version = "3.7.8"
 
 align.preset = more
 maxColumn = 100

backend/src/main/scala/bloop/BloopClassFileManager.scala

@@ -200,6 +200,8 @@ final class BloopClassFileManager(
   }
 
   def complete(success: Boolean): Unit = {
+
+    val deleteAfterCompilation = Task { BloopPaths.delete(AbsolutePath(backupDir)) }
     if (success) {
       dependentClassFilesLinks.foreach { unnecessaryClassFileLink =>
         Files.deleteIfExists(unnecessaryClassFileLink)
@@ -219,12 +221,14 @@ final class BloopClassFileManager(
                 newClassesDir,
                 clientExternalClassesDir.underlying,
                 inputs.ioScheduler,
-                enableCancellation = false
+                enableCancellation = false,
+                inputs.logger
               )
               .map { walked =>
                 readOnlyCopyDenylist.++=(walked.target)
                 ()
               }
+              .flatMap(_ => deleteAfterCompilation)
           }
         }
       )
@@ -247,7 +251,9 @@ final class BloopClassFileManager(
       // Delete all compilation products generated in the new classes directory
       val deleteNewDir = Task { BloopPaths.delete(AbsolutePath(newClassesDir)); () }.memoize
       backgroundTasksForFailedCompilation.+=((_, _, clientTracer: BraveTracer) => {
-        clientTracer.traceTask("delete class files after")(_ => deleteNewDir)
+        clientTracer.traceTask("delete class files after")(_ =>
+          deleteNewDir.flatMap(_ => deleteAfterCompilation)
+        )
       })
 
       backgroundTasksForFailedCompilation.+=(
@@ -274,13 +280,15 @@ final class BloopClassFileManager(
                     Paths.get(readOnlyClassesDirPath),
                     clientExternalClassesDir.underlying,
                     inputs.ioScheduler,
-                    enableCancellation = false
+                    enableCancellation = false,
+                    inputs.logger
                   )
                   .map(_ => ())
               }
           }
       )
     }
+
   }
 
   private def move(c: File): File = {

backend/src/main/scala/bloop/Compiler.scala

@@ -434,7 +434,8 @@ object Compiler {
                   readOnlyClassesDir,
                   clientClassesDir.underlying,
                   compileInputs.ioScheduler,
-                  enableCancellation = false
+                  enableCancellation = false,
+                  compileInputs.logger
                 )
 
                 lastCopy.map { _ =>

backend/src/main/scala/bloop/io/ParallelOps.scala

@@ -22,6 +22,8 @@ import monix.execution.cancelables.CompositeCancelable
 import monix.reactive.Consumer
 import monix.reactive.MulticastStrategy
 import monix.reactive.Observable
+import bloop.logging.Logger
+import scala.util.control.NonFatal
 
 object ParallelOps {
 
@@ -67,7 +69,8 @@ object ParallelOps {
       origin: Path,
       target: Path,
       scheduler: Scheduler,
-      enableCancellation: Boolean
+      enableCancellation: Boolean,
+      logger: Logger
   ): Task[FileWalk] = Task.defer {
     val isCancelled = AtomicBoolean(false)
 
@@ -152,7 +155,7 @@ object ParallelOps {
 
     val copyFileSequentially = Consumer.foreachTask[((Path, BasicFileAttributes), Path)] {
       case ((originFile, originAttrs), targetFile) =>
-        def copy(replaceExisting: Boolean): Unit = {
+        def copy(replaceExisting: Boolean): Unit = try {
           if (replaceExisting) {
             Files.copy(
               originFile,
@@ -168,6 +171,12 @@ object ParallelOps {
             )
           }
           ()
+        } catch {
+          case NonFatal(t) =>
+            logger.report(
+              s"Unexpected error when copying $originFile to $targetFile, you might need to restart the build server.",
+              t
+            )
         }
 
         // It's important that this task is not forked for performance reasons

backend/src/main/scala/bloop/reporter/Reporter.scala

@@ -94,7 +94,16 @@ abstract class Reporter(
       case _ =>
         val mappedPos = p.position
         val problemID = if (p.position.sourceFile.isPresent) nextID() else -1
-        Problem(problemID, p.severity, p.message, mappedPos, p.category, p.diagnosticCode())
+        Problem(
+          problemID,
+          p.severity,
+          p.message,
+          mappedPos,
+          p.category,
+          p.diagnosticCode(),
+          p.diagnosticRelatedInformation(),
+          p.actions()
+        )
     }
   }
 

backend/src/main/scala/sbt/internal/inc/bloop/BloopZincCompiler.scala

@@ -247,7 +247,7 @@ object BloopZincCompiler {
       skip: Boolean = false,
       incrementalCompilerOptions: IncOptions,
       extra: List[(String, String)]
-  ): Task[CompileConfiguration] = Task.now {
+  )(implicit logger: ObservedLogger[_]): Task[CompileConfiguration] = Task.now {
     // Remove directories from classpath hashes, we're only interested in jars
     val jarClasspathHashes = BloopLookup.filterOutDirsFromHashedClasspath(classpathHashes)
     val compileSetup = MiniSetup.of(
@@ -284,7 +284,7 @@ object BloopZincCompiler {
       earlyOutput = None,
       // deals with pipelining, not supported yet
       earlyAnalysisStore = None,
-      stamper = BloopStamps.initial
+      stamper = BloopStamps.initial(logger)
     )
   }
 }

backend/src/main/scala/sbt/internal/inc/bloop/ZincInternals.scala

@@ -24,7 +24,7 @@ object ZincInternals {
       rangePosition.orElse {
         for { line <- asIntPos(position.line()) } yield (
           line,
-          asIntPos(position.pointer()).getOrElse(0)
+          asIntPos(position.pointer()).orElse(asIntPos(position.offset())).getOrElse(0)
         )
       }
     }

backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopAnalysisCallback.scala

@@ -229,7 +229,10 @@ final class BloopAnalysisCallback(
         externalSourceDependency(sourceClassName, targetBinaryClassName, api, context)
       case None =>
         // dependency is some other binary on the classpath
-        externalBinaryDependency(classFile, onBinaryName, sourceFile)
+        val name = classFile.toString()
+        // avoid binary deps which are not one of those
+        if (name.endsWith(".class") || name.endsWith(".jar"))
+          externalBinaryDependency(classFile, onBinaryName, sourceFile)
     }
   }
 

backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopIncremental.scala

@@ -48,7 +48,7 @@ object BloopIncremental {
       }
     }
 
-    val current = BloopStamps.initial
+    val current = BloopStamps.initial(log)
     val externalAPI = getExternalAPI(lookup)
     val previous = previous0 match { case a: Analysis => a }
     val previousRelations = previous.relations