Merge pull request #1333 from alexarchambault/update-scalafix

Update scalafix stuff…

Author: alexarchambault

.scalafix3.conf

@@ -1,11 +1,24 @@
 # Same as .scalafix.conf, but for RemoveUnused commented out
 rules  = [
   DisableSyntax,
-  # RemoveUnused
+  # RemoveUnused,
+  OrganizeImports,
+  NoValInForComprehension,
+  # ProcedureSyntax
 ]
 DisableSyntax.noFinalize = true
+DisableSyntax.noIsInstanceOf = true
+DisableSyntax.noReturns = true
 
 // `rules` on compilation
 triggered.rules = [
   DisableSyntax
 ]
+
+OrganizeImports {
+  coalesceToWildcardImportThreshold = 6
+  expandRelative = true
+  groups = ["*", "re:javax?\\.", "scala."]
+  groupedImports = AggressiveMerge
+  removeUnused = false # added for Scala 3
+}

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

@@ -13,6 +13,7 @@ import scala.annotation.tailrec
 import scala.build.EitherCps.{either, value}
 import scala.build.Inputs.VirtualScript.VirtualScriptNameRegex
 import scala.build.Ops.*
+import scala.build.actionable.ActionablePreprocessor
 import scala.build.compiler.{ScalaCompiler, ScalaCompilerMaker}
 import scala.build.errors.*
 import scala.build.internal.{Constants, CustomCodeWrapper, MainClass, Util}
@@ -24,7 +25,6 @@ import scala.collection.mutable.ListBuffer
 import scala.concurrent.duration.DurationInt
 import scala.util.Properties
 import scala.util.control.NonFatal
-import scala.build.actionable.ActionablePreprocessor
 
 trait Build {
   def inputs: Inputs

modules/build/src/main/scala/scala/build/Inputs.scala

@@ -6,15 +6,14 @@ import java.nio.charset.StandardCharsets
 import java.security.MessageDigest
 
 import scala.annotation.tailrec
-import scala.build.Inputs.WorkspaceOrigin
+import scala.build.Inputs.{Element, WorkspaceOrigin}
 import scala.build.errors.{BuildException, InputsException}
 import scala.build.internal.Constants
 import scala.build.internal.zip.WrappedZipInputStream
 import scala.build.options.Scope
 import scala.build.preprocessing.ScopePath
 import scala.util.Properties
 import scala.util.matching.Regex
-import scala.build.Inputs.Element
 
 final case class Inputs(
   elements: Seq[Inputs.Element],

modules/build/src/main/scala/scala/build/bsp/BspClient.scala

@@ -7,8 +7,6 @@ import java.net.URI
 import java.nio.file.Paths
 import java.util.concurrent.{ConcurrentHashMap, ExecutorService}
 
-import ch.epfl.scala.bsp4j.Location
-
 import scala.build.Position.File
 import scala.build.errors.{BuildException, CompositeBuildException, Diagnostic, Severity}
 import scala.build.postprocessing.LineConversion
@@ -197,7 +195,7 @@ class BspClient(
           new b.Diagnostic(range, diag.message)
 
         diag.relatedInformation.foreach { relatedInformation =>
-          val location = new Location(path.toNIO.toUri.toASCIIString, range)
+          val location = new b.Location(path.toNIO.toUri.toASCIIString, range)
           val related  = new b.DiagnosticRelatedInformation(location, relatedInformation.message)
           bDiag.setRelatedInformation(List(related).asJava)
         }

modules/build/src/main/scala/scala/build/bsp/BspImpl.scala

@@ -8,8 +8,10 @@ import org.eclipse.lsp4j.jsonrpc.messages.ResponseError
 
 import java.io.{InputStream, OutputStream}
 import java.util.concurrent.{CompletableFuture, Executor}
-import scala.build.*
+
 import scala.build.EitherCps.{either, value}
+import scala.build.*
+import scala.build.actionable.ActionablePreprocessor
 import scala.build.bloop.BloopServer
 import scala.build.compiler.BloopCompiler
 import scala.build.errors.{BuildException, Diagnostic, ParsingInputsException}
@@ -20,7 +22,6 @@ import scala.concurrent.duration.DurationInt
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.jdk.CollectionConverters.*
 import scala.util.{Failure, Success}
-import scala.build.actionable.ActionablePreprocessor
 
 /** The implementation for [[Bsp]].
   *

modules/build/src/main/scala/scala/build/bsp/package.scala

@@ -1,9 +1,10 @@
 package scala.build
 
-import ch.epfl.scala.bsp4j as b
 import ch.epfl.scala.bsp4j.SourcesItem
+import ch.epfl.scala.bsp4j as b
 
 import java.util.concurrent.CompletableFuture
+
 import scala.jdk.CollectionConverters.*
 
 package object bsp {

modules/build/src/main/scala/scala/build/internal/markdown/MarkdownCodeWrapper.scala

@@ -1,9 +1,8 @@
 package scala.build.internal.markdown
 
 import scala.annotation.tailrec
-import scala.build.internal.AmmUtil
 import scala.build.internal.markdown.MarkdownCodeBlock
-import scala.build.internal.Name
+import scala.build.internal.{AmmUtil, Name}
 
 /** A util for extraction and wrapping of code blocks in Markdown files.
   */

modules/build/src/main/scala/scala/build/preprocessing/DirectivesProcessor.scala

@@ -1,16 +1,15 @@
 package scala.build.preprocessing
 import scala.build.Logger
 import scala.build.Ops._
-import scala.build.errors.{BuildException, CompositeBuildException}
+import scala.build.errors.{BuildException, CompositeBuildException, DirectiveErrors}
 import scala.build.options.ConfigMonoid
 import scala.build.preprocessing.directives.{
   DirectiveHandler,
+  DirectiveUtil,
   ProcessedDirective,
   ScopedDirective,
   StrictDirective
 }
-import scala.build.errors.DirectiveErrors
-import scala.build.preprocessing.directives.DirectiveUtil
 
 object DirectivesProcessor {
 

modules/build/src/main/scala/scala/build/preprocessing/MarkdownPreprocessor.scala

@@ -1,6 +1,7 @@
 package scala.build.preprocessing
 
 import java.nio.charset.StandardCharsets
+
 import scala.build.EitherCps.{either, value}
 import scala.build.errors.BuildException
 import scala.build.internal.markdown.MarkdownCodeWrapper

modules/build/src/main/scala/scala/build/preprocessing/ScalaPreprocessor.scala

@@ -5,6 +5,7 @@ import dependency.AnyDependency
 import dependency.parser.DependencyParser
 
 import java.nio.charset.StandardCharsets
+
 import scala.build.EitherCps.{either, value}
 import scala.build.Ops.*
 import scala.build.errors.*