NIT Refactor scalac options extraction

VirtusLab · Oct 4, 2022 · f67fda9 · f67fda9
1 parent 5a4d2ec
commit f67fda9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/modules/cli/src/main/scala/scala/cli/commands/util/BuildCommandHelpers.scala b/modules/cli/src/main/scala/scala/cli/commands/util/BuildCommandHelpers.scala
@@ -21,7 +21,7 @@ trait BuildCommandHelpers { self: ScalaCommand[_] =>
       */
     def copyOutput(sharedOptions: SharedOptions): Unit =
       sharedOptions.compilationOutput.filter(_.nonEmpty)
-        .orElse(sharedOptions.scalac.scalacOption.toScalacOptShadowingSeq.getScalacOption("-d"))
+        .orElse(sharedOptions.scalac.scalacOption.getScalacOption("-d"))
         .filter(_.nonEmpty)
         .map(os.Path(_, Os.pwd)).foreach(output =>
           os.copy.over(successfulBuild.output, output, createFolders = true)

diff --git a/modules/cli/src/main/scala/scala/cli/commands/util/JvmUtils.scala b/modules/cli/src/main/scala/scala/cli/commands/util/JvmUtils.scala
@@ -48,7 +48,7 @@ object JvmUtils {
         Seq.empty
     }
 
-    val releaseOpt = scalacOpts.toScalacOptShadowingSeq.getScalacOption("-release")
+    val releaseOpt = scalacOpts.getScalacOption("-release")
     val targetOpt  = scalacOpts.getScalacPrefixOption("-target")
     val jvmIds     = jvm.toSeq ++ releaseOpt ++ targetOpt
     val jvmIdOpt: Option[String] = value {
@@ -69,7 +69,7 @@ object JvmUtils {
       jvmIndexArch = jvmIndexArch.map(_.trim).filter(_.nonEmpty),
       javaOpts = ShadowingSeq.from(javaOptsSeq),
       javacPluginDependencies = SharedOptionsUtil.parseDependencies(
-        javacPluginDeps.map(Positioned.none(_)),
+        javacPluginDeps.map(Positioned.none),
         ignoreErrors = false
       ),
       javacPlugins = javacFilePlugins.map(s => Positioned.none(os.Path(s, Os.pwd))),

diff --git a/modules/cli/src/main/scala/scala/cli/commands/util/ScalacOptionsUtil.scala b/modules/cli/src/main/scala/scala/cli/commands/util/ScalacOptionsUtil.scala
@@ -22,6 +22,8 @@ object ScalacOptionsUtil {
     def getScalacPrefixOption(prefixKey: String): Option[String] =
       opts.find(_.startsWith(s"$prefixKey:")).map(_.stripPrefix(s"$prefixKey:"))
 
+    def getScalacOption(key: String): Option[String] = opts.toScalacOptShadowingSeq.getOption(key)
+
   }
 
   extension (opts: ShadowingSeq[ScalacOpt]) {
@@ -31,7 +33,7 @@ object ScalacOptionsUtil {
       opts
         .filterScalacOptionKeys(!ScalacOptions.ScalaCliRedirectedOptions.contains(_))
         .filterScalacOptionKeys(k => !ScalacOptions.ScalaCliRedirectedPrefixes.exists(k.startsWith))
-    def getScalacOption(key: String): Option[String] =
+    def getOption(key: String): Option[String] =
       opts.get(ScalacOpt(key)).headOption.map(_.value)
   }
 }
diff --git a/modules/cli/src/main/scala/scala/cli/commands/util/SharedOptionsUtil.scala b/modules/cli/src/main/scala/scala/cli/commands/util/SharedOptionsUtil.scala
@@ -256,7 +256,7 @@ object SharedOptionsUtil extends CommandHelpers {
     }
 
     def extraJarsAndClassPath: List[os.Path] =
-      (extraJars ++ scalac.scalacOption.toScalacOptShadowingSeq.getScalacOption("-classpath"))
+      (extraJars ++ scalac.scalacOption.getScalacOption("-classpath"))
         .extractedClassPath
 
     def extraCompileOnlyClassPath: List[os.Path] = extraCompileOnlyJars.extractedClassPath