Merge pull request #63 from alexarchambault/merge-upstream

Merge upstream changes

Author: alexarchambault

.gitignore

@@ -34,5 +34,6 @@ website/build/bloop-gh-pages/
 node_modules/
 package-lock.json
 .metals/
+**/metals.sbt
 *.lock
 benchmark-bridge/corpus/

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

@@ -16,7 +16,6 @@ import bloop.io.AbsolutePath
 import bloop.io.ParallelOps
 import bloop.io.ParallelOps.CopyMode
 import bloop.io.{Paths => BloopPaths}
-import bloop.reporter.Reporter
 import bloop.tracing.BraveTracer
 
 import monix.eval.Task
@@ -210,7 +209,7 @@ final class BloopClassFileManager(
       backgroundTasksWhenNewSuccessfulAnalysis.+=(
         (
             clientExternalClassesDir: AbsolutePath,
-            clientReporter: Reporter,
+            _,
             clientTracer: BraveTracer
         ) => {
           clientTracer.traceTaskVerbose("copy new products to external classes dir") { _ =>
@@ -220,7 +219,6 @@ final class BloopClassFileManager(
                 newClassesDir,
                 clientExternalClassesDir.underlying,
                 inputs.ioScheduler,
-                inputs.logger,
                 enableCancellation = false
               )
               .map { walked =>
@@ -248,20 +246,14 @@ final class BloopClassFileManager(
 
       // Delete all compilation products generated in the new classes directory
       val deleteNewDir = Task { BloopPaths.delete(AbsolutePath(newClassesDir)); () }.memoize
-      backgroundTasksForFailedCompilation.+=(
-        (
-            clientExternalClassesDir: AbsolutePath,
-            clientReporter: Reporter,
-            clientTracer: BraveTracer
-        ) => {
-          clientTracer.traceTask("delete class files after")(_ => deleteNewDir)
-        }
-      )
+      backgroundTasksForFailedCompilation.+=((_, _, clientTracer: BraveTracer) => {
+        clientTracer.traceTask("delete class files after")(_ => deleteNewDir)
+      })
 
       backgroundTasksForFailedCompilation.+=(
         (
             clientExternalClassesDir: AbsolutePath,
-            clientReporter: Reporter,
+            _,
             clientTracer: BraveTracer
         ) =>
           Task.defer {
@@ -282,7 +274,6 @@ final class BloopClassFileManager(
                     Paths.get(readOnlyClassesDirPath),
                     clientExternalClassesDir.underlying,
                     inputs.ioScheduler,
-                    inputs.logger,
                     enableCancellation = false
                   )
                   .map(_ => ())

backend/src/main/scala/bloop/BloopClasspathEntryLookup.scala

@@ -51,7 +51,7 @@ final class BloopClasspathEntryLookup(
                   case null =>
                     if (entry.isDirectory()) entryHash -> new DirectoryDefinesClass(entry)
                     else entryHash -> computeDefinesClassForJar
-                  case current @ (cachedHash, cachedDefinesClass) =>
+                  case current @ (cachedHash, _) =>
                     if (entryHash.hash() == cachedHash.hash()) current
                     else entryHash -> computeDefinesClassForJar
                 }
@@ -106,7 +106,7 @@ final class BloopClasspathEntryLookup(
     }
 
     private def subDirectory(base: File, parts: Seq[String]): File =
-      (base /: parts)((b, p) => new File(b, p))
+      parts.foldLeft(base) { (b, p) => new File(b, p) }
 
     private def components(className: String): (Seq[String], String) = {
       assume(!className.isEmpty)

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

@@ -25,7 +25,6 @@ import bloop.util.CacheHashCode
 import bloop.util.UUIDUtil
 
 import monix.eval.Task
-import monix.execution.CancelableFuture
 import monix.execution.Scheduler
 import sbt.internal.inc.Analysis
 import sbt.internal.inc.ConcreteAnalysisContents
@@ -338,13 +337,6 @@ object Compiler {
       Setup.create(lookup, skip, cacheFile, compilerCache, incOptions, reporter, progress, empty)
     }
 
-    def runAggregateTasks(tasks: List[Task[Unit]]): CancelableFuture[Unit] = {
-      Task
-        .gatherUnordered(tasks)
-        .map(_ => ())
-        .runAsync(compileInputs.ioScheduler)
-    }
-
     val start = System.nanoTime()
     val scalaInstance = compileInputs.scalaInstance
     val classpathOptions = compileInputs.classpathOptions
@@ -442,11 +434,10 @@ object Compiler {
                   readOnlyClassesDir,
                   clientClassesDir.underlying,
                   compileInputs.ioScheduler,
-                  compileInputs.logger,
                   enableCancellation = false
                 )
 
-                lastCopy.map { fs =>
+                lastCopy.map { _ =>
                   clientLogger.debug(
                     s"Finished copying classes from $readOnlyClassesDir to $clientClassesDir"
                   )

backend/src/main/scala/bloop/CompilerCache.scala

@@ -127,9 +127,7 @@ final class CompilerCache(
           componentProvider,
           Some(Paths.getCacheDirectory("bridge-cache").toFile),
           bridgeSources,
-          retrieveDir.toFile,
-          logger,
-          scheduler
+          logger
         )
     }
   }

backend/src/main/scala/bloop/DependencyResolution.scala

@@ -34,7 +34,7 @@ object DependencyResolution {
       logger: Logger,
       resolveSources: Boolean = false,
       additionalRepos: Seq[Repository] = Nil
-  )(implicit ec: scala.concurrent.ExecutionContext): Array[AbsolutePath] = {
+  ): Array[AbsolutePath] = {
     resolveWithErrors(artifacts, logger, resolveSources, additionalRepos) match {
       case Right(paths) => paths
       case Left(error) => throw error
@@ -54,15 +54,15 @@ object DependencyResolution {
       logger: Logger,
       resolveSources: Boolean = false,
       additionalRepositories: Seq[Repository] = Nil
-  )(implicit ec: scala.concurrent.ExecutionContext): Either[CoursierError, Array[AbsolutePath]] = {
+  ): Either[CoursierError, Array[AbsolutePath]] = {
     val dependencies = artifacts.map { artifact =>
       import artifact._
       logger.debug(s"Resolving $organization:$module:$version")(DebugFilter.All)
       val baseDep = coursierapi.Dependency.of(organization, module, version)
       if (resolveSources) baseDep.withClassifier("sources")
       else baseDep
     }
-    resolveDependenciesWithErrors(dependencies, logger, resolveSources, additionalRepositories)
+    resolveDependenciesWithErrors(dependencies, resolveSources, additionalRepositories)
   }
 
   /**
@@ -77,11 +77,10 @@ object DependencyResolution {
    */
   def resolveDependenciesWithErrors(
       dependencies: Seq[coursierapi.Dependency],
-      logger: Logger,
       resolveSources: Boolean = false,
       additionalRepositories: Seq[Repository] = Nil
-  )(implicit ec: scala.concurrent.ExecutionContext): Either[CoursierError, Array[AbsolutePath]] = {
-    var fetch = coursierapi.Fetch
+  ): Either[CoursierError, Array[AbsolutePath]] = {
+    val fetch = coursierapi.Fetch
       .create()
       .withDependencies(dependencies: _*)
     if (resolveSources)

backend/src/main/scala/bloop/ScalaInstance.scala

@@ -124,7 +124,6 @@ final class ScalaInstance private (
 
 object ScalaInstance {
   import bloop.io.AbsolutePath
-  import scala.concurrent.ExecutionContext
 
   private[ScalaInstance] val bootClassLoader: ClassLoader = {
     if (!scala.util.Properties.isJavaAtLeast("9")) null
@@ -170,7 +169,7 @@ object ScalaInstance {
       scalaVersion: String,
       allJars: Seq[AbsolutePath],
       logger: Logger
-  )(implicit ec: ExecutionContext): ScalaInstance = {
+  ): ScalaInstance = {
     val jarsKey = allJars.map(_.underlying).sortBy(_.toString).toList
     if (allJars.nonEmpty) {
       def newInstance = {
@@ -197,7 +196,7 @@ object ScalaInstance {
       scalaName: String,
       scalaVersion: String,
       logger: Logger
-  )(implicit ec: ExecutionContext): ScalaInstance = {
+  ): ScalaInstance = {
     def resolveInstance: ScalaInstance = {
       val allPaths = DependencyResolution.resolve(
         List(DependencyResolution.Artifact(scalaOrg, scalaName, scalaVersion)),
@@ -237,9 +236,7 @@ object ScalaInstance {
    * happen to be so strict as to prevent getting the location from the protected
    * domain.
    */
-  def scalaInstanceForJavaProjects(
-      logger: Logger
-  )(implicit ec: ExecutionContext): Option[ScalaInstance] = {
+  def scalaInstanceForJavaProjects(logger: Logger): Option[ScalaInstance] = {
     lazy val tempDirectory = Files.createTempDirectory("bloop-scala-instance")
     implicit val filter = DebugFilter.Compilation
     def findLocationForClazz(clazz: Class[_], jarName: String): Option[Path] = {
@@ -249,7 +246,7 @@ object ScalaInstance {
 
         try Some(Paths.get(expectedPath))
         catch {
-          case t: java.nio.file.FileSystemNotFoundException =>
+          case _: java.nio.file.FileSystemNotFoundException =>
             // When bloop is bootstrapped by coursier, jars are available from resources instead
             logger.debug(
               s"Load jar from resource because scheme '${expectedPath.getScheme}' has no file system provider"

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

@@ -108,7 +108,7 @@ object ClasspathHasher {
                 }
               } catch {
                 // Can happen when a file doesn't exist, for example
-                case monix.execution.misc.NonFatal(t) => BloopStamps.emptyHash(path)
+                case monix.execution.misc.NonFatal(_) => BloopStamps.emptyHash(path)
               }
             classpathHashes(idx) = hash
             hashingPromises.remove(path, p)
@@ -152,7 +152,7 @@ object ClasspathHasher {
       }
     }
 
-    tracer.traceTaskVerbose("computing hashes") { tracer =>
+    tracer.traceTaskVerbose("computing hashes") { _ =>
       val acquiredByOtherTasks = new mutable.ListBuffer[Task[Unit]]()
       val acquiredByThisHashingProcess = new mutable.ListBuffer[AcquiredTask]()
 
@@ -189,7 +189,7 @@ object ClasspathHasher {
 
       val initEntries = Task {
         classpath.zipWithIndex.foreach {
-          case t @ (absoluteEntry, idx) =>
+          case (absoluteEntry, idx) =>
             acquireHashingEntry(absoluteEntry.underlying, idx)
         }
       }.doOnCancel(Task { isCancelled.compareAndSet(false, true); () })
@@ -198,7 +198,7 @@ object ClasspathHasher {
       val acquiredTask = Observable.fromIterable(acquiredByThisHashingProcess)
 
       val cancelableAcquiredTask = Task.create[Unit] { (scheduler, cb) =>
-        val (out, consumerSubscription) = parallelConsumer.createSubscriber(cb, scheduler)
+        val (out, _) = parallelConsumer.createSubscriber(cb, scheduler)
         val _ = acquiredTask.subscribe(out)
         Cancelable { () =>
           isCancelled.compareAndSet(false, true); ()

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

@@ -11,8 +11,6 @@ import java.util.concurrent.ConcurrentHashMap
 
 import scala.concurrent.Promise
 
-import bloop.logging.Logger
-
 import monix.eval.Task
 import monix.execution.Cancelable
 import monix.execution.Scheduler
@@ -67,7 +65,6 @@ object ParallelOps {
       origin: Path,
       target: Path,
       scheduler: Scheduler,
-      logger: Logger,
       enableCancellation: Boolean
   ): Task[FileWalk] = Task.defer {
     val isCancelled = AtomicBoolean(false)
@@ -192,7 +189,7 @@ object ParallelOps {
                       if (!changedMetadata) ()
                       else copy(replaceExisting = true)
                     // Can happen when the file does not exist, replace in that case
-                    case Failure(t: IOException) => copy(replaceExisting = true)
+                    case Failure(_: IOException) => copy(replaceExisting = true)
                     case Failure(t) => throw t
                   }
                 case CopyMode.NoReplace =>

backend/src/main/scala/bloop/logging/ProcessLogger.scala

@@ -20,7 +20,6 @@ class ProcessLogger(underlying: Logger, process: Process) {
   private[this] val processErr = process.getErrorStream
 
   def start(): Unit = {
-    implicit val ctx: DebugFilter = DebugFilter.All
     underlying.printDebug("Starting to log output from process...")
     new StreamLogger(underlying.info, processOut).start()
     new StreamLogger(underlying.error, processErr).start()