Update scalac options

scalacenter · Aug 24, 2023 · 182b79f · 182b79f
1 parent 583055a
commit 182b79f
Show file tree

Hide file tree

Showing 5 changed files with 411 additions and 324 deletions.
diff --git a/migrate/src/main/scala/migrate/Scala3Migrate.scala b/migrate/src/main/scala/migrate/Scala3Migrate.scala
@@ -10,7 +10,6 @@ import migrate.interfaces.Lib
 import migrate.interfaces.MigratedLibsImpl
 import migrate.interfaces.MigratedScalacOptions
 import migrate.internal.ScalaMigrateLogger
-import migrate.internal.ScalacOption.PluginSpecific
 import migrate.internal._
 import migrate.utils.FileUtils
 import migrate.utils.ScalaExtensions._
@@ -174,16 +173,16 @@ class Scala3Migrate(scalafixSrv: ScalafixService) {
 
 object Scala3Migrate {
   def migrateScalacOptions(scalacOptions: Seq[String]): MigratedScalacOptions = {
-    val sanitized                              = ScalacOption.sanitizeScalacOption(scalacOptions)
-    val scalaSettings                          = sanitized.map(ScalacOption.from)
-    val notParsed: Seq[ScalacOption.NotParsed] = scalaSettings.collect { case x: ScalacOption.NotParsed => x }
-    val scala3cOption: Seq[Scala3cOption] = scalaSettings.collect {
-      case x: ScalacOption.Specific3 => x;
+    val sanitized     = ScalacOption.sanitize(scalacOptions)
+    val scalaSettings = sanitized.map(ScalacOption.from)
+    val notParsed     = scalaSettings.collect { case x: ScalacOption.NotParsed => x }
+    val scala3cOption = scalaSettings.collect {
+      case x: ScalacOption.Specific3 => x
       case x: ScalacOption.Shared    => x
     }
-    val pluginsSettings: Seq[PluginSpecific] = scalaSettings.collect { case x: ScalacOption.PluginSpecific => x }
-    val renamed                              = scalaSettings.collect { case x: ScalacOption.Renamed => x }
-    val specific2                            = scalaSettings.collect { case x: ScalacOption.Specific2 => x }
+    val pluginsSettings = scalaSettings.collect { case x: ScalacOption.PluginSpecific => x }
+    val renamed         = scalaSettings.collect { case x: ScalacOption.Renamed => x }
+    val specific2       = scalaSettings.collect { case x: ScalacOption.Specific2 => x }
     MigratedScalacOptions(notParsed, specific2, scala3cOption, renamed, pluginsSettings)
   }
 

diff --git a/migrate/src/main/scala/migrate/internal/CommandLineParser.scala b/migrate/src/main/scala/migrate/internal/CommandLineParser.scala
@@ -19,7 +19,7 @@ import scala.annotation.tailrec
  *
  * Copied from scala/scala
  */
-private object CommandLineParser {
+private[migrate] object CommandLineParser {
   final private val DQ = '"'
   final private val SQ = '\''
 

diff --git a/migrate/src/main/scala/migrate/internal/InitialLib.scala b/migrate/src/main/scala/migrate/internal/InitialLib.scala
@@ -6,7 +6,9 @@ import migrate.interfaces.MigratedLibImp
 import migrate.interfaces.MigratedLibImp._
 import migrate.internal.InitialLib.macroLibs
 import migrate.internal.MigratedLib._
-import migrate.internal.ScalacOption.Specific3
+import migrate.internal.ScalacOption.CoverageOut
+import migrate.internal.ScalacOption.KindProjector
+import migrate.internal.ScalacOption.SemanticDB
 import migrate.utils.CoursierHelper
 import migrate.utils.ScalaExtensions._
 
@@ -152,8 +154,9 @@ object InitialLib {
 
   val compilerPluginToScalacOption: Map[(Organization, Name), Scala3cOption] =
     Map(
-      (Organization("org.typelevel"), Name("kind-projector"))    -> Specific3.KindProjector,
-      (Organization("org.scalameta"), Name("semanticdb-scalac")) -> Specific3.SemanticDB
+      (Organization("org.typelevel"), Name("kind-projector"))          -> KindProjector,
+      (Organization("org.scalameta"), Name("semanticdb-scalac"))       -> SemanticDB,
+      (Organization("org.scoverage"), Name("scalac-scoverage-plugin")) -> CoverageOut(":.")
     )
 
   val macroLibs: Set[(Organization, Name)] =