Runner sets residual args instead of append

Author: som-snytt

compiler/src/dotty/tools/MainGenericRunner.scala

@@ -169,7 +169,7 @@ object MainGenericRunner {
       else
         val newSettings = if arg.startsWith("-") then settings else settings.withPossibleEntryPaths(arg).withModeShouldBePossibleRun
         process(tail, newSettings.withResidualArgs(arg))
-
+  end process
 
   def main(args: Array[String]): Unit =
     val scalaOpts = envOrNone("SCALA_OPTS").toArray.flatMap(_.split(" ")).filter(_.nonEmpty)
@@ -200,8 +200,7 @@ object MainGenericRunner {
             Option.when(Jar.isJarOrZip(dotty.tools.io.Path(entryPath)))(Jar(entryPath).mainClass).flatten
           }.isDefined
         }
-        val newSettings =
-          targetToRun match
+        val newSettings = targetToRun match
           case Some(fqName) =>
             settings.withTargetToRun(fqName).copy(residualArgs = settings.residualArgs.filterNot(fqName.==)).withExecuteMode(ExecuteMode.Run)
           case None =>

tests/run-with-compiler/i14541.check

@@ -1 +1,2 @@
-hello world
+hello raw world
+hello run world

tests/run-with-compiler/i14541.scala

@@ -1,7 +1,12 @@
 
+// test argument processing and "execution mode" in runner
 object Test:
   import dotty.tools.runner.RichClassLoader.*
-  def main(args: Array[String]): Unit = getClass.getClassLoader.run("echo", List("hello", "world"))
+  val classpath = dotty.tools.dotc.util.ClasspathFromClassloader(getClass.getClassLoader)
+  def main(args: Array[String]): Unit =
+    getClass.getClassLoader.run("echo", List("hello", "raw", "world"))
+    // caution: uses "SCALA_OPTS"
+    dotty.tools.MainGenericRunner.main(Array("--class-path", classpath, "echo", "hello", "run", "world"))
 
 @main def echo(args: String*): Unit = println {
   args.mkString(" ")