Fix - define multiple times scalac options with -P and Xplugin prefix (…

…#653)
VirtusLab · Feb 15, 2022 · e560646 · e560646
1 parent 6de9841
commit e560646
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/modules/build/src/main/scala/scala/build/options/ScalacOpt.scala b/modules/build/src/main/scala/scala/build/options/ScalacOpt.scala
@@ -4,7 +4,7 @@ final case class ScalacOpt(value: String) {
   def key: Option[String] =
     if (value.startsWith("-"))
       Some(value.takeWhile(_ != ':'))
-        .filterNot(ScalacOpt.repeatingKeys.contains)
+        .filterNot(key => ScalacOpt.repeatingKeys.exists(_.startsWith(key)))
     else if (value.startsWith("@"))
       Some("@")
     else

diff --git a/modules/build/src/test/scala/scala/build/tests/BuildTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildTests.scala
@@ -959,4 +959,26 @@ class BuildTests extends munit.FunSuite {
       expect(scalacOptions == expectedOptions)
     }
   }
+
+  test("multiple times scalac options with -Xplugin prefix") {
+    val inputs = TestInputs(
+      os.rel / "foo.scala" ->
+        """//> using option "-Xplugin:/paradise_2.12.15-2.1.1.jar"
+          |//> using option "-Xplugin:/semanticdb-scalac_2.12.15-4.4.31.jar"
+          |
+          |def foo = "bar"
+          |""".stripMargin
+    )
+
+    inputs.withBuild(defaultOptions, buildThreads, bloopConfig) { (_, _, maybeBuild) =>
+      val expectedOptions =
+        Seq(
+          "-Xplugin:/paradise_2.12.15-2.1.1.jar",
+          "-Xplugin:/semanticdb-scalac_2.12.15-4.4.31.jar"
+        )
+      val scalacOptions =
+        maybeBuild.toOption.get.options.scalaOptions.scalacOptions.toSeq.map(_.value.value)
+      expect(scalacOptions == expectedOptions)
+    }
+  }
 }