Remove ParamInfo.withAnnotations

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/MainProxies.scala

@@ -152,11 +152,8 @@ object MainProxies {
    *           args,
    *           "f",
    *           "Lorem ipsum dolor sit amet consectetur adipiscing elit.",
-   *           new scala.annotation.MainAnnotation.ParameterInfo("x", "S")
-   *             .withDocumentation("my param x")
-   *             .withAnnotations(new scala.main.Alias("myX")),
-   *           new scala.annotation.MainAnnotation.ParameterInfo("ys", "T")
-   *             .withDocumentation("all my params y")
+   *           new scala.annotation.MainAnnotation.ParameterInfo("x", "S", false, false, "my param x", Seq(new scala.main.Alias("myX")))
+   *           new scala.annotation.MainAnnotation.ParameterInfo("ys", "T", false, false, "all my params y", Seq())
    *         )
    *
    *         val args0: () => S = cmd.argGetter[S](0, None)
@@ -226,9 +223,7 @@ object MainProxies {
      *
      *  A ParamInfo has the following shape
      *  ```
-     *  new scala.annotation.MainAnnotation.ParameterInfo("x", "S")
-     *    .withDocumentation("my param x")
-     *    .withAnnotations(new scala.main.Alias("myX"))
+     *  new scala.annotation.MainAnnotation.ParameterInfo("x", "S", false, false, "my param x", Seq(new scala.main.Alias("myX")))
      *  ```
      */
     def parameterInfos(mt: MethodType): List[Tree] =
@@ -244,15 +239,15 @@ object MainProxies {
         val hasDefault = defaultValueSymbols.contains(idx)
         val isRepeated = formal.isRepeatedParam
         val paramDoc = documentation.argDocs.getOrElse(param, "")
+        val paramAnnots =
+          val annotationTrees = paramAnnotations(idx).map(instantiateAnnotation).toList
+          Apply(ref(defn.SeqModule.termRef), annotationTrees)
 
         val constructorArgs = List(param, paramTypeStr, hasDefault, isRepeated, paramDoc)
           .map(value => Literal(Constant(value)))
-        val paramInfos =
-          New(TypeTree(defn.MainAnnotationParameterInfo.typeRef), List(constructorArgs))
-        val paramAnnots = paramAnnotations(idx)
-        if paramAnnots.nonEmpty then
-          paramInfos.withProperty(defn.MainAnnotationParameterInfo_withAnnotations, paramAnnots.map(instantiateAnnotation).toList)
-        else paramInfos
+
+        New(TypeTree(defn.MainAnnotationParameterInfo.typeRef), List(constructorArgs :+ paramAnnots))
+
     end parameterInfos
 
     /**

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -524,6 +524,8 @@ class Definitions {
     @tu lazy val Seq_lengthCompare: Symbol = SeqClass.requiredMethod(nme.lengthCompare, List(IntType))
     @tu lazy val Seq_length       : Symbol = SeqClass.requiredMethod(nme.length)
     @tu lazy val Seq_toSeq        : Symbol = SeqClass.requiredMethod(nme.toSeq)
+  @tu lazy val SeqModule: Symbol = requiredModule("scala.collection.immutable.Seq")
+
 
   @tu lazy val StringOps: Symbol = requiredClass("scala.collection.StringOps")
     @tu lazy val StringOps_format: Symbol  = StringOps.requiredMethod(nme.format)

compiler/src/dotty/tools/dotc/core/StdNames.scala

@@ -467,6 +467,7 @@ object StdNames {
     val dynamics: N             = "dynamics"
     val elem: N                 = "elem"
     val elems: N                = "elems"
+    val empty: N                = "empty"
     val emptyValDef: N          = "emptyValDef"
     val end: N                  = "end"
     val ensureAccessible : N    = "ensureAccessible"

docs/_docs/reference/experimental/main-annotation.md

@@ -23,8 +23,8 @@ object foo {
       args = args,
       commandName = "sum",
       documentation = "Sum all the numbers",
-      new ParameterInfo("first", "scala.Int", hasDefault=false, isVarargs=false, "Fist number to sum"),
-      new ParameterInfo("rest", "scala.Int" , hasDefault=false, isVarargs=true, "The rest of the numbers to sum")
+      new ParameterInfo("first", "scala.Int", hasDefault=false, isVarargs=false, "Fist number to sum", Seq()),
+      new ParameterInfo("rest", "scala.Int" , hasDefault=false, isVarargs=true, "The rest of the numbers to sum", Seq())
     )
     val args0 = cmd.argGetter[Int](0, None) // using cmd.Parser[Int]
     val args1 = cmd.varargGetter[Int] // using cmd.Parser[Int]
@@ -86,4 +86,3 @@ class myMain extends MainAnnotation:
   end MyCommand
 end myMain
 ```
-

library/src/scala/annotation/MainAnnotation.scala

@@ -64,7 +64,15 @@ end MainAnnotation
 @experimental
 object MainAnnotation:
 
-  final class ParameterInfo private (
+  /** ParameterInfo with a name, the type of the parameter and if it has a default
+   *
+   *  @param name The name of the parameter
+   *  @param typeName The type of the parameter
+   *  @param hasDefault If the parameter has a default argument
+   *  @param isVarargs If the parameter is a varargs parameter (can only be true for the last parameter)
+   *  @param documentation The documentation of the parameter (from `@param` documentation in the main method)
+   */
+  final class ParameterInfo (
     paramName: String,
     paramTypeName: String,
     paramHasDefault: Boolean,
@@ -73,17 +81,6 @@ object MainAnnotation:
     paramAnnotations: Seq[ParameterAnnotation],
   ) {
 
-    /** ParameterInfo with a name, the type of the parameter and if it has a default
-     *
-     *  @param name The name of the parameter
-     *  @param typeName The type of the parameter
-     *  @param hasDefault If the parameter has a default argument
-     *  @param isVarargs If the parameter is a varargs parameter (can only be true for the last parameter)
-     *  @param documentation The documentation of the parameter (from `@param` documentation in the main method)
-     */
-    def this(name: String, typeName: String, hasDefault: Boolean, isVarargs: Boolean, documentation: String) =
-      this(name, typeName, hasDefault, isVarargs, documentation, Seq.empty)
-
     /** The name of the parameter */
     def name: String = paramName
 
@@ -102,10 +99,6 @@ object MainAnnotation:
     /** The ParameterAnnotations associated with the parameter. Defaults to Seq.empty. */
     def annotations: Seq[ParameterAnnotation] = paramAnnotations
 
-    /** Copy this ParameterInfo and sets the annotations */
-    def withAnnotations(annotations: ParameterAnnotation*): ParameterInfo =
-      new ParameterInfo(paramName, typeName, paramHasDefault, paramIsVarargs, documentation, annotations)
-
     override def toString: String = s"$name: $typeName"
   }
 

tests/run/main-annotation-homemade-annot-6.check

@@ -17,7 +17,7 @@ command(
   bar,
   "Bar docs",
   Seq(
-    ParameterInfo(name="i", typeName="scala.collection.immutable.List[Int]", hasDefault=false, isVarargs=false, documentation="the first parameter", annotations=ArraySeq(MyParamAnnot(3))),
+    ParameterInfo(name="i", typeName="scala.collection.immutable.List[Int]", hasDefault=false, isVarargs=false, documentation="the first parameter", annotations=List(MyParamAnnot(3))),
     ParameterInfo(name="rest", typeName="scala.Int", hasDefault=false, isVarargs=true, documentation="", annotations=List())
   )*
 )