Adjust detection of shadowable keys for scalac options

Gedochao · Gedochao · commit d40719ffb8f4 · 2024-10-24T12:09:23.000+02:00
diff --git a/modules/options/src/main/scala/scala/build/options/ScalacOpt.scala b/modules/options/src/main/scala/scala/build/options/ScalacOpt.scala
@@ -10,7 +10,7 @@ final case class ScalacOpt(value: String) {
   /** @return raw key for the option (only if the key can be shadowed from the CLI) */
   private[options] def shadowableKey: Option[String] = key match
     case Some(key)
-        if ScalacOpt.repeatingKeys.exists(rKey => rKey.startsWith(key + ":") || rKey == key) => None
+        if ScalacOpt.repeatingKeys.exists(rKey => rKey.contains(":") || rKey == key) => None
     case otherwise => otherwise
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ final case class ScalacOpt(value: String) {`
`10`	`10`	`/** @return raw key for the option (only if the key can be shadowed from the CLI) */`
`11`	`11`	`private[options] def shadowableKey: Option[String] = key match`
`12`	`12`	`case Some(key)`
`13`		`- if ScalacOpt.repeatingKeys.exists(rKey => rKey.startsWith(key + ":") \|\| rKey == key) => None`
	`13`	`+ if ScalacOpt.repeatingKeys.exists(rKey => rKey.contains(":") \|\| rKey == key) => None`
`14`	`14`	`case otherwise => otherwise`
`15`	`15`	`}`
`16`	`16`