Fix scala runner launcher options not being respected alongside --cli-version

Author: Gedochao

modules/cli/src/main/scala/scala/cli/ScalaCli.scala

@@ -59,7 +59,7 @@ object ScalaCli {
 
   def launcherOptions: LauncherOptions = maybeLauncherOptions.getOrElse(LauncherOptions())
   def getDefaultScalaVersion: String =
-    launcherOptions.cliUserScalaVersion.getOrElse(Constants.defaultScalaVersion)
+    launcherOptions.scalaRunner.cliUserScalaVersion.getOrElse(Constants.defaultScalaVersion)
 
   private def partitionArgs(args: Array[String]): (Array[String], Array[String]) = {
     val systemProps = args.takeWhile(_.startsWith("-D"))
@@ -236,19 +236,17 @@ object ScalaCli {
         maybeLauncherOptions = Some(launcherOpts)
         launcherOpts.cliVersion.map(_.trim).filter(_.nonEmpty) match {
           case Some(ver) =>
-            val powerArgs =
-              if (launcherOpts.powerOptions.power) Seq("--power")
-              else Nil
-            val newArgs = powerArgs ++ args0
+            val powerArgs       = launcherOpts.powerOptions.toCliArgs
+            val scalaRunnerArgs = launcherOpts.scalaRunner.toCliArgs
+            val newArgs         = powerArgs ++ scalaRunnerArgs ++ args0
             LauncherCli.runAndExit(ver, launcherOpts, newArgs)
           case _ if
                 javaMajorVersion < 17
                 && sys.props.get("scala-cli.kind").exists(_.startsWith("jvm")) =>
             JavaLauncherCli.runAndExit(args)
           case None =>
-            launcherOpts.progName.foreach { pn =>
-              progName = pn
-            }
+            launcherOpts.scalaRunner.progName
+              .foreach(pn => progName = pn)
             if launcherOpts.powerOptions.power then
               isSipScala = false
               args0.toArray

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

@@ -198,10 +198,10 @@ object Bsp extends ScalaCommand[BspOptions] {
     val withLauncherOptions = withEnvs.copy(
       classPathOptions = withEnvs.classPathOptions.copy(
         extraRepositories =
-          (withEnvs.classPathOptions.extraRepositories ++ launcherOptions.cliPredefinedRepository).distinct
+          (withEnvs.classPathOptions.extraRepositories ++ launcherOptions.scalaRunner.cliPredefinedRepository).distinct
       ),
       scalaOptions = withEnvs.scalaOptions.copy(
-        defaultScalaVersion = launcherOptions.cliUserScalaVersion
+        defaultScalaVersion = launcherOptions.scalaRunner.cliUserScalaVersion
       )
     )
     withLauncherOptions

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

@@ -407,11 +407,9 @@ final case class SharedOptions(
         extraCompileOnlyJars = extraCompileOnlyClassPath,
         extraSourceJars = extraSourceJars.extractedClassPath ++ assumedSourceJars,
         extraRepositories =
-          (dependencies.repository ++ ScalaCli.launcherOptions.cliPredefinedRepository).map(
-            _.trim
-          ).filter(
-            _.nonEmpty
-          ),
+          (dependencies.repository ++ ScalaCli.launcherOptions.scalaRunner.cliPredefinedRepository)
+            .map(_.trim)
+            .filter(_.nonEmpty),
         extraDependencies = ShadowingSeq.from(
           SharedOptions.parseDependencies(
             dependencies.dependency.map(Positioned.none),

modules/cli/src/main/scala/scala/cli/launcher/LauncherOptions.scala

@@ -21,40 +21,15 @@ final case class LauncherOptions(
   @Hidden
   @Tag(tags.implementation)
   cliScalaVersion: Option[String] = None,
-  @Group(HelpGroup.Launcher.toString)
-  @HelpMessage(
-    s"The default version of Scala used when processing user inputs (current default: ${Constants.defaultScalaVersion}). Can be overridden with --scala-version. "
-  )
-  @ValueDescription("version")
-  @Hidden
-  @Tag(tags.implementation)
-  @Name("cliDefaultScalaVersion")
-  cliUserScalaVersion: Option[String] = None,
-  @Group(HelpGroup.Launcher.toString)
-  @HelpMessage("")
-  @Hidden
-  @Tag(tags.implementation)
-  @Name("r")
-  @Name("repo")
-  @Name("repository")
-  @Name("predefinedRepository")
-  cliPredefinedRepository: List[String] = Nil,
-  @Group(HelpGroup.Launcher.toString)
-  @HelpMessage(
-    "This allows to override the program name identified by Scala CLI as itself (the default is 'scala-cli')"
-  )
-  @Hidden
-  @Tag(tags.implementation)
-  progName: Option[String] = None,
+  @Recurse
+  scalaRunner: ScalaRunnerLauncherOptions = ScalaRunnerLauncherOptions(),
   @Recurse
   powerOptions: PowerOptions = PowerOptions()
 ) {
   def toCliArgs: List[String] =
     cliVersion.toList.flatMap(v => List("--cli-version", v)) ++
       cliScalaVersion.toList.flatMap(v => List("--cli-scala-version", v)) ++
-      cliUserScalaVersion.toList.flatMap(v => List("--cli-default-scala-version", v)) ++
-      cliPredefinedRepository.flatMap(v => List("--cli-predefined-repository", v)) ++
-      progName.toList.flatMap(v => List("--prog-name", v)) ++
+      scalaRunner.toCliArgs ++
       powerOptions.toCliArgs
 }
 

modules/cli/src/main/scala/scala/cli/launcher/ScalaRunnerLauncherOptions.scala

@@ -0,0 +1,46 @@
+package scala.cli.launcher
+
+import caseapp.*
+import com.github.plokhotnyuk.jsoniter_scala.core.JsonValueCodec
+import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
+
+import scala.cli.commands.shared.{HelpGroup, SharedOptions}
+import scala.cli.commands.{Constants, tags}
+
+case class ScalaRunnerLauncherOptions(
+  @Group(HelpGroup.Launcher.toString)
+  @HelpMessage(
+    s"The default version of Scala used when processing user inputs (current default: ${Constants.defaultScalaVersion}). Can be overridden with --scala-version. "
+  )
+  @ValueDescription("version")
+  @Hidden
+  @Tag(tags.implementation)
+  @Name("cliDefaultScalaVersion")
+  cliUserScalaVersion: Option[String] = None,
+  @Group(HelpGroup.Launcher.toString)
+  @HelpMessage("")
+  @Hidden
+  @Tag(tags.implementation)
+  @Name("r")
+  @Name("repo")
+  @Name("repository")
+  @Name("predefinedRepository")
+  cliPredefinedRepository: List[String] = Nil,
+  @Group(HelpGroup.Launcher.toString)
+  @HelpMessage(
+    "This allows to override the program name identified by Scala CLI as itself (the default is 'scala-cli')"
+  )
+  @Hidden
+  @Tag(tags.implementation)
+  progName: Option[String] = None
+) {
+  def toCliArgs: List[String] =
+    cliUserScalaVersion.toList.flatMap(v => List("--cli-default-scala-version", v)) ++
+      cliPredefinedRepository.flatMap(v => List("--repository", v)) ++
+      progName.toList.flatMap(v => List("--prog-name", v))
+}
+
+object ScalaRunnerLauncherOptions {
+  implicit val parser: Parser[ScalaRunnerLauncherOptions] = Parser.derive
+  implicit val help: Help[ScalaRunnerLauncherOptions]     = Help.derive
+}

modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala

@@ -808,4 +808,21 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
       expect(!res.err.trim().contains("TASTY"))
     }
   }
+
+  test("--cli-version and --cli-default-scala-version can be passed in tandem") {
+    TestInputs.empty.fromRoot { root =>
+      val cliVersion   = "1.3.1"
+      val scalaVersion = "3.5.1-RC1-bin-20240522-e0c030c-NIGHTLY"
+      val res = os.proc(
+        TestUtil.cli,
+        "--cli-version",
+        cliVersion,
+        "--cli-default-scala-version",
+        scalaVersion,
+        "version"
+      ).call(cwd = root)
+      expect(res.out.trim().contains(cliVersion))
+      expect(res.out.trim().contains(scalaVersion))
+    }
+  }
 }