Support test scope main methods with --list-main-classes

Author: Gedochao

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

@@ -589,19 +589,19 @@ object Run extends ScalaCommand[RunOptions] with BuildCommandHelpers {
               else
                 (Nil, Map.empty[String, String])
             val allJavaOpts = pythonJavaProps ++ baseJavaProps
-            if (showCommand) {
-              val command = Runner.jvmCommand(
-                builds.head.options.javaHome().value.javaCommand,
-                allJavaOpts,
-                builds.head.fullClassPathMaybeAsJar(asJar), // TODO: handle multiple builds
-                mainClass,
-                args,
-                extraEnv = pythonExtraEnv,
-                useManifest = builds.head.options.notForBloopOptions.runWithManifest,
-                scratchDirOpt = scratchDirOpt
-              )
-              Left(command)
-            }
+            if showCommand then
+              Left {
+                Runner.jvmCommand(
+                  builds.head.options.javaHome().value.javaCommand,
+                  allJavaOpts,
+                  builds.flatMap(_.fullClassPathMaybeAsJar(asJar)).distinct,
+                  mainClass,
+                  args,
+                  extraEnv = pythonExtraEnv,
+                  useManifest = builds.head.options.notForBloopOptions.runWithManifest,
+                  scratchDirOpt = scratchDirOpt
+                )
+              }
             else {
               val proc = Runner.runJvm(
                 builds.head.options.javaHome().value.javaCommand,

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

@@ -19,6 +19,10 @@ final case class MainClassOptions(
   @Name("mainClassList")
   @Name("listMainClass")
   @Name("listMainClasses")
+  @Name("listMainMethods")
+  @Name("listMainMethod")
+  @Name("mainMethodList")
+  @Name("mainMethodLs")
   @Tag(tags.should)
   @Tag(tags.inShortHelp)
     mainClassLs: Option[Boolean] = None

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

@@ -2380,4 +2380,24 @@ abstract class RunTestDefinitions
         expect(res.out.trim().contains(expectedMessage))
       }
     }
+
+  test(s"--list-main-classes includes test scope main methods when --test is enabled") {
+    val expectedMains @ Seq(expectedMain1, expectedMain2) = Seq("Main", "AnotherMain")
+    val expectedOutput                                    = expectedMains.mkString(" ")
+    TestInputs(
+      os.rel / "example.scala" -> s"""object $expectedMain1 extends App { println("Hello from the main scope") }""",
+      os.rel / "example.test.scala" -> s"""object $expectedMain2 extends App { println("Hello from the test scope") }"""
+    ).fromRoot { root =>
+      val res = os.proc(
+        TestUtil.cli,
+        "run",
+        ".",
+        "--test",
+        "--list-main-classes",
+        extraOptions
+      )
+        .call(cwd = root)
+      expect(res.out.trim() == expectedOutput)
+    }
+  }
 }

website/docs/reference/cli-options.md

@@ -737,7 +737,7 @@ Specify which main class to run
 
 ### `--main-class-ls`
 
-Aliases: `--list-main-class`, `--list-main-classes`, `--main-class-list`
+Aliases: `--list-main-class`, `--list-main-classes`, `--list-main-method`, `--list-main-methods`, `--main-class-list`, `--main-method-list`, `--main-method-ls`
 
 List main classes available in the current context
 

website/docs/reference/scala-command/cli-options.md

@@ -658,7 +658,7 @@ Specify which main class to run
 
 ### `--main-class-ls`
 
-Aliases: `--list-main-class`, `--list-main-classes`, `--main-class-list`
+Aliases: `--list-main-class`, `--list-main-classes`, `--list-main-method`, `--list-main-methods`, `--main-class-list`, `--main-method-list`, `--main-method-ls`
 
 `SHOULD have` per Scala Runner specification
 

website/docs/reference/scala-command/runner-specification.md

@@ -2320,7 +2320,7 @@ Aliases: `--revolver`
 
 List main classes available in the current context
 
-Aliases: `--main-class-list` ,`--list-main-class` ,`--list-main-classes`
+Aliases: `--main-class-list` ,`--list-main-class` ,`--list-main-classes` ,`--list-main-methods` ,`--list-main-method` ,`--main-method-list` ,`--main-method-ls`
 
 **--command**
 
@@ -2960,7 +2960,7 @@ Aliases: `--revolver`
 
 List main classes available in the current context
 
-Aliases: `--main-class-list` ,`--list-main-class` ,`--list-main-classes`
+Aliases: `--main-class-list` ,`--list-main-class` ,`--list-main-classes` ,`--list-main-methods` ,`--list-main-method` ,`--main-method-list` ,`--main-method-ls`
 
 **--command**