Merge pull request #418 from alexarchambault/fix-tag

Fix Tag stuff

Author: alexarchambault

annotations/shared/src/main/scala/caseapp/Annotations.scala

@@ -51,5 +51,3 @@ final class Recurse extends StaticAnnotation
 final class Hidden extends StaticAnnotation
 
 final case class Group(name: String) extends StaticAnnotation
-
-final case class Tag(name: String) extends StaticAnnotation

annotations/shared/src/main/scala/caseapp/annotation/Tag.scala

@@ -0,0 +1,5 @@
+package caseapp.annotation
+
+import scala.annotation.StaticAnnotation
+
+final case class Tag(name: String) extends StaticAnnotation

core/shared/src/main/scala/caseapp/package.scala

@@ -37,7 +37,13 @@ package object caseapp {
 
   // Custom tag implementation, see above for more details
   type @@[T, Tag] = shapeless.newtype.Newtype[T, Tag]
+  type Tag        = caseapp.annotation.Tag
   object Tag {
+    def apply(name: String): Tag =
+      caseapp.annotation.Tag(name)
+    def unapply(tag: Tag): Option[String] =
+      caseapp.annotation.Tag.unapply(tag)
+
     final class TagBuilder[Tag] {
       def apply[T](t: T): T @@ Tag = t.asInstanceOf[T @@ Tag]
     }

project/Mima.scala

@@ -8,11 +8,11 @@ import scala.sys.process._
 object Mima {
 
   def binaryCompatibilityVersions: Set[String] =
-    Seq("git", "tag", "--merged", "HEAD^", "--contains", "cd2b553559a0649cc7660bddc198645e442e31c7")
+    Seq("git", "tag", "--merged", "HEAD^", "--contains", "be2a19c6c737f")
       .!!
       .linesIterator
       .map(_.trim)
-      .filter(_ != "v2.1.0-M14")
+      .filter(_ != "v2.1.0-M16")
       .filter(_.startsWith("v"))
       .map(_.stripPrefix("v"))
       .toSet

tests/shared/src/test/scala/caseapp/CaseAppTests.scala

@@ -583,6 +583,16 @@ object CaseAppTests extends TestSuite {
       assert(res == expectedRes)
     }
 
+    test("keep tags") {
+      val args     = DemoOptions.help.args
+      val valueArg = args.find(_.name.name == "value").getOrElse(sys.error("value arg not found"))
+      val stagesArg =
+        args.find(_.name.name == "stages").getOrElse(sys.error("stages arg not found"))
+
+      assert(valueArg.tags == Seq(Tag("foo")))
+      assert(stagesArg.tags == Seq(Tag("foo"), Tag("other")))
+    }
+
   }
 
 }

tests/shared/src/test/scala/caseapp/demo/Demo.scala

@@ -16,9 +16,17 @@ object SharedOptions {
 @ArgsName("files")
 final case class DemoOptions(
   first: Boolean,
-  @ExtraName("V") @HelpMessage("Set a value") value: Option[String],
+  @Group("foo")
+  @Tag("foo")
+  @ExtraName("V")
+  @HelpMessage("Set a value")
+  value: Option[String],
   @ExtraName("v") @HelpMessage("Be verbose") verbose: Int @@ Counter,
-  @ExtraName("S") @ValueDescription("stages") stages: List[String],
+  @Tag("foo")
+  @Tag("other")
+  @ExtraName("S")
+  @ValueDescription("stages")
+  stages: List[String],
   @Recurse shared: SharedOptions = SharedOptions()
 )