Trim and filter empties in arg files

som-snytt · som-snytt · commit fbd722326d50 · 2022-08-28T05:38:27.000-07:00
diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
@@ -126,11 +126,11 @@ class CompilerCommand(arguments: List[String], val settings: Settings) {
   def expandArg(arg: String): List[String] = {
     import java.nio.file.{Files, Paths}
     import scala.jdk.CollectionConverters._
-    def stripComment(s: String) = s.takeWhile(_ != '#')
+    def stripComment(s: String) = s.takeWhile(_ != '#').trim()
     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
+    Files.readAllLines(file).asScala.map(stripComment).filter(_ != "").toList
   }
 
   // override this if you don't want arguments processed here
