Adjust formatting and access modifiers

Author: jchyb

cli/src/main/scala/scala/scalanative/cli/ScalaNativeCli.scala

@@ -16,16 +16,15 @@ object ScalaNativeCli extends CaseApp[CliOptions] {
   def run(options: CliOptions, args: RemainingArgs) = {
     if (options.misc.version) {
       println(BuildInfo.nativeVersion)
-    } else if (options.config.main == None) {
+    } else if (options.config.main.isEmpty) {
       println("Required option not specified: --main")
       exit(1)
     } else {
-      val ignoredArgs = args.all.filter(_.startsWith("--"))
+      val (ignoredArgs, classpath) = args.all.partition(_.startsWith("-"))
       ignoredArgs.foreach { arg =>
         println(s"Unrecognised argument: ${arg}")
       }
       val main = options.config.main.get
-      val classpath = args.all.filter(!_.startsWith("--"))
       val buildOptionsMaybe = ConfigConverter.convert(options, main, classpath)
 
       buildOptionsMaybe match {

cli/src/main/scala/scala/scalanative/cli/utils/ConfigConverter.scala

@@ -21,7 +21,7 @@ object ConfigConverter {
       main: String,
       classpath: Seq[String]
   ): Either[Throwable, BuildOptions] = {
-    if (classpath.size == 0) {
+    if (classpath.isEmpty) {
       Left(
         new IllegalArgumentException(
           "Classpath not specified. Pass classpath files as positional arguments."

cli/src/test/scala/scala/scalanative/cli/ConfigConverterTest.scala renamed to cli/src/test/scala/scala/scalanative/cli/utils/ConfigConverterTest.scala

@@ -4,7 +4,7 @@ import scala.scalanative.build.NativeConfig
 
 import scala.scalanative.cli.options.CliOptions
 
-object VersionSpecificOptionsIncluder {
+private[utils] object VersionSpecificOptionsIncluder {
   def withVersionSpecificOptions(
       options: CliOptions,
       nativeConfig: NativeConfig

cli/version_0.4.0/src/main/scala/scala/scalanative/cli/utils/VersionSpecificOptionsIncluder.scala

@@ -1,27 +1,28 @@
 package scala.scalanative.cli.utils
 
 import java.util.regex.Pattern
-import scala.util.Try
 
-object LinktimePropertyParser {
+private[utils] object LinktimePropertyParser {
 
   val ltpPattern = Pattern.compile("(.*?)=(.*)")
 
   @inline
-  def getLtpPatternException(incorrectPattern: String) =
+  private def getLtpPatternException(incorrectPattern: String) =
     new IllegalArgumentException(
       s"""|Link-time resolved properties must be of pattern keystring=boolean
           |\"${incorrectPattern}\" is incorrect.""".stripMargin
     )
 
-  def toMap(ltpStrings: List[String]): Either[Throwable, Map[String, Any]] = {
+  def parseAll(
+      ltpStrings: List[String]
+  ): Either[Throwable, Map[String, Any]] = {
     val eitherList =
       ltpStrings
         .map { inputPattern =>
           val matcher = ltpPattern.matcher(inputPattern)
           if (
-            !matcher
-              .find() || matcher.groupCount() != 2 || matcher.group(1).isEmpty()
+            !matcher.find() ||
+            matcher.groupCount() != 2 || matcher.group(1).isEmpty()
           ) {
             Left(getLtpPatternException(inputPattern))
           } else {
@@ -33,7 +34,7 @@ object LinktimePropertyParser {
     flattenEither(eitherList)
   }
 
-  def flattenEither(
+  private def flattenEither(
       eitherList: List[Either[Throwable, (String, Any)]]
   ): Either[Throwable, Map[String, Any]] = {
     val errors = eitherList.collect { case Left(error) => error }

cli/version_newer/src/main/scala/scala/scalanative/cli/utils/LinktimePropertyParser.scala

@@ -5,7 +5,7 @@ import scala.scalanative.build.NativeConfig
 import _root_.scala.scalanative.cli.options.CliOptions
 import scala.util.Try
 
-object VersionSpecificOptionsIncluder {
+private[utils] object VersionSpecificOptionsIncluder {
   def withVersionSpecificOptions(
       options: CliOptions,
       baseNativeConfig: NativeConfig
@@ -19,7 +19,7 @@ object VersionSpecificOptionsIncluder {
       baseNativeConfig: NativeConfig
   ): Either[Throwable, NativeConfig] = {
     LinktimePropertyParser
-      .toMap(options.nativeConfig.ltp)
+      .parseAll(options.nativeConfig.ltp)
       .flatMap { ltpMap =>
         Try(
           baseNativeConfig.withLinktimeProperties(ltpMap)

cli/version_newer/src/main/scala/scala/scalanative/cli/utils/VersionSpecificOptionsIncluder.scala

@@ -1,25 +1,24 @@
-package scala.scalanative.cli
+package scala.scalanative.cli.utils
 
 import org.scalatest.flatspec.AnyFlatSpec
-import scala.scalanative.cli.utils.LinktimePropertyParser
 
 class LinktimePropertyParserTest extends AnyFlatSpec {
 
   "LinktimePropertyParser" should "handle boolean value types correctly" in {
     val input = List("isTesting=true", "isNotTesting=False")
     val expected =
       Map[String, Any]("isTesting" -> "true", "isNotTesting" -> "False")
-    val obtained = LinktimePropertyParser.toMap(input)
+    val obtained = LinktimePropertyParser.parseAll(input)
     assert(obtained.right.get == expected)
   }
 
   it should "return error on undefined string patterns" in {
     val noEquals = List("key-true")
-    val obtainedNoEquals = LinktimePropertyParser.toMap(noEquals)
+    val obtainedNoEquals = LinktimePropertyParser.parseAll(noEquals)
     assert(obtainedNoEquals.isLeft)
 
     val noKey = List("=true")
-    val obtainedNoKey = LinktimePropertyParser.toMap(noKey)
+    val obtainedNoKey = LinktimePropertyParser.parseAll(noKey)
     assert(obtainedNoKey.isLeft)
   }