Merge pull request #60 from olafurpg/repeated

Fix handling of repeated arguments
scalameta · Sep 3, 2018 · df7eec3 · df7eec3
2 parents 0fab6dd + 2c471a8
commit df7eec3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -31,7 +31,7 @@ lazy val `metaconfig-json` = project
     allSettings,
     libraryDependencies ++= List(
       "com.lihaoyi" %%% "ujson" % "0.6.5",
-      "org.scalameta" %% "testkit" % "3.7.3" % Test
+      "org.scalameta" %% "testkit" % "4.0.0-M11" % Test
     )
   )
   .dependsOn(`metaconfig-coreJVM`)

diff --git a/metaconfig-core/jvm/src/test/scala/metaconfig/internal/CliParserSuite.scala b/metaconfig-core/jvm/src/test/scala/metaconfig/internal/CliParserSuite.scala
@@ -99,6 +99,12 @@ class CliParserSuite extends BaseCliParserSuite {
     Options(in = "in", out = "out")
   )
 
+  check(
+    "repeated",
+    List("--classpath", "a", "--classpath", "b"),
+    Options().copy(classpath = List("a", "b"))
+  )
+
   check(
     "kebab",
     "--base-url" :: "base-url" :: Nil,

diff --git a/metaconfig-core/shared/src/main/scala/metaconfig/internal/CliParser.scala b/metaconfig-core/shared/src/main/scala/metaconfig/internal/CliParser.scala
@@ -25,7 +25,13 @@ object CliParser {
         curr: Conf.Obj,
         xs: List[String],
         s: State): Configured[Conf.Obj] = {
-      def add(key: String, value: Conf) = Conf.Obj((key, value) :: curr.values)
+      def add(key: String, value: Conf): Conf.Obj = {
+        val values = curr.values.filterNot {
+          case (k, _) => k == key
+        }
+        Conf.Obj((key, value) :: values)
+      }
+
       (xs, s) match {
         case (Nil, NoFlag) => ok(curr)
         case (Nil, Flag(flag, _)) => ok(add(flag, Conf.fromBoolean(true)))