Fix flag and Name hint

indoorvivants · Jul 11, 2024 · f241e5a · f241e5a
1 parent 9abe233
commit f241e5a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/library.test.scala b/library.test.scala
@@ -58,10 +58,13 @@ class Tests extends FunSuite:
     assertArgs[Cmd](Cmd(None))()
 
   test("argument hints: name"):
-    case class Cmd(@arg(_.Name("yepp")) location: Option[String])
-        derives CommandApplication
+    case class Cmd(
+        @arg(_.Name("yepp")) location: Option[String],
+        @arg(_.Name("flag2")) flag: Boolean
+    ) derives CommandApplication
 
-    assertArgs[Cmd](Cmd(Some("shroom")))("--yepp", "shroom")
+    assertArgs[Cmd](Cmd(Some("shroom"), false))("--yepp", "shroom")
+    assertArgs[Cmd](Cmd(Some("shroom"), true))("--yepp", "shroom", "--flag2")
 
   test("argument hints: short"):
     case class Cmd(@arg(_.Short("y")) location: Option[String])

diff --git a/macros.scala b/macros.scala
@@ -153,9 +153,20 @@ private[decline_derive] object Macros:
       case '[Boolean] =>
         '{
           ${ hints.flag } match
-            case None => Opts.flag($name, ${ hints.help }.getOrElse("")).orFalse
+            case None =>
+              Opts
+                .flag(
+                  ${ hints.name }.getOrElse($name),
+                  ${ hints.help }.getOrElse("")
+                )
+                .orFalse
             case Some(value) =>
-              Opts.flag($name, ${ hints.help }.getOrElse("")).orTrue
+              Opts
+                .flag(
+                  ${ hints.name }.getOrElse($name),
+                  ${ hints.help }.getOrElse("")
+                )
+                .orTrue
         }
 
       case '[Option[e]] =>