Skip to content

Commit c841d31

Browse files
Update Scalafix, apply rules
1 parent 81f5475 commit c841d31

Some content is hidden

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

45 files changed

+95
-82
lines changed

.scalafix3.conf

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
# Same as .scalafix.conf, but for RemoveUnused commented out
22
rules = [
33
DisableSyntax,
4-
# RemoveUnused
4+
# RemoveUnused,
5+
OrganizeImports,
6+
NoValInForComprehension,
7+
# ProcedureSyntax
58
]
69
DisableSyntax.noFinalize = true
10+
DisableSyntax.noIsInstanceOf = true
11+
DisableSyntax.noReturns = true
712

813
// `rules` on compilation
914
triggered.rules = [
1015
DisableSyntax
1116
]
17+
18+
OrganizeImports {
19+
coalesceToWildcardImportThreshold = 6
20+
expandRelative = true
21+
groups = ["*", "re:javax?\\.", "scala."]
22+
groupedImports = AggressiveMerge
23+
removeUnused = false # added for Scala 3
24+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import scala.annotation.tailrec
1313
import scala.build.EitherCps.{either, value}
1414
import scala.build.Inputs.VirtualScript.VirtualScriptNameRegex
1515
import scala.build.Ops.*
16+
import scala.build.actionable.ActionablePreprocessor
1617
import scala.build.compiler.{ScalaCompiler, ScalaCompilerMaker}
1718
import scala.build.errors.*
1819
import scala.build.internal.{Constants, CustomCodeWrapper, MainClass, Util}
@@ -23,7 +24,6 @@ import scala.collection.mutable.ListBuffer
2324
import scala.concurrent.duration.DurationInt
2425
import scala.util.Properties
2526
import scala.util.control.NonFatal
26-
import scala.build.actionable.ActionablePreprocessor
2727

2828
trait Build {
2929
def inputs: Inputs

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ import java.nio.charset.StandardCharsets
66
import java.security.MessageDigest
77

88
import scala.annotation.tailrec
9-
import scala.build.Inputs.WorkspaceOrigin
9+
import scala.build.Inputs.{Element, WorkspaceOrigin}
1010
import scala.build.errors.{BuildException, InputsException}
1111
import scala.build.internal.Constants
1212
import scala.build.internal.zip.WrappedZipInputStream
1313
import scala.build.options.Scope
1414
import scala.build.preprocessing.ScopePath
1515
import scala.util.Properties
1616
import scala.util.matching.Regex
17-
import scala.build.Inputs.Element
1817

1918
final case class Inputs(
2019
elements: Seq[Inputs.Element],

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package scala.build.bsp
22

3+
import ch.epfl.scala.bsp4j.Location
34
import ch.epfl.scala.{bsp4j => b}
45

56
import java.lang.{Boolean => JBoolean}
67
import java.net.URI
78
import java.nio.file.Paths
89
import java.util.concurrent.{ConcurrentHashMap, ExecutorService}
910

10-
import ch.epfl.scala.bsp4j.Location
11-
1211
import scala.build.Position.File
1312
import scala.build.errors.{BuildException, CompositeBuildException, Diagnostic, Severity}
1413
import scala.build.postprocessing.LineConversion

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ import org.eclipse.lsp4j.jsonrpc.messages.ResponseError
88

99
import java.io.{InputStream, OutputStream}
1010
import java.util.concurrent.{CompletableFuture, Executor}
11-
import scala.build.*
11+
1212
import scala.build.EitherCps.{either, value}
13+
import scala.build.*
14+
import scala.build.actionable.ActionablePreprocessor
1315
import scala.build.bloop.BloopServer
1416
import scala.build.compiler.BloopCompiler
1517
import scala.build.errors.{BuildException, Diagnostic, ParsingInputsException}
@@ -20,7 +22,6 @@ import scala.concurrent.duration.DurationInt
2022
import scala.concurrent.{ExecutionContext, Future, Promise}
2123
import scala.jdk.CollectionConverters.*
2224
import scala.util.{Failure, Success}
23-
import scala.build.actionable.ActionablePreprocessor
2425

2526
/** The implementation for [[Bsp]].
2627
*

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package scala.build
22

3-
import ch.epfl.scala.bsp4j as b
43
import ch.epfl.scala.bsp4j.SourcesItem
4+
import ch.epfl.scala.bsp4j as b
55

66
import java.util.concurrent.CompletableFuture
7+
78
import scala.jdk.CollectionConverters.*
89

910
package object bsp {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package scala.build.internal.markdown
22

33
import scala.annotation.tailrec
4-
import scala.build.internal.AmmUtil
54
import scala.build.internal.markdown.MarkdownCodeBlock
6-
import scala.build.internal.Name
5+
import scala.build.internal.{AmmUtil, Name}
76

87
/** A util for extraction and wrapping of code blocks in Markdown files.
98
*/

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package scala.build.preprocessing
22
import scala.build.Logger
33
import scala.build.Ops._
4-
import scala.build.errors.{BuildException, CompositeBuildException}
4+
import scala.build.errors.{BuildException, CompositeBuildException, DirectiveErrors}
55
import scala.build.options.ConfigMonoid
66
import scala.build.preprocessing.directives.{
77
DirectiveHandler,
8+
DirectiveUtil,
89
ProcessedDirective,
910
ScopedDirective,
1011
StrictDirective
1112
}
12-
import scala.build.errors.DirectiveErrors
13-
import scala.build.preprocessing.directives.DirectiveUtil
1413

1514
object DirectivesProcessor {
1615

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package scala.build.preprocessing
22

33
import java.nio.charset.StandardCharsets
4+
45
import scala.build.EitherCps.{either, value}
56
import scala.build.errors.BuildException
67
import scala.build.internal.markdown.MarkdownCodeWrapper

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import dependency.AnyDependency
55
import dependency.parser.DependencyParser
66

77
import java.nio.charset.StandardCharsets
8+
89
import scala.build.EitherCps.{either, value}
910
import scala.build.Ops.*
1011
import scala.build.errors.*

modules/cli/src/main/scala/scala/cli/commands/Bsp.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ import scala.build.{Build, CrossSources, Inputs, PersistentDiagnosticLogger, Sou
1212
import scala.cli.CurrentParams
1313
import scala.cli.commands.util.CommonOps._
1414
import scala.cli.commands.util.SharedOptionsUtil._
15+
import scala.cli.config.{ConfigDb, Keys}
1516
import scala.concurrent.Await
1617
import scala.concurrent.duration.Duration
17-
import scala.cli.config.{ConfigDb, Keys}
18-
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
1918

2019
object Bsp extends ScalaCommand[BspOptions] {
2120
override def hidden = true

modules/cli/src/main/scala/scala/cli/commands/Clean.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import caseapp._
44

55
import scala.build.internal.Constants
66
import scala.build.{Inputs, Os}
7-
import scala.cli.CurrentParams
87
import scala.cli.commands.util.CommonOps._
9-
import scala.cli.ScalaCli
8+
import scala.cli.{CurrentParams, ScalaCli}
109

1110
object Clean extends ScalaCommand[CleanOptions] {
1211
override def group = "Main"

modules/cli/src/main/scala/scala/cli/commands/Compile.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import java.io.File
77
import scala.build.options.Scope
88
import scala.build.{Build, BuildThreads, Builds, Os}
99
import scala.cli.CurrentParams
10+
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
1011
import scala.cli.commands.util.SharedOptionsUtil._
1112
import scala.cli.config.{ConfigDb, Keys}
12-
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
1313

1414
object Compile extends ScalaCommand[CompileOptions] {
1515
override def group = "Main"

modules/cli/src/main/scala/scala/cli/commands/Default.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package scala.cli.commands
22

33
import caseapp.core.help.RuntimeCommandsHelp
44
import caseapp.core.{Error, RemainingArgs}
5-
import scala.cli.commands.util.SharedOptionsUtil.*
65

76
import scala.build.internal.Constants
7+
import scala.cli.commands.util.SharedOptionsUtil.*
88
import scala.cli.{CurrentParams, ScalaCliHelp}
99

1010
class Default(

modules/cli/src/main/scala/scala/cli/commands/Doc.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import scala.build.errors.BuildException
1212
import scala.build.interactive.InteractiveFileOps
1313
import scala.build.internal.Runner
1414
import scala.cli.CurrentParams
15+
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
1516
import scala.cli.commands.util.SharedOptionsUtil._
17+
import scala.cli.config.{ConfigDb, Keys}
1618
import scala.cli.errors.ScaladocGenerationFailedError
1719
import scala.util.Properties
18-
import scala.cli.config.{ConfigDb, Keys}
19-
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
2020

2121
object Doc extends ScalaCommand[DocOptions] {
2222
override def group = "Main"

modules/cli/src/main/scala/scala/cli/commands/Metabrowse.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import java.io.File
88
import scala.build.internal.{Constants, ExternalBinaryParams, FetchExternalBinary, Runner}
99
import scala.build.{Build, BuildThreads, Logger}
1010
import scala.cli.CurrentParams
11+
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
1112
import scala.cli.commands.util.SharedOptionsUtil._
13+
import scala.cli.config.{ConfigDb, Keys}
1214
import scala.cli.packaging.Library
1315
import scala.util.Properties
14-
import scala.cli.config.{ConfigDb, Keys}
15-
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
1616

1717
object Metabrowse extends ScalaCommand[MetabrowseOptions] {
1818
override def hidden = true

modules/cli/src/main/scala/scala/cli/commands/Package.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import java.io.{ByteArrayOutputStream, OutputStream}
1515
import java.nio.charset.StandardCharsets
1616
import java.nio.file.attribute.FileTime
1717
import java.util.zip.{ZipEntry, ZipOutputStream}
18-
import scala.build.*
18+
1919
import scala.build.EitherCps.{either, value}
2020
import scala.build.Ops.*
21+
import scala.build.*
2122
import scala.build.errors.*
2223
import scala.build.interactive.InteractiveFileOps
2324
import scala.build.internal.Util.*

modules/cli/src/main/scala/scala/cli/commands/Repl.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@ import coursier.error.{FetchError, ResolutionError}
66

77
import scala.build.EitherCps.{either, value}
88
import scala.build._
9-
import scala.build.errors.{BuildException, FetchingDependenciesError, CantDownloadAmmoniteError}
9+
import scala.build.errors.{BuildException, CantDownloadAmmoniteError, FetchingDependenciesError}
1010
import scala.build.internal.Runner
1111
import scala.build.options.{BuildOptions, JavaOpt, Scope}
1212
import scala.cli.CurrentParams
1313
import scala.cli.commands.Run.maybePrintSimpleScalacOutput
1414
import scala.cli.commands.util.CommonOps._
1515
import scala.cli.commands.util.SharedOptionsUtil._
16-
import scala.util.Properties
1716
import scala.cli.config.{ConfigDb, Keys}
18-
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
17+
import scala.util.Properties
1918

2019
object Repl extends ScalaCommand[ReplOptions] {
2120
override def group = "Main"

modules/cli/src/main/scala/scala/cli/commands/Run.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import caseapp.*
55

66
import java.io.File
77
import java.util.concurrent.CompletableFuture
8+
89
import scala.build.EitherCps.{either, value}
10+
import scala.build.*
911
import scala.build.errors.BuildException
1012
import scala.build.internal.{Constants, Runner, ScalaJsLinkerConfig}
1113
import scala.build.options.{BuildOptions, JavaOpt, Platform, ScalacOpt}
12-
import scala.build.*
1314
import scala.cli.CurrentParams
1415
import scala.cli.commands.run.RunMode
1516
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps

modules/cli/src/main/scala/scala/cli/commands/Test.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import scala.build.options.{BuildOptions, JavaOpt, Platform, Scope}
1212
import scala.build.testrunner.AsmTestRunner
1313
import scala.build.{Build, BuildThreads, Builds, CrossKey, Logger, Positioned}
1414
import scala.cli.CurrentParams
15+
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
1516
import scala.cli.commands.util.SharedOptionsUtil._
1617
import scala.cli.config.{ConfigDb, Keys}
17-
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
1818

1919
object Test extends ScalaCommand[TestOptions] {
2020
override def group = "Main"

modules/cli/src/main/scala/scala/cli/commands/bloop/Bloop.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import caseapp.core.RemainingArgs
44

55
import scala.build.Logger
66
import scala.build.bloop.BloopThreads
7-
import scala.build.blooprifle.{BloopRifle, BloopRifleConfig}
87
import scala.build.blooprifle.internal.{Constants, Operations}
8+
import scala.build.blooprifle.{BloopRifle, BloopRifleConfig}
99
import scala.build.internal.OsLibc
1010
import scala.cli.CurrentParams
11-
import scala.cli.commands.{ScalaCommand, SharedOptions}
1211
import scala.cli.commands.util.CommonOps._
1312
import scala.cli.commands.util.SharedCompilationServerOptionsUtil._
1413
import scala.cli.commands.util.SharedOptionsUtil._
14+
import scala.cli.commands.{ScalaCommand, SharedOptions}
1515
import scala.concurrent.Await
1616
import scala.concurrent.duration.Duration
1717

modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@ import dependency._
77
import scala.build.EitherCps.{either, value}
88
import scala.build.Logger
99
import scala.build.errors.BuildException
10-
import scala.build.internal.{Constants, FetchExternalBinary, Runner}
10+
import scala.build.internal.{
11+
Constants,
12+
ExternalBinary,
13+
ExternalBinaryParams,
14+
FetchExternalBinary,
15+
Runner
16+
}
1117
import scala.cli.ScalaCli
1218
import scala.cli.commands.util.CommonOps._
13-
import scala.util.Properties
14-
import scala.build.internal.ExternalBinaryParams
15-
import scala.build.internal.ExternalBinary
1619
import scala.cli.commands.util.JvmUtils
20+
import scala.util.Properties
1721

1822
abstract class PgpExternalCommand extends ExternalCommand {
1923
def progName: String = ScalaCli.progName

modules/cli/src/main/scala/scala/cli/commands/publish/Publish.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@ import java.nio.file.Paths
2121
import java.time.{Instant, LocalDateTime, ZoneOffset}
2222
import java.util.concurrent.Executors
2323
import java.util.function.Supplier
24-
import scala.build.*
24+
2525
import scala.build.EitherCps.{either, value}
2626
import scala.build.Ops.*
27+
import scala.build.*
2728
import scala.build.compiler.ScalaCompilerMaker
2829
import scala.build.errors.{BuildException, CompositeBuildException, NoMainClassFoundError}
2930
import scala.build.internal.Util
3031
import scala.build.internal.Util.ScalaDependencyOps
31-
import scala.build.options.publish.{ComputeVersion, Developer, License, Vcs, Signer as PSigner}
32+
import scala.build.options.publish.{ComputeVersion, Developer, License, Signer => PSigner, Vcs}
3233
import scala.build.options.{BuildOptions, ConfigMonoid, PublishContextualOptions, Scope}
3334
import scala.cli.CurrentParams
3435
import scala.cli.commands.pgp.PgpExternalCommand
3536
import scala.cli.commands.publish.{PublishParamsOptions, PublishRepositoryOptions}
3637
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
3738
import scala.cli.commands.util.MainClassOptionsUtil.*
39+
import scala.cli.commands.util.PublishUtils.*
3840
import scala.cli.commands.util.SharedOptionsUtil.*
3941
import scala.cli.commands.util.{BuildCommandHelpers, ScalaCliSttpBackend}
40-
import scala.cli.commands.util.SharedOptionsUtil.*
41-
import scala.cli.commands.util.PublishUtils.*
4242
import scala.cli.commands.{
4343
MainClassOptions,
44+
Package => PackageCmd,
4445
ScalaCommand,
4546
SharedOptions,
46-
WatchUtil,
47-
Package as PackageCmd
47+
WatchUtil
4848
}
4949
import scala.cli.config.{ConfigDb, Keys}
5050
import scala.cli.errors.{

modules/cli/src/main/scala/scala/cli/commands/publish/checks/PgpSecretKeyCheck.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import scala.cli.commands.config.ThrowawayPgpSecret
1616
import scala.cli.commands.pgp.{KeyServer, PgpProxyMaker}
1717
import scala.cli.commands.publish.{OptionCheck, PublishSetupOptions, SetSecret}
1818
import scala.cli.commands.util.JvmUtils
19+
import scala.cli.commands.util.PublishUtils._
1920
import scala.cli.config.{ConfigDb, Keys}
2021
import scala.cli.errors.MissingPublishOptionError
2122
import scala.cli.signing.shared.PasswordOption
2223
import scala.cli.util.ConfigPasswordOptionHelpers._
23-
import scala.cli.commands.util.PublishUtils._
2424

2525
final case class PgpSecretKeyCheck(
2626
options: PublishSetupOptions,

modules/cli/src/main/scala/scala/cli/commands/util/BuildCommandHelpers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scala.cli.commands.util
22

3-
import scala.build.{Build, Logger}
43
import scala.build.errors.MainClassError
4+
import scala.build.{Build, Logger}
55
import scala.cli.commands.ScalaCommand
66

77
trait BuildCommandHelpers { self: ScalaCommand[_] =>

modules/cli/src/main/scala/scala/cli/commands/util/FmtOptionsUtil.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package scala.cli.commands.util
2+
import coursier.core.Version
3+
24
import scala.build.internal.FetchExternalBinary
35
import scala.build.options.BuildOptions
46
import scala.cli.commands.FmtOptions
57
import scala.cli.commands.util.SharedOptionsUtil._
68
import scala.util.Properties
79

8-
import coursier.core.Version
9-
1010
object FmtOptionsUtil {
1111
implicit class FmtOptionsOps(v: FmtOptions) {
1212
import v._

0 commit comments

Comments
 (0)