Skip to content

Commit fbd8e54

Browse files
GedochaoGedochao
committed
NIT Refactor scala commands
1 parent be6db72 commit fbd8e54

38 files changed

+136
-137
lines changed

‎modules/cli/src/main/scala/scala/cli/commands/About.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package scala.cli.commands
22

3-
import caseapp._
3+
import caseapp.*
44

55
import scala.build.internal.Constants
66
import scala.cli.CurrentParams
77

88
class About(isSipScala: Boolean) extends ScalaCommand[AboutOptions] {
99

10-
override def group = "Miscellaneous"
10+
override def group = "Miscellaneous"
1111
override def verbosity(options: AboutOptions): Option[Int] = Some(options.verbosity.verbosity)
1212
override def runCommand(options: AboutOptions, args: RemainingArgs): Unit = {
1313
println(Version.versionInfo(isSipScala))

‎modules/cli/src/main/scala/scala/cli/commands/AddPath.scala‎

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

3-
import caseapp._
3+
import caseapp.*
44
import coursier.env.{EnvironmentUpdate, ProfileUpdater}
55

66
import java.io.File

‎modules/cli/src/main/scala/scala/cli/commands/BloopExit.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package scala.cli.commands
22

3-
import caseapp._
3+
import caseapp.*
44

55
import scala.build.Os
66
import scala.build.blooprifle.{BloopRifle, BloopRifleConfig}
77
import scala.cli.CurrentParams
8-
import scala.cli.commands.util.CommonOps._
9-
import scala.cli.commands.util.SharedCompilationServerOptionsUtil._
8+
import scala.cli.commands.util.CommonOps.*
9+
import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
1010

1111
object BloopExit extends ScalaCommand[BloopExitOptions] {
1212
override def hidden = true
@@ -16,7 +16,7 @@ object BloopExit extends ScalaCommand[BloopExitOptions] {
1616
)
1717

1818
private def mkBloopRifleConfig(opts: BloopExitOptions): BloopRifleConfig = {
19-
import opts._
19+
import opts.*
2020
compilationServer.bloopRifleConfig(
2121
logging.logger,
2222
coursier.coursierCache(logging.logger.coursierLogger("Downloading Bloop")),

‎modules/cli/src/main/scala/scala/cli/commands/BloopStart.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package scala.cli.commands
22

3-
import caseapp._
3+
import caseapp.*
44

55
import scala.build.Os
66
import scala.build.bloop.BloopThreads
77
import scala.build.blooprifle.internal.Constants
88
import scala.build.blooprifle.{BloopRifle, BloopRifleConfig}
99
import scala.build.options.{BuildOptions, InternalOptions}
1010
import scala.cli.CurrentParams
11-
import scala.cli.commands.util.CommonOps._
11+
import scala.cli.commands.util.CommonOps.*
1212
import scala.cli.commands.util.JvmUtils
13-
import scala.cli.commands.util.SharedCompilationServerOptionsUtil._
13+
import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
1414
import scala.concurrent.Await
1515
import scala.concurrent.duration.Duration
1616

@@ -22,7 +22,7 @@ object BloopStart extends ScalaCommand[BloopStartOptions] {
2222
)
2323

2424
private def mkBloopRifleConfig(opts: BloopStartOptions): BloopRifleConfig = {
25-
import opts._
25+
import opts.*
2626
val buildOptions = BuildOptions(
2727
javaOptions = JvmUtils.javaOptions(jvm).orExit(logging.logger),
2828
internal = InternalOptions(

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package scala.cli.commands
22

3-
import caseapp._
4-
import com.github.plokhotnyuk.jsoniter_scala.core._
3+
import caseapp.*
4+
import com.github.plokhotnyuk.jsoniter_scala.core.*
55

66
import scala.build.EitherCps.{either, value}
7+
import scala.build.*
78
import scala.build.bsp.{BspReloadableOptions, BspThreads}
89
import scala.build.errors.BuildException
910
import scala.build.internal.CustomCodeWrapper
1011
import scala.build.options.BuildOptions
11-
import scala.build.{Build, CrossSources, Inputs, PersistentDiagnosticLogger, Sources}
1212
import scala.cli.CurrentParams
13-
import scala.cli.commands.publish.ConfigUtil._
14-
import scala.cli.commands.util.CommonOps._
15-
import scala.cli.commands.util.SharedOptionsUtil._
13+
import scala.cli.commands.publish.ConfigUtil.*
14+
import scala.cli.commands.util.CommonOps.*
15+
import scala.cli.commands.util.SharedOptionsUtil.*
1616
import scala.cli.config.{ConfigDb, Keys}
1717
import scala.concurrent.Await
1818
import scala.concurrent.duration.Duration

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package scala.cli.commands
22

3-
import caseapp._
3+
import caseapp.*
44

55
import scala.build.internal.Constants
66
import scala.build.{Inputs, Os}
7-
import scala.cli.commands.util.CommonOps._
7+
import scala.cli.commands.util.CommonOps.*
88
import scala.cli.{CurrentParams, ScalaCli}
99

1010
object Clean extends ScalaCommand[CleanOptions] {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package scala.cli.commands
22

3-
import caseapp._
3+
import caseapp.*
44

55
import java.io.File
66

77
import scala.build.options.{BuildOptions, Scope}
88
import scala.build.{Build, BuildThreads, Builds, Os}
99
import scala.cli.CurrentParams
10-
import scala.cli.commands.publish.ConfigUtil._
10+
import scala.cli.commands.publish.ConfigUtil.*
1111
import scala.cli.commands.util.BuildCommandHelpers
1212
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
13-
import scala.cli.commands.util.SharedOptionsUtil._
13+
import scala.cli.commands.util.SharedOptionsUtil.*
1414
import scala.cli.config.{ConfigDb, Keys}
1515

1616
object Compile extends ScalaCommand[CompileOptions] with BuildCommandHelpers {

‎modules/cli/src/main/scala/scala/cli/commands/DependencyUpdate.scala‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package scala.cli.commands
22

3-
import caseapp._
3+
import caseapp.*
44
import os.Path
55

66
import scala.build.actionable.ActionableDependencyHandler
@@ -9,11 +9,12 @@ import scala.build.internal.CustomCodeWrapper
99
import scala.build.options.{BuildOptions, Scope}
1010
import scala.build.{CrossSources, Logger, Position, Sources}
1111
import scala.cli.CurrentParams
12-
import scala.cli.commands.util.SharedOptionsUtil._
12+
import scala.cli.commands.util.SharedOptionsUtil.*
1313

1414
object DependencyUpdate extends ScalaCommand[DependencyUpdateOptions] {
15-
override def group = "Main"
16-
override def sharedOptions(options: DependencyUpdateOptions) = Some(options.shared)
15+
override def group = "Main"
16+
override def sharedOptions(options: DependencyUpdateOptions): Option[SharedOptions] =
17+
Some(options.shared)
1718
override def runCommand(options: DependencyUpdateOptions, args: RemainingArgs): Unit = {
1819
val verbosity = options.shared.logging.verbosity
1920
val buildOptions = buildOptionsOrExit(options)

‎modules/cli/src/main/scala/scala/cli/commands/Directories.scala‎

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

3-
import caseapp._
3+
import caseapp.*
44

55
import scala.cli.CurrentParams
6-
import scala.cli.commands.util.CommonOps._
6+
import scala.cli.commands.util.CommonOps.*
77

88
object Directories extends ScalaCommand[DirectoriesOptions] {
99
override def hidden: Boolean = true

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
package scala.cli.commands
22

3-
import caseapp._
4-
import dependency._
3+
import caseapp.*
4+
import dependency.*
55

66
import java.io.File
77

88
import scala.build.EitherCps.{either, value}
9-
import scala.build._
9+
import scala.build.*
1010
import scala.build.compiler.{ScalaCompilerMaker, SimpleScalaCompilerMaker}
1111
import scala.build.errors.BuildException
1212
import scala.build.interactive.InteractiveFileOps
1313
import scala.build.internal.Runner
1414
import scala.build.options.BuildOptions
1515
import scala.cli.CurrentParams
16-
import scala.cli.commands.publish.ConfigUtil._
16+
import scala.cli.commands.publish.ConfigUtil.*
1717
import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
18-
import scala.cli.commands.util.SharedOptionsUtil._
18+
import scala.cli.commands.util.SharedOptionsUtil.*
1919
import scala.cli.config.{ConfigDb, Keys}
2020
import scala.cli.errors.ScaladocGenerationFailedError
2121
import scala.util.Properties
2222

2323
object Doc extends ScalaCommand[DocOptions] {
24-
override def group = "Main"
25-
override def sharedOptions(options: DocOptions) = Some(options.shared)
24+
override def group = "Main"
25+
override def sharedOptions(options: DocOptions): Option[SharedOptions] = Some(options.shared)
2626
override def runCommand(options: DocOptions, args: RemainingArgs): Unit = {
2727
val initialBuildOptions = buildOptionsOrExit(options)
2828
val logger = options.shared.logger

0 commit comments

Comments
 (0)