Revert "Args files are 1 arg per line, fix -Vprint-args -"

SethTisue · SethTisue · commit e5fe9193d520 · 2022-09-01T12:24:11.000-07:00
This reverts commit b433e3c.
diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
@@ -127,10 +127,10 @@ class CompilerCommand(arguments: List[String], val settings: Settings) {
     import java.nio.file.{Files, Paths}
     import scala.jdk.CollectionConverters._
     def stripComment(s: String) = s.takeWhile(_ != '#')
-    val file = Paths.get(arg.stripPrefix("@"))
+    val file = Paths.get(arg stripPrefix "@")
     if (!Files.exists(file))
       throw new java.io.FileNotFoundException(s"argument file $file could not be found")
-    Files.readAllLines(file).asScala.map(stripComment).toList
+    settings.splitParams(Files.readAllLines(file).asScala.map(stripComment).mkString(" "))
   }
 
   // override this if you don't want arguments processed here
diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
@@ -973,5 +973,5 @@ class MutableSettings(val errorFn: String => Unit, val pathFactory: PathFactory)
 }
 
 private object Optionlike {
-  def unapply(s: String): Boolean = s.startsWith("-") && s != "-"
+  def unapply(s: String): Boolean = s.startsWith("-")
 }

Original file line number	Diff line number	Diff line change
`@@ -973,5 +973,5 @@ class MutableSettings(val errorFn: String => Unit, val pathFactory: PathFactory)`
`973`	`973`	`}`
`974`	`974`
`975`	`975`	`private object Optionlike {`
`976`		`- def unapply(s: String): Boolean = s.startsWith("-") && s != "-"`
	`976`	`+ def unapply(s: String): Boolean = s.startsWith("-")`
`977`	`977`	`}`