Simplify aliases

Author: nicolasstucki

library/src/scala/annotation/newMain.scala

@@ -67,7 +67,7 @@ final class newMain extends MainAnnotation[FromString, Any]:
 
   extension (param: Parameter)
     private def aliasNames: Seq[String] =
-      param.annotations.collect{ case a: Alias => a.aliases.map(getNameWithMarker) }.flatten
+      param.annotations.collect{ case alias: Alias => getNameWithMarker(alias.name) }
 
   private def getNameWithMarker(name: String): String =
     if name.length > 1 then s"--$name"
@@ -316,9 +316,8 @@ final class newMain extends MainAnnotation[FromString, Any]:
             throw IllegalArgumentException(s"The following argument name is invalid: ${param.name}")
           for annot <- param.annotations do
             annot match
-              case alias: Alias =>
-                for name <- alias.aliases if !isValidArgName(name) do
-                  throw IllegalArgumentException(s"The following alias is invalid: $name")
+              case alias: Alias if !isValidArgName(alias.name)  =>
+                throw IllegalArgumentException(s"The following alias is invalid: ${alias.name}")
               case _ =>
 
       checkValidNames()
@@ -329,6 +328,6 @@ end newMain
 
 object newMain:
   @experimental
-  final class Alias(val aliases: String*) extends MainAnnotation.ParameterAnnotation
+  final class Alias(val name: String) extends MainAnnotation.ParameterAnnotation
 
 end newMain

tests/run/main-annotation-help-override.check

@@ -30,7 +30,7 @@ Error: missing argument for notH
 Usage: helpOverride7 [--notHelp | --help] <Int> [--notH | -h] <Int>
 Error: missing argument for --help
 Error: missing argument for notHelp
-Usage: helpOverride8 [--notHelp | --help | -h] <Int>
+Usage: helpOverride8 [--notHelp | -h | --help] <Int>
 ##### -h
 Usage: helpOverride1 [--notHelp] <Int>
 
@@ -63,4 +63,4 @@ Error: missing argument for notH
 Usage: helpOverride7 [--notHelp | --help] <Int> [--notH | -h] <Int>
 Error: missing argument for -h
 Error: missing argument for notHelp
-Usage: helpOverride8 [--notHelp | --help | -h] <Int>
+Usage: helpOverride8 [--notHelp | -h | --help] <Int>

tests/run/main-annotation-help-override.scala

@@ -26,7 +26,7 @@ object myProgram:
   @newMain def helpOverride7(@newMain.Alias("help") notHelp: Int, @newMain.Alias("h") notH: Int) = ???
 
   /** A method that should not let --help and -h display help. */
-  @newMain def helpOverride8(@newMain.Alias("help", "h") notHelp: Int) = ???
+  @newMain def helpOverride8(@newMain.Alias("help") @newMain.Alias("h") notHelp: Int) = ???
 
 end myProgram
 

tests/run/main-annotation-param-annot-1.scala

@@ -49,8 +49,8 @@ object myProgram:
     println(s"$num + $inc = ${num + inc}")
 
   @newMain def multiple(
-    @newMain.Alias("myNum", "n") num: Int,
-    @newMain.Alias("i", "myInc") inc: Int
+    @newMain.Alias("myNum") @newMain.Alias("n") num: Int,
+    @newMain.Alias("i") @newMain.Alias("myInc") inc: Int
   ): Unit =
     println(s"$num + $inc = ${num + inc}")
 end myProgram