project-builder | Fix splitting scalacOptions, allow for coma seperated values

Author: WojciechMazur

project-builder/mill/MillCommunityBuild.scala

@@ -114,7 +114,7 @@ object MillCommunityBuild {
     private def parse(propName: String): List[String] =
       sys.props
         .get(propName)
-        .map(_.split(',').filter(_.nonEmpty).toList)
+        .map(Scala3CommunityBuild.Utils.splitScalacOptionArgs)
         .getOrElse(Nil)
     private def isSourceVersion(setting: String): Boolean =
       setting.stripPrefix("REQUIRE:")

project-builder/sbt/CommunityBuildPlugin.scala

@@ -204,7 +204,7 @@ object CommunityBuildPlugin extends AutoPlugin {
     keyTransformCommand("mapScalacOptions", Keys.scalacOptions) {
       (args, extracted) => (scope: Scope, currentScalacOptions: Seq[String]) =>
         val scalaVersion = extracted.get(scope / Keys.scalaVersion)
-        val safeArgs = args.map(_.split(",").toList.filter(_.nonEmpty))
+        val safeArgs = args.map(Scala3CommunityBuild.Utils.splitScalacOptionArgs)
         val append = safeArgs.lift(0).getOrElse(Nil)
         lazy val (appendScala3Exclusive, appendScala3Inclusive) =
           append.partition { opt =>

project-builder/scala-cli/build.scala

@@ -39,7 +39,7 @@ import os.CommandResult
     scalaVersion = scalaVersion,
     repositoryDir = repositoryDir,
     mavenRepoURL = Option(mavenRepoURL).filterNot(_.isEmpty),
-    extraScalacOptions = extraScalacOptions.split(",").toList.map {
+    extraScalacOptions = Scala3CommunityBuild.Utils.splitScalacOptionArgs(extraScalacOptions).map {
       case s"REQUIRE:$opt" => opt
       case opt             => opt
     }

project-builder/shared/CommunityBuildCore.scala

@@ -410,6 +410,31 @@ object Scala3CommunityBuild {
       "Scala2Compat"
     )
     val ignoredScalacOptions = invalidLanguageOptions.map(v => s"-language:$v")
+
+    /** Split by comma only when the remainder starts a new option (-, !, REQUIRE:, MATCH:), so e.g. "-opt-inline:**,!java.**" stays one token. */
+    def splitScalacOptionArgs(s: String): List[String] = {
+      val trimmed = s.trim
+      if (trimmed.isEmpty) return Nil
+      val result = List.newBuilder[String]
+      var start = 0
+      var i = 0
+      while (i < trimmed.length) {
+        if (trimmed(i) == ',') {
+          val afterComma = trimmed.substring(i + 1).trim
+          if (
+            afterComma.startsWith("-") || afterComma.startsWith("!") ||
+            afterComma.startsWith("REQUIRE:") || afterComma.startsWith("MATCH:")
+          ) {
+            result += trimmed.substring(start, i).trim
+            start = i + 1
+          }
+        }
+        i += 1
+      }
+      result += trimmed.substring(start).trim
+      result.result().filter(_.nonEmpty)
+    }
+
     def mapScalacOptions(
         scalaVersion: Option[String],
         current: Seq[String],