Skip to content

Commit 823cde4

Browse files
tgodziktgodzik
authored
Merge pull request scalacenter#1700 from kpodsiad/chore/scalafix
chore: add scalafix
2 parents 8332ee9 + 985a0b3 commit 823cde4

File tree

240 files changed

+2412
-2035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+2412
-2035
lines changed

‎.scalafix.conf

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
rules = [
2+
DisableSyntax,
3+
OrganizeImports,
4+
NoValInForComprehension,
5+
]
6+
7+
OrganizeImports {
8+
removeUnused = true
9+
expandRelative = true
10+
groupedImports = Explode
11+
groups = [
12+
"re:javax?\\."
13+
"scala."
14+
"ch.epfl"
15+
"bloop"
16+
"*"
17+
]
18+
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
package bloop
22

3-
import bloop.io.AbsolutePath
4-
import bloop.io.ParallelOps
5-
import bloop.io.ParallelOps.CopyMode
6-
import bloop.io.{Paths => BloopPaths}
7-
import bloop.reporter.Reporter
8-
import bloop.tracing.BraveTracer
9-
import monix.eval.Task
10-
import xsbti.compile.ClassFileManager
11-
import xsbti.compile.PreviousResult
12-
133
import java.io.File
144
import java.io.IOException
15-
import java.nio.file.CopyOption
165
import java.nio.file.Files
176
import java.nio.file.Path
187
import java.nio.file.Paths
198
import java.nio.file.StandardCopyOption
9+
2010
import scala.collection.mutable
2111
import scala.util.Failure
2212
import scala.util.Success
2313
import scala.util.Try
2414

15+
import bloop.io.AbsolutePath
16+
import bloop.io.ParallelOps
17+
import bloop.io.ParallelOps.CopyMode
18+
import bloop.io.{Paths => BloopPaths}
19+
import bloop.reporter.Reporter
20+
import bloop.tracing.BraveTracer
21+
22+
import monix.eval.Task
23+
import xsbti.compile.ClassFileManager
24+
2525
final class BloopClassFileManager(
2626
backupDir0: Path,
2727
inputs: CompileInputs,

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
package bloop
22

3-
import bloop.util.AnalysisUtils
3+
import java.io.File
4+
import java.nio.file.Path
5+
import java.util.concurrent.ConcurrentHashMap
6+
import java.util.zip.ZipException
7+
import java.util.zip.ZipFile
8+
import java.{util => ju}
9+
410
import sbt.internal.inc.PlainVirtualFileConverter
5-
import sbt.internal.inc.bloop.internal.BloopNameHashing
611
import sbt.internal.inc.bloop.internal.BloopStamps
712
import sbt.internal.inc.classpath.ClasspathUtil
8-
import sbt.internal.inc.classpath.ClasspathUtilities
913
import sbt.util.InterfaceUtil
1014
import xsbti.FileConverter
1115
import xsbti.VirtualFile
@@ -15,13 +19,6 @@ import xsbti.compile.FileHash
1519
import xsbti.compile.PerClasspathEntryLookup
1620
import xsbti.compile.PreviousResult
1721

18-
import java.io.File
19-
import java.nio.file.Path
20-
import java.util.concurrent.ConcurrentHashMap
21-
import java.util.zip.ZipException
22-
import java.util.zip.ZipFile
23-
import java.{util => ju}
24-
2522
final class BloopClasspathEntryLookup(
2623
results: Map[File, PreviousResult],
2724
classpathHashes: Vector[FileHash],

‎backend/src/main/scala/bloop/CompileBackgroundTasks.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package bloop
22

3-
import monix.eval.Task
4-
53
import bloop.io.AbsolutePath
6-
import bloop.tracing.BraveTracer
7-
import bloop.reporter.Reporter
84
import bloop.logging.Logger
5+
import bloop.reporter.Reporter
6+
import bloop.tracing.BraveTracer
7+
8+
import monix.eval.Task
99

1010
abstract class CompileBackgroundTasks {
1111
def trigger(

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

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,44 @@
11
package bloop
22

3-
import java.util.Optional
43
import java.io.File
5-
import java.util.concurrent.{Executor, ConcurrentHashMap}
6-
import java.nio.file.{Files, Path}
4+
import java.nio.file.Files
5+
import java.nio.file.Path
6+
import java.util.Optional
7+
import java.util.concurrent.Executor
8+
9+
import scala.collection.mutable
10+
import scala.concurrent.Promise
711

8-
import bloop.io.{Paths => BloopPaths}
912
import bloop.io.AbsolutePath
1013
import bloop.io.ParallelOps
1114
import bloop.io.ParallelOps.CopyMode
15+
import bloop.io.{Paths => BloopPaths}
16+
import bloop.logging.DebugFilter
17+
import bloop.logging.Logger
18+
import bloop.logging.ObservedLogger
19+
import bloop.reporter.ProblemPerPhase
20+
import bloop.reporter.Reporter
21+
import bloop.reporter.ZincReporter
1222
import bloop.tracing.BraveTracer
13-
import bloop.logging.{ObservedLogger, Logger}
14-
import bloop.reporter.{ProblemPerPhase, ZincReporter}
15-
import bloop.util.{AnalysisUtils, UUIDUtil, CacheHashCode}
16-
17-
import xsbti.compile._
18-
import xsbti.T2
19-
20-
import sbt.util.InterfaceUtil
21-
import sbt.internal.inc.Analysis
22-
import sbt.internal.inc.bloop.BloopZincCompiler
23-
import sbt.internal.inc.{FreshCompilerCache, InitialChanges, Locate}
24-
import sbt.internal.inc.{ConcreteAnalysisContents, FileAnalysisStore}
25-
26-
import scala.concurrent.Promise
27-
import scala.collection.mutable
23+
import bloop.util.AnalysisUtils
24+
import bloop.util.CacheHashCode
25+
import bloop.util.UUIDUtil
2826

2927
import monix.eval.Task
30-
import monix.execution.Scheduler
3128
import monix.execution.CancelableFuture
32-
import monix.execution.ExecutionModel
33-
import sbt.internal.inc.bloop.internal.BloopStamps
29+
import monix.execution.Scheduler
30+
import sbt.internal.inc.Analysis
31+
import sbt.internal.inc.ConcreteAnalysisContents
32+
import sbt.internal.inc.FileAnalysisStore
33+
import sbt.internal.inc.FreshCompilerCache
34+
import sbt.internal.inc.PlainVirtualFileConverter
35+
import sbt.internal.inc.bloop.BloopZincCompiler
3436
import sbt.internal.inc.bloop.internal.BloopLookup
35-
import bloop.reporter.Reporter
36-
import bloop.logging.CompilationEvent
37-
import xsbti.VirtualFile
37+
import sbt.internal.inc.bloop.internal.BloopStamps
38+
import sbt.util.InterfaceUtil
39+
import xsbti.T2
3840
import xsbti.VirtualFileRef
39-
import sbt.internal.inc.PlainVirtualFileConverter
41+
import xsbti.compile._
4042

4143
case class CompileInputs(
4244
scalaInstance: ScalaInstance,
@@ -162,7 +164,7 @@ object CompileOutPaths {
162164
}
163165

164166
object Compiler {
165-
private implicit val filter = bloop.logging.DebugFilter.Compilation
167+
private implicit val filter: DebugFilter.Compilation.type = bloop.logging.DebugFilter.Compilation
166168
private val converter = PlainVirtualFileConverter.converter
167169
private final class BloopProgress(
168170
reporter: ZincReporter,

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

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,48 @@
11
package bloop
22

3+
import java.io.File
4+
import java.io.IOException
5+
import java.io.PrintWriter
6+
import java.lang.Iterable
7+
import java.util.concurrent.ConcurrentHashMap
8+
import javax.tools.FileObject
9+
import javax.tools.ForwardingJavaFileManager
10+
import javax.tools.JavaFileManager
11+
import javax.tools.JavaFileManager.Location
12+
import javax.tools.JavaFileObject
13+
import javax.tools.JavaFileObject.Kind
14+
import javax.tools.{JavaCompiler => JavaxCompiler}
15+
16+
import scala.collection.mutable.HashSet
17+
import scala.concurrent.ExecutionContext
18+
319
import bloop.io.AbsolutePath
420
import bloop.io.Paths
521
import bloop.logging.Logger
622
import bloop.util.JavaRuntime
23+
724
import sbt.internal.inc.AnalyzingCompiler
825
import sbt.internal.inc.BloopComponentCompiler
926
import sbt.internal.inc.BloopZincLibraryManagement
27+
import sbt.internal.inc.CompilerArguments
28+
import sbt.internal.inc.PlainVirtualFileConverter
1029
import sbt.internal.inc.ZincUtil
11-
import sbt.internal.inc.bloop.ZincInternals
1230
import sbt.internal.inc.javac.DiagnosticsReporter
1331
import sbt.internal.inc.javac.JavaTools
1432
import sbt.internal.inc.javac.Javadoc
1533
import sbt.internal.inc.javac.WriteReportingJavaFileObject
1634
import sbt.internal.util.LoggerWriter
1735
import sbt.librarymanagement.Resolver
1836
import xsbti.ComponentProvider
37+
import xsbti.VirtualFile
1938
import xsbti.compile.ClassFileManager
2039
import xsbti.compile.Compilers
2140
import xsbti.compile.JavaCompiler
41+
import xsbti.compile.Output
2242
import xsbti.compile.ScalaCompiler
23-
import xsbti.compile.{JavaTool => XJavaTool}
2443
import xsbti.{Logger => XLogger}
2544
import xsbti.{Reporter => XReporter}
2645

27-
import java.io.File
28-
import java.io.IOException
29-
import java.io.PrintWriter
30-
import java.lang.Iterable
31-
import java.util.concurrent.ConcurrentHashMap
32-
import javax.tools.FileObject
33-
import javax.tools.ForwardingJavaFileManager
34-
import javax.tools.JavaFileManager
35-
import javax.tools.JavaFileManager.Location
36-
import javax.tools.JavaFileObject
37-
import javax.tools.JavaFileObject.Kind
38-
import javax.tools.{JavaCompiler => JavaxCompiler}
39-
import scala.collection.mutable.HashSet
40-
import scala.concurrent.ExecutionContext
41-
import xsbti.VirtualFile
42-
import bloop.util.AnalysisUtils
43-
import xsbti.compile.{IncToolOptions, Output}
44-
import sbt.internal.inc.CompilerArguments
45-
import sbt.internal.inc.PlainVirtualFileConverter
46-
4746
final class CompilerCache(
4847
componentProvider: ComponentProvider,
4948
retrieveDir: AbsolutePath,
@@ -271,7 +270,6 @@ final class CompilerCache(
271270
}
272271

273272
var compileSuccess = false
274-
import sbt.internal.inc.javac.WriteReportingFileManager
275273
val zincFileManager = incToolOptions.classFileManager().get()
276274
val fileManager = new BloopInvalidatingFileManager(fileManager0, zincFileManager)
277275
val sourceFiles: Array[File] = sources.map(converter.toPath(_).toFile())

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package bloop
22

3-
import bloop.logging.{DebugFilter, Logger}
3+
import scala.collection.JavaConverters._
4+
45
import bloop.io.AbsolutePath
6+
import bloop.logging.DebugFilter
7+
import bloop.logging.Logger
58

6-
import sbt.librarymanagement._
7-
import sbt.librarymanagement.ivy._
89
import coursierapi.Repository
910
import coursierapi.error.CoursierError
1011

11-
import scala.collection.JavaConverters._
12-
1312
object DependencyResolution {
1413

1514
/**

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
package bloop
22

33
import java.io.File
4-
import java.net.URLClassLoader
5-
import java.nio.file.{Files, Path, Paths, StandardCopyOption}
6-
import java.nio.file.attribute.{BasicFileAttributes, FileTime}
7-
import java.util.Properties
84
import java.lang.invoke.MethodHandles
95
import java.lang.invoke.MethodType
10-
11-
import bloop.internal.build.BloopScalaInfo
12-
import bloop.logging.{DebugFilter, Logger}
6+
import java.net.URLClassLoader
7+
import java.nio.file.Files
8+
import java.nio.file.Path
9+
import java.nio.file.Paths
10+
import java.nio.file.attribute.BasicFileAttributes
11+
import java.nio.file.attribute.FileTime
12+
import java.util.Properties
1313

1414
import scala.util.control.NonFatal
15-
import sbt.internal.inc.BloopComponentCompiler
15+
16+
import bloop.internal.build.BloopScalaInfo
17+
import bloop.logging.DebugFilter
18+
import bloop.logging.Logger
1619

1720
final class ScalaInstance private (
1821
val organization: String,

‎backend/src/main/scala/bloop/UniqueCompileInputs.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package bloop
22

3-
import bloop.io.AbsolutePath
43
import bloop.util.CacheHashCode
5-
import xsbti.compile.FileHash
4+
65
import xsbti.VirtualFileRef
6+
import xsbti.compile.FileHash
77

88
case class UniqueCompileInputs(
99
sources: Vector[UniqueCompileInputs.HashedSource],

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
package bloop.io
22

3-
import bloop.logging.Logger
4-
import bloop.logging.DebugFilter
5-
import bloop.tracing.BraveTracer
3+
import java.io.File
4+
import java.io.InputStream
5+
import java.io.PrintStream
6+
import java.nio.file.Files
7+
import java.nio.file.Path
8+
import java.nio.file.attribute.BasicFileAttributes
9+
import java.nio.file.attribute.FileTime
10+
import java.util.concurrent.ConcurrentHashMap
11+
import java.util.concurrent.TimeUnit
12+
import java.util.zip.ZipEntry
613

714
import scala.collection.mutable
815
import scala.concurrent.Promise
916

10-
import java.io.{File, InputStream}
11-
import java.nio.file.{Files, NoSuchFileException, Path}
12-
import java.util.concurrent.ConcurrentHashMap
13-
import java.nio.file.attribute.{BasicFileAttributes, FileTime}
14-
import java.util.zip.ZipEntry
17+
import bloop.logging.Logger
18+
import bloop.tracing.BraveTracer
1519

1620
import monix.eval.Task
17-
import monix.eval.Callback
18-
import monix.execution.Scheduler
1921
import monix.execution.Cancelable
22+
import monix.execution.Scheduler
2023
import monix.execution.atomic.AtomicBoolean
21-
import monix.execution.cancelables.CompositeCancelable
22-
import monix.reactive.{Observable, MulticastStrategy, Consumer}
23-
24-
import xsbti.compile.FileHash
25-
import sbt.internal.inc.{EmptyStamp, Stamper}
24+
import monix.reactive.Consumer
25+
import monix.reactive.Observable
2626
import sbt.internal.inc.bloop.internal.BloopStamps
2727
import sbt.io.IO
28-
import java.util.concurrent.TimeUnit
29-
import java.io.PrintStream
30-
import xsbti.VirtualFile
28+
import xsbti.compile.FileHash
3129

3230
object ClasspathHasher {
3331

0 commit comments

Comments
 (0)