Apply suggestions from code review

- move `maybePrintSimpleScalacOutput` back to `ScalaCommand`
- remove ScalacLikeCommand trait
- remove the `-X` alias for cross-compilation
- remove unnecessary exit status code verification in Run command ITs

Author: Gedochao

modules/cli-options/src/main/scala/scala/cli/commands/CompileCrossOptions.scala

@@ -5,7 +5,6 @@ import caseapp._
 // format: off
 final case class CompileCrossOptions(
   @HelpMessage("Cross-compile sources")
-  @ExtraName("X")
   @Hidden
     cross: Option[Boolean] = None
 )

modules/cli-options/src/main/scala/scala/cli/commands/CrossOptions.scala

@@ -4,7 +4,6 @@ import caseapp._
 
 // format: off
 final case class CrossOptions(
-  @ExtraName("X")
     cross: Option[Boolean] = None
 )
 // format: on

modules/cli-options/src/main/scala/scala/cli/commands/ScalacOptions.scala

@@ -17,6 +17,7 @@ final case class ScalacOptions(
     scalacOption: List[String] = Nil
 )
 // format: on
+
 object ScalacOptions {
 
   private val scalacOptionsArg = Arg("scalacOption")

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

@@ -4,22 +4,21 @@ import caseapp._
 
 import java.io.File
 
-import scala.build.options.{BuildOptions, Scope}
+import scala.build.options.Scope
 import scala.build.{Build, BuildThreads, Builds, Os}
 import scala.cli.CurrentParams
 import scala.cli.commands.util.SharedOptionsUtil._
 
-object Compile extends ScalaCommand[CompileOptions] with ScalacLikeCommand[CompileOptions] {
+object Compile extends ScalaCommand[CompileOptions] {
   override def group                                                         = "Main"
   override def sharedOptions(options: CompileOptions): Option[SharedOptions] = Some(options.shared)
-  override def buildOptions(options: CompileOptions): BuildOptions = options.shared.buildOptions()
 
   def outputPath(options: CompileOptions): Option[os.Path] =
     options.output.filter(_.nonEmpty).map(p => os.Path(p, Os.pwd))
 
   def run(options: CompileOptions, args: RemainingArgs): Unit = {
     maybePrintGroupHelp(options)
-    maybePrintSimpleScalacOutput(options)
+    maybePrintSimpleScalacOutput(options, options.shared.buildOptions())
     CurrentParams.verbosity = options.shared.logging.verbosity
     val inputs = options.shared.inputsOrExit(args)
     CurrentParams.workspaceOpt = Some(inputs.workspace)

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

@@ -19,7 +19,7 @@ import scala.build.EitherCps.{either, value}
 import scala.build._
 import scala.build.errors.{BuildException, MalformedCliInputError, ScalaNativeBuildError}
 import scala.build.internal.{Runner, ScalaJsLinkerConfig}
-import scala.build.options.{BuildOptions, PackageType, Platform}
+import scala.build.options.{PackageType, Platform}
 import scala.cli.CurrentParams
 import scala.cli.commands.OptionsHelper._
 import scala.cli.commands.util.PackageOptionsUtil._
@@ -29,14 +29,13 @@ import scala.cli.internal.{CachedBinary, ProcUtil, ScalaJsLinker}
 import scala.cli.packaging.{Library, NativeImage}
 import scala.util.Properties
 
-object Package extends ScalaCommand[PackageOptions] with ScalacLikeCommand[PackageOptions] {
+object Package extends ScalaCommand[PackageOptions] {
   override def name                                                          = "package"
   override def group                                                         = "Main"
   override def sharedOptions(options: PackageOptions): Option[SharedOptions] = Some(options.shared)
-  override def buildOptions(po: PackageOptions): BuildOptions                = po.buildOptions
   def run(options: PackageOptions, args: RemainingArgs): Unit = {
     maybePrintGroupHelp(options)
-    maybePrintSimpleScalacOutput(options)
+    maybePrintSimpleScalacOutput(options, options.buildOptions)
     CurrentParams.verbosity = options.shared.logging.verbosity
     val inputs = options.shared.inputsOrExit(args.remaining)
     CurrentParams.workspaceOpt = Some(inputs.workspace)

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

@@ -14,14 +14,13 @@ import scala.cli.commands.util.SharedOptionsUtil._
 import scala.cli.internal.ProcUtil
 import scala.util.Properties
 
-object Run extends ScalaCommand[RunOptions] with ScalacLikeCommand[RunOptions] {
+object Run extends ScalaCommand[RunOptions] {
   override def group = "Main"
 
   override def sharedOptions(options: RunOptions): Option[SharedOptions] = Some(options.shared)
 
   def run(options: RunOptions, args: RemainingArgs): Unit = {
     maybePrintGroupHelp(options)
-    maybePrintSimpleScalacOutput(options)
     run(
       options,
       args.remaining,
@@ -30,7 +29,7 @@ object Run extends ScalaCommand[RunOptions] with ScalacLikeCommand[RunOptions] {
     )
   }
 
-  override def buildOptions(options: RunOptions): BuildOptions = {
+  def buildOptions(options: RunOptions): BuildOptions = {
     import options._
     val baseOptions = shared.buildOptions(
       enableJmh = benchmarking.jmh.contains(true),
@@ -53,12 +52,13 @@ object Run extends ScalaCommand[RunOptions] with ScalacLikeCommand[RunOptions] {
     defaultInputs: () => Option[Inputs]
   ): Unit = {
     CurrentParams.verbosity = options.shared.logging.verbosity
+    val initialBuildOptions = buildOptions(options)
+    maybePrintSimpleScalacOutput(options, initialBuildOptions)
+
     val inputs = options.shared.inputsOrExit(inputArgs, defaultInputs = defaultInputs)
     CurrentParams.workspaceOpt = Some(inputs.workspace)
-
-    val initialBuildOptions = buildOptions(options)
-    val logger              = options.shared.logger
-    val threads             = BuildThreads.create()
+    val logger  = options.shared.logger
+    val threads = BuildThreads.create()
 
     val compilerMaker = options.shared.compilerMaker(threads)
 

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

@@ -8,7 +8,9 @@ import caseapp.core.parser.Parser
 import caseapp.core.util.Formatter
 import caseapp.core.{Arg, Error}
 
+import scala.build.compiler.SimpleScalaCompiler
 import scala.build.internal.Constants
+import scala.build.options.{BuildOptions, Scope}
 import scala.cli.commands.util.CommandHelpers
 import scala.cli.commands.util.SharedOptionsUtil._
 import scala.util.{Properties, Try}
@@ -99,6 +101,42 @@ abstract class ScalaCommand[T](implicit parser: Parser[T], help: Help[T])
     for (shared <- sharedOptions(options))
       shared.helpGroups.maybePrintGroupHelp(help, helpFormat)
 
+  /** Print `scalac` output if passed options imply no inputs are necessary and raw `scalac` output
+    * is required instead. (i.e. `--scalac-option -help`)
+    * @param options
+    *   command options
+    */
+  def maybePrintSimpleScalacOutput(options: T, buildOptions: BuildOptions): Unit =
+    for {
+      shared <- sharedOptions(options)
+      scalacOptions = shared.scalac.scalacOption.toSeq
+      updatedScalacOptions =
+        if (shared.scalacHelp && !scalacOptions.contains("-help"))
+          scalacOptions.appended("-help")
+        else scalacOptions
+      if updatedScalacOptions.exists(ScalacOptions.ScalacPrintOptions)
+      logger = shared.logger
+      artifacts      <- buildOptions.artifacts(logger, Scope.Main).toOption
+      scalaArtifacts <- artifacts.scalaOpt
+      compilerClassPath   = scalaArtifacts.compilerClassPath
+      scalaVersion        = scalaArtifacts.params.scalaVersion
+      compileClassPath    = artifacts.compileClassPath
+      simpleScalaCompiler = SimpleScalaCompiler("java", Nil, scaladoc = false)
+      javacOptions        = buildOptions.javaOptions.javacOptions
+      javaHome            = buildOptions.javaHomeLocation().value
+    } {
+      val exitCode = simpleScalaCompiler.runSimpleScalacLike(
+        scalaVersion,
+        Option(javaHome),
+        javacOptions,
+        updatedScalacOptions,
+        compileClassPath,
+        compilerClassPath,
+        logger
+      )
+      sys.exit(exitCode)
+    }
+
   override def helpFormat =
     HelpFormat.default()
       .withSortedGroups(Some(Seq(

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

@@ -14,14 +14,14 @@ import scala.build.{Build, BuildThreads, Builds, CrossKey, Logger, Positioned}
 import scala.cli.CurrentParams
 import scala.cli.commands.util.SharedOptionsUtil._
 
-object Test extends ScalaCommand[TestOptions] with ScalacLikeCommand[TestOptions] {
+object Test extends ScalaCommand[TestOptions] {
   override def group                                                      = "Main"
   override def sharedOptions(options: TestOptions): Option[SharedOptions] = Some(options.shared)
 
   private def gray  = "\u001b[90m"
   private def reset = Console.RESET
 
-  override def buildOptions(opts: TestOptions): BuildOptions = {
+  def buildOptions(opts: TestOptions): BuildOptions = {
     import opts._
     val baseOptions = shared.buildOptions()
     baseOptions.copy(
@@ -41,8 +41,11 @@ object Test extends ScalaCommand[TestOptions] with ScalacLikeCommand[TestOptions
 
   def run(options: TestOptions, args: RemainingArgs): Unit = {
     maybePrintGroupHelp(options)
-    maybePrintSimpleScalacOutput(options)
     CurrentParams.verbosity = options.shared.logging.verbosity
+
+    val initialBuildOptions = buildOptions(options)
+    maybePrintSimpleScalacOutput(options, initialBuildOptions)
+
     val inputs = options.shared.inputsOrExit(args.remaining)
     CurrentParams.workspaceOpt = Some(inputs.workspace)
     val logger = options.shared.logger
@@ -56,8 +59,7 @@ object Test extends ScalaCommand[TestOptions] with ScalacLikeCommand[TestOptions
     if (CommandUtils.shouldCheckUpdate)
       Update.checkUpdateSafe(logger)
 
-    val initialBuildOptions = buildOptions(options)
-    val threads             = BuildThreads.create()
+    val threads = BuildThreads.create()
 
     val compilerMaker = options.shared.compilerMaker(threads)
 

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

@@ -1708,7 +1708,6 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
         "--scalac-help"
       )
         .call(cwd = root, mergeErrIntoOut = true)
-      expect(res1.exitCode == 0)
       expect(res1.out.text().contains("scalac <options> <source files>"))
 
       val res2 = os.proc(
@@ -1718,7 +1717,6 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
         "-help"
       )
         .call(cwd = root, mergeErrIntoOut = true)
-      expect(res2.exitCode == 0)
       expect(res1.out.text() == res2.out.text())
     }
   }
@@ -1741,7 +1739,6 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
           printOption
         )
           .call(cwd = root, mergeErrIntoOut = true)
-        expect(res.exitCode == 0)
         expect(res.out.text().nonEmpty)
       }
     }