Merge pull request #160 from alexarchambault/more-scalafix-rules

More Scalafix rules

Author: alexarchambault

.scalafix.conf

@@ -1,10 +1,20 @@
 rules  = [
   DisableSyntax,
-  RemoveUnused
+  RemoveUnused,
+  OrganizeImports,
+  NoValInForComprehension,
+  ProcedureSyntax
 ]
 DisableSyntax.noFinalize = true
 
 // `rules` on compilation
 triggered.rules = [
   DisableSyntax
 ]
+
+OrganizeImports {
+  coalesceToWildcardImportThreshold = 6
+  expandRelative = true
+  groups = ["*", "re:javax?\\.", "scala."]
+  groupedImports = AggressiveMerge
+}

modules/bloop-rifle/src/main/scala/scala/build/bloop/BloopServer.scala

@@ -1,20 +1,20 @@
 package scala.build.bloop
 
+import ch.epfl.scala.bsp4j
+import org.eclipse.lsp4j.jsonrpc
+
 import java.io.IOException
 import java.net.{ConnectException, Socket}
 import java.nio.file.{Files, Path}
 import java.util.concurrent.{Future => JFuture, ScheduledExecutorService, TimeoutException}
 
-import ch.epfl.scala.bsp4j
-import org.eclipse.lsp4j.jsonrpc
-
 import scala.annotation.tailrec
 import scala.build.bloop.bloop4j.BloopExtraBuildParams
 import scala.build.blooprifle.internal.Constants
+import scala.build.blooprifle.{BloopRifle, BloopRifleConfig, BloopRifleLogger, BspConnection}
 import scala.collection.JavaConverters._
 import scala.concurrent.Await
 import scala.concurrent.duration.{Duration, FiniteDuration}
-import scala.build.blooprifle.{BloopRifle, BloopRifleConfig, BloopRifleLogger, BspConnection}
 
 trait BloopServer {
   def server: BuildServer

modules/bloop-rifle/src/main/scala/scala/build/bloop/BloopThreads.scala

@@ -1,7 +1,7 @@
 package scala.build.bloop
 
 import java.util.concurrent.atomic.AtomicInteger
-import java.util.concurrent.{Executors, ExecutorService, ScheduledExecutorService, ThreadFactory}
+import java.util.concurrent.{ExecutorService, Executors, ScheduledExecutorService, ThreadFactory}
 
 final case class BloopThreads(
   jsonrpc: ExecutorService,

modules/bloop-rifle/src/main/scala/scala/build/blooprifle/BloopRifle.scala

@@ -1,15 +1,16 @@
 package scala.build.blooprifle
 
 import java.io.{
+  ByteArrayOutputStream,
   File,
-  FileOutputStream,
   FileInputStream,
+  FileOutputStream,
   InputStream,
-  OutputStream,
-  ByteArrayOutputStream
+  OutputStream
 }
 import java.nio.file.Path
 import java.util.concurrent.ScheduledExecutorService
+
 import scala.build.blooprifle.internal.{Operations, Util}
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration

modules/bloop-rifle/src/main/scala/scala/build/blooprifle/BspConnection.scala

@@ -2,8 +2,8 @@ package scala.build.blooprifle
 
 import java.net.Socket
 
-import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.Future
+import scala.concurrent.duration.FiniteDuration
 
 trait BspConnection {
   def address: String

modules/bloop-rifle/src/main/scala/scala/build/blooprifle/internal/NamedSocketBuilder.scala

@@ -1,11 +1,11 @@
 package scala.build.blooprifle.internal
 
-import scala.util.Properties
-
 import org.scalasbt.ipcsocket.{UnixDomainSocket, Win32NamedPipeSocket}
 
 import java.net.Socket
 
+import scala.util.Properties
+
 // mostly there for GraalVM substitutions (see UnixNamedSocketBuilder / WindowsNamedSocketBuilder)
 class NamedSocketBuilder {
   def create(path: String): Socket =

modules/bloop-rifle/src/main/scala/scala/build/blooprifle/internal/Operations.scala

@@ -1,22 +1,19 @@
 package scala.build.blooprifle.internal
 
-import java.io.{File, InputStream, IOException, OutputStream}
+import org.scalasbt.ipcsocket.NativeErrorException
+import snailgun.TcpClient
+import snailgun.protocol.Streams
+
+import java.io.{File, IOException, InputStream, OutputStream}
 import java.net.{ConnectException, InetSocketAddress, Socket}
 import java.nio.file.Path
-import java.util.concurrent.{ExecutorService, ScheduledExecutorService, ScheduledFuture}
 import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.{ExecutorService, ScheduledExecutorService, ScheduledFuture}
 
 import scala.build.blooprifle.{BloopRifleLogger, BspConnection, BspConnectionAddress}
-import scala.concurrent.{Future, Promise}
-import scala.concurrent.duration.{Duration, FiniteDuration}
-import scala.util.{Failure, Success, Try}
-
-import org.scalasbt.ipcsocket.NativeErrorException
-import snailgun.TcpClient
-import snailgun.protocol.Streams
-
-import scala.concurrent.Await
 import scala.concurrent.duration._
+import scala.concurrent.{Await, Future, Promise}
+import scala.util.{Failure, Success, Try}
 
 object Operations {
 

modules/build/src/main/scala/scala/build/Artifacts.scala

@@ -1,20 +1,19 @@
 package scala.build
 
-import coursier.{Dependency => CsDependency, core => csCore, util => csUtil}
 import coursier.cache.FileCache
 import coursier.core.Classifier
-import coursier.Fetch
 import coursier.parse.RepositoryParser
+import coursier.{Dependency => CsDependency, Fetch, core => csCore, util => csUtil}
 import dependency._
 
 import java.nio.file.Path
 
-import scala.build.errors.{BuildException, CompositeBuildException}
 import scala.build.EitherCps.{either, value}
+import scala.build.Ops._
+import scala.build.errors.{BuildException, CompositeBuildException}
 import scala.build.internal.Constants
 import scala.build.internal.Constants._
 import scala.build.internal.Util.ScalaDependencyOps
-import scala.build.Ops._
 import scala.util.control.NonFatal
 
 final case class Artifacts(

modules/build/src/main/scala/scala/build/Bloop.scala

@@ -1,18 +1,17 @@
 package scala.build
 
 import ch.epfl.scala.bsp4j
-import dependency.{AnyDependency, DependencyLike, ScalaParameters, ScalaVersion}
 import dependency.parser.ModuleParser
+import dependency.{AnyDependency, DependencyLike, ScalaParameters, ScalaVersion}
 
 import java.io.File
 
-import scala.build.blooprifle.BloopRifleConfig
 import scala.build.EitherCps.{either, value}
-import scala.build.errors.ModuleFormatError
+import scala.build.blooprifle.BloopRifleConfig
+import scala.build.errors.{BuildException, ModuleFormatError}
 import scala.collection.JavaConverters._
 import scala.concurrent.duration.FiniteDuration
 import scala.util.Properties
-import scala.build.errors.BuildException
 
 object Bloop {
 

modules/build/src/main/scala/scala/build/Build.scala

@@ -3,18 +3,18 @@ package scala.build
 import ch.epfl.scala.bsp4j
 import com.swoval.files.FileTreeViews.Observer
 import com.swoval.files.{PathWatcher, PathWatchers}
-import scala.build.blooprifle.BloopRifleConfig
-import scala.build.EitherCps.{either, value}
-import scala.build.errors.{BuildException, CompositeBuildException}
-import scala.build.internal.{Constants, CustomCodeWrapper, MainClass, Util}
-import scala.build.Ops._
-import scala.build.options.BuildOptions
-import scala.build.postprocessing._
 
 import java.io.File
 import java.nio.file.{FileSystemException, Path}
 import java.util.concurrent.{ScheduledExecutorService, ScheduledFuture}
 
+import scala.build.EitherCps.{either, value}
+import scala.build.Ops._
+import scala.build.blooprifle.BloopRifleConfig
+import scala.build.errors.{BuildException, CompositeBuildException}
+import scala.build.internal.{Constants, CustomCodeWrapper, MainClass, Util}
+import scala.build.options.BuildOptions
+import scala.build.postprocessing._
 import scala.collection.mutable.ListBuffer
 import scala.concurrent.duration.DurationInt
 import scala.util.control.NonFatal