Move commands under distinct namespaces (#1558)

Author: alexarchambault

modules/cli/src/main/scala/scala/cli/ScalaCliCommands.scala

@@ -6,12 +6,6 @@ import caseapp.core.help.{Help, RuntimeCommandsHelp}
 import java.nio.file.InvalidPathException
 
 import scala.cli.commands._
-import scala.cli.commands.bloop.{Bloop, BloopOutput}
-import scala.cli.commands.config.Config
-import scala.cli.commands.default.DefaultFile
-import scala.cli.commands.github.{SecretCreate, SecretList}
-import scala.cli.commands.pgp.{PgpCommands, PgpCommandsSubst, PgpPull, PgpPush}
-import scala.cli.commands.publish.{Publish, PublishLocal, PublishSetup}
 
 class ScalaCliCommands(
   val progName: String,
@@ -20,53 +14,53 @@ class ScalaCliCommands(
   isSipScala: Boolean
 ) extends CommandsEntryPoint {
 
-  lazy val actualDefaultCommand = new Default(help, isSipScala)
+  lazy val actualDefaultCommand = new default.Default(help, isSipScala)
 
   // for debugging purposes - allows to run the scala-cli-signing binary from the Scala CLI JVM launcher
   private lazy val pgpUseBinaryCommands =
     java.lang.Boolean.getBoolean("scala-cli.pgp.binary-commands")
-  private def pgpCommands       = new PgpCommands
-  private def pgpBinaryCommands = new PgpCommandsSubst
+  private def pgpCommands       = new pgp.PgpCommands
+  private def pgpBinaryCommands = new pgp.PgpCommandsSubst
 
   private def allCommands = Seq[ScalaCommand[_]](
-    About,
-    AddPath,
-    Bloop,
-    BloopExit,
-    BloopOutput,
-    BloopStart,
-    Bsp,
-    Clean,
-    Compile,
-    Config,
-    DefaultFile,
-    DependencyUpdate,
-    Directories,
-    Doc,
-    Doctor,
-    Export,
-    Fmt,
+    about.About,
+    addpath.AddPath,
+    bloop.Bloop,
+    bloop.BloopExit,
+    bloop.BloopOutput,
+    bloop.BloopStart,
+    bsp.Bsp,
+    clean.Clean,
+    compile.Compile,
+    config.Config,
+    default.DefaultFile,
+    dependencyupdate.DependencyUpdate,
+    directories.Directories,
+    doc.Doc,
+    doctor.Doctor,
+    export0.Export,
+    fmt.Fmt,
     new HelpCmd(help),
-    InstallCompletions,
-    InstallHome,
-    Metabrowse,
-    Repl,
-    Package,
-    PgpPull,
-    PgpPush,
-    Publish,
-    PublishLocal,
-    PublishSetup,
-    Run,
-    SecretCreate,
-    SecretList,
-    SetupIde,
-    Shebang,
-    Test,
-    Uninstall,
-    UninstallCompletions,
-    Update,
-    Version
+    installcompletions.InstallCompletions,
+    installhome.InstallHome,
+    metabrowse.Metabrowse,
+    repl.Repl,
+    package0.Package,
+    pgp.PgpPull,
+    pgp.PgpPush,
+    publish.Publish,
+    publish.PublishLocal,
+    publish.PublishSetup,
+    run.Run,
+    github.SecretCreate,
+    github.SecretList,
+    setupide.SetupIde,
+    shebang.Shebang,
+    test.Test,
+    uninstall.Uninstall,
+    uninstallcompletions.UninstallCompletions,
+    update.Update,
+    version.Version
   ) ++ (if (pgpUseBinaryCommands) Nil else pgpCommands.allScalaCommands.toSeq) ++
     (if (pgpUseBinaryCommands) pgpBinaryCommands.allScalaCommands.toSeq else Nil)
 

modules/cli/src/main/scala/scala/cli/commands/About.scala renamed to modules/cli/src/main/scala/scala/cli/commands/about/About.scala

@@ -1,11 +1,14 @@
-package scala.cli.commands
+package scala.cli.commands.about
 
 import caseapp.*
 
 import scala.build.Logger
 import scala.build.internal.Constants
 import scala.cli.CurrentParams
+import scala.cli.commands.update.Update
 import scala.cli.commands.util.CommonOps.*
+import scala.cli.commands.version.Version
+import scala.cli.commands.{AboutOptions, CommandUtils, ScalaCommand}
 
 object About extends ScalaCommand[AboutOptions] {
 

modules/cli/src/main/scala/scala/cli/commands/AddPath.scala renamed to modules/cli/src/main/scala/scala/cli/commands/addpath/AddPath.scala

@@ -1,4 +1,4 @@
-package scala.cli.commands
+package scala.cli.commands.addpath
 
 import caseapp.*
 import coursier.env.{EnvironmentUpdate, ProfileUpdater}
@@ -8,6 +8,7 @@ import java.io.File
 import scala.build.Logger
 import scala.cli.CurrentParams
 import scala.cli.commands.util.CommonOps.*
+import scala.cli.commands.{AddPathOptions, CustomWindowsEnvVarUpdater, ScalaCommand}
 import scala.util.Properties
 
 object AddPath extends ScalaCommand[AddPathOptions] {

modules/cli/src/main/scala/scala/cli/commands/BloopExit.scala renamed to modules/cli/src/main/scala/scala/cli/commands/bloop/BloopExit.scala

@@ -1,4 +1,4 @@
-package scala.cli.commands
+package scala.cli.commands.bloop
 
 import caseapp.*
 
@@ -7,6 +7,7 @@ import scala.build.{Logger, Os}
 import scala.cli.CurrentParams
 import scala.cli.commands.util.CommonOps.*
 import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
+import scala.cli.commands.{BloopExitOptions, ScalaCommand}
 
 object BloopExit extends ScalaCommand[BloopExitOptions] {
   override def hidden       = true

modules/cli/src/main/scala/scala/cli/commands/BloopJson.scala renamed to modules/cli/src/main/scala/scala/cli/commands/bloop/BloopJson.scala

@@ -1,4 +1,4 @@
-package scala.cli.commands
+package scala.cli.commands.bloop
 
 import com.github.plokhotnyuk.jsoniter_scala.core._
 import com.github.plokhotnyuk.jsoniter_scala.macros._

modules/cli/src/main/scala/scala/cli/commands/BloopStart.scala renamed to modules/cli/src/main/scala/scala/cli/commands/bloop/BloopStart.scala

@@ -1,4 +1,4 @@
-package scala.cli.commands
+package scala.cli.commands.bloop
 
 import caseapp.*
 
@@ -11,6 +11,7 @@ import scala.cli.CurrentParams
 import scala.cli.commands.util.CommonOps.*
 import scala.cli.commands.util.JvmUtils
 import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
+import scala.cli.commands.{BloopStartOptions, ScalaCommand}
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
 

modules/cli/src/main/scala/scala/cli/commands/Bsp.scala renamed to modules/cli/src/main/scala/scala/cli/commands/bsp/Bsp.scala

@@ -1,4 +1,4 @@
-package scala.cli.commands
+package scala.cli.commands.bsp
 
 import caseapp.*
 import com.github.plokhotnyuk.jsoniter_scala.core.*
@@ -13,6 +13,7 @@ import scala.cli.CurrentParams
 import scala.cli.commands.publish.ConfigUtil.*
 import scala.cli.commands.util.CommonOps.*
 import scala.cli.commands.util.SharedOptionsUtil.*
+import scala.cli.commands.{BspOptions, ScalaCommand, SharedOptions}
 import scala.cli.config.{ConfigDb, Keys}
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration

modules/cli/src/main/scala/scala/cli/commands/Clean.scala renamed to modules/cli/src/main/scala/scala/cli/commands/clean/Clean.scala

@@ -1,10 +1,12 @@
-package scala.cli.commands
+package scala.cli.commands.clean
 
 import caseapp.*
 
 import scala.build.internal.Constants
 import scala.build.{Inputs, Logger, Os}
+import scala.cli.commands.setupide.SetupIde
 import scala.cli.commands.util.CommonOps.*
+import scala.cli.commands.{CleanOptions, ScalaCommand}
 import scala.cli.{CurrentParams, ScalaCli}
 
 object Clean extends ScalaCommand[CleanOptions] {

modules/cli/src/main/scala/scala/cli/commands/Compile.scala renamed to modules/cli/src/main/scala/scala/cli/commands/compile/Compile.scala

@@ -1,4 +1,4 @@
-package scala.cli.commands
+package scala.cli.commands.compile
 
 import caseapp.*
 
@@ -8,9 +8,12 @@ import scala.build.options.{BuildOptions, Scope}
 import scala.build.{Build, BuildThreads, Builds, Logger, Os}
 import scala.cli.CurrentParams
 import scala.cli.commands.publish.ConfigUtil.*
+import scala.cli.commands.setupide.SetupIde
+import scala.cli.commands.update.Update
 import scala.cli.commands.util.BuildCommandHelpers
 import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps
 import scala.cli.commands.util.SharedOptionsUtil.*
+import scala.cli.commands.{CommandUtils, CompileOptions, ScalaCommand, SharedOptions, WatchUtil}
 import scala.cli.config.{ConfigDb, Keys}
 
 object Compile extends ScalaCommand[CompileOptions] with BuildCommandHelpers {

modules/cli/src/main/scala/scala/cli/commands/Default.scala renamed to modules/cli/src/main/scala/scala/cli/commands/default/Default.scala

@@ -1,12 +1,16 @@
-package scala.cli.commands
+package scala.cli.commands.default
 
 import caseapp.core.help.RuntimeCommandsHelp
 import caseapp.core.{Error, RemainingArgs}
 
 import scala.build.Logger
 import scala.build.internal.Constants
 import scala.build.options.BuildOptions
+import scala.cli.commands.repl.Repl
+import scala.cli.commands.run.Run
 import scala.cli.commands.util.SharedOptionsUtil.*
+import scala.cli.commands.version.Version
+import scala.cli.commands.{DefaultOptions, ReplOptions, RunOptions, ScalaCommand, SharedOptions}
 import scala.cli.{CurrentParams, ScalaCliHelp}
 
 class Default(