Move ScopeOptions to SharedOptions (#3612)

Author: Gedochao

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

@@ -109,7 +109,7 @@ object Compile extends ScalaCommand[CompileOptions] with BuildCommandHelpers {
         None,
         logger,
         crossBuilds = cross,
-        buildTests = options.scope.test,
+        buildTests = options.shared.scope.test,
         partial = None,
         actionableDiagnostics = actionableDiagnostics,
         postAction = () => WatchUtil.printWatchMessage()
@@ -128,7 +128,7 @@ object Compile extends ScalaCommand[CompileOptions] with BuildCommandHelpers {
         None,
         logger,
         crossBuilds = cross,
-        buildTests = options.scope.test,
+        buildTests = options.shared.scope.test,
         partial = None,
         actionableDiagnostics = actionableDiagnostics
       )

modules/cli/src/main/scala/scala/cli/commands/compile/CompileOptions.scala

@@ -22,10 +22,7 @@ final case class CompileOptions(
   @HelpMessage("Print the resulting class path")
   @Tag(tags.should)
   @Tag(tags.inShortHelp)
-    printClassPath: Boolean = false,
-
-  @Recurse
-    scope: ScopeOptions = ScopeOptions()
+    printClassPath: Boolean = false
 ) extends HasSharedOptions
   // format: on
 

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

@@ -25,7 +25,7 @@ object DependencyUpdate extends ScalaCommand[DependencyUpdateOptions] {
     args: RemainingArgs,
     logger: Logger
   ): Unit = {
-    if options.scope.test then
+    if options.shared.scope.test then
       logger.message(
         s"""$warnPrefix Including the test scope does not change the behaviour of this command. 
            |$warnPrefix Test dependencies are updated regardless.""".stripMargin

modules/cli/src/main/scala/scala/cli/commands/dependencyupdate/DependencyUpdateOptions.scala

@@ -15,9 +15,7 @@ final case class DependencyUpdateOptions(
   @HelpMessage("Update all dependencies if a newer version was released")
   @Tag(tags.restricted)
   @Tag(tags.inShortHelp)
-    all: Boolean = false,
-  @Recurse
-    scope: ScopeOptions = ScopeOptions()
+    all: Boolean = false
 ) extends HasSharedOptions
   // format: on
 

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

@@ -52,7 +52,7 @@ object Doc extends ScalaCommand[DocOptions] {
         configDb.get(Keys.actions).getOrElse(None)
       )
 
-    val withTestScope = options.scope.test
+    val withTestScope = options.shared.scope.test
     Build.build(
       inputs,
       initialBuildOptions,

modules/cli/src/main/scala/scala/cli/commands/doc/DocOptions.scala

@@ -32,9 +32,7 @@ final case class DocOptions(
   @HelpMessage(s"Control if $fullRunnerName should use default options for scaladoc, true by default. Use `--default-scaladoc-opts:false` to not include default options.")
   @Tag(tags.should)
   @ExtraName("defaultScaladocOpts")
-    defaultScaladocOptions: Option[Boolean] = None,
-  @Recurse
-    scope: ScopeOptions = ScopeOptions()
+    defaultScaladocOptions: Option[Boolean] = None
 ) extends HasSharedOptions
 // format: on
 

modules/cli/src/main/scala/scala/cli/commands/export0/Export.scala

@@ -136,7 +136,7 @@ object Export extends ScalaCommand[ExportOptions] {
   override def sharedOptions(opts: ExportOptions): Option[SharedOptions] = Some(opts.shared)
 
   override def runCommand(options: ExportOptions, args: RemainingArgs, logger: Logger): Unit = {
-    if options.scope.test then {
+    if options.shared.scope.test then {
       logger.error(
         s"""Including the test scope sources together with the main scope is currently not supported.
            |Note that test scope sources will still be exported as per the output build tool tests definition demands.""".stripMargin

modules/cli/src/main/scala/scala/cli/commands/export0/ExportOptions.scala

@@ -85,9 +85,6 @@ final case class ExportOptions(
   @Group(HelpGroup.BuildToolExport.toString)
   @Tag(tags.restricted)
     output: Option[String] = None,
-
-  @Recurse
-    scope: ScopeOptions = ScopeOptions()
 ) extends HasSharedOptions
 // format: on
 object ExportOptions {

modules/cli/src/main/scala/scala/cli/commands/fmt/Fmt.scala

@@ -43,7 +43,7 @@ object Fmt extends ScalaCommand[FmtOptions] {
   override def runCommand(options: FmtOptions, args: RemainingArgs, logger: Logger): Unit = {
     val buildOptions = buildOptionsOrExit(options)
 
-    if options.scope.test then
+    if options.shared.scope.test then
       logger.message(
         s"""$warnPrefix Including the test scope does not change the behaviour of this command. 
            |$warnPrefix Test scope inputs are formatted, regardless.""".stripMargin

modules/cli/src/main/scala/scala/cli/commands/fmt/FmtOptions.scala

@@ -94,9 +94,7 @@ final case class FmtOptions(
   @HelpMessage(s"Pass scalafmt version before running it (${Constants.defaultScalafmtVersion} by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.")
   @Name("fmtVersion")
   @Tag(tags.inShortHelp)
-    scalafmtVersion: Option[String] = None,
-  @Recurse
-    scope: ScopeOptions = ScopeOptions()
+    scalafmtVersion: Option[String] = None
 ) extends HasSharedOptions {
   // format: on