desugar Java repeated parms into an Array instead of Seq

Author: olhotak

src/dotty/tools/dotc/ast/Desugar.scala

@@ -767,11 +767,12 @@ object desugar {
         else // l.op(r), or val x = r; l.op(x), plus handle named args specially
           makeBinop(l, op, r)
       case PostfixOp(t, op) =>
-        if ((ctx.mode is Mode.Type) && op == nme.raw.STAR)
+        if ((ctx.mode is Mode.Type) && op == nme.raw.STAR) {
+          val seqClass = if (ctx.compilationUnit.isJava) defn.ArrayClass else defn.SeqClass
           Annotated(
             New(ref(defn.RepeatedAnnot.typeRef), Nil :: Nil),
-            AppliedTypeTree(ref(defn.SeqClass.typeRef), t))
-        else {
+            AppliedTypeTree(ref(seqClass.typeRef), t))
+        } else {
           assert(ctx.mode.isExpr, ctx.mode)
           Select(t, op)
         }

src/dotty/tools/dotc/core/TypeApplications.scala

@@ -288,7 +288,10 @@ class TypeApplications(val self: Type) extends AnyVal {
    *  or, if isJava is true, Array type, else the type itself.
    */
   def underlyingIfRepeated(isJava: Boolean)(implicit ctx: Context): Type =
-    if (self.isRepeatedParam) translateParameterized(defn.RepeatedParamClass, defn.SeqClass)
+    if (self.isRepeatedParam) {
+      val seqClass = if(isJava) defn.ArrayClass else defn.SeqClass
+      translateParameterized(defn.RepeatedParamClass, seqClass)
+    }
     else self
 
   /** If this is an encoding of a (partially) applied type, return its arguments,

src/dotty/tools/dotc/core/Types.scala

@@ -1745,7 +1745,9 @@ object Types {
     def fromSymbols(params: List[Symbol], resultType: Type)(implicit ctx: Context) = {
       def paramInfo(param: Symbol): Type = param.info match {
         case AnnotatedType(annot, tp) if annot matches defn.RepeatedAnnot =>
-          tp.translateParameterized(defn.SeqClass, defn.RepeatedParamClass)
+          val typeSym = param.info.typeSymbol.asClass
+          assert(typeSym == defn.SeqClass || typeSym == defn.ArrayClass)
+          tp.translateParameterized(typeSym, defn.RepeatedParamClass)
         case tp =>
           tp
       }

src/dotty/tools/dotc/core/transform/Erasure.scala

@@ -47,8 +47,9 @@ object Erasure {
   def erasure(tp: Type)(implicit ctx: Context): Type = scalaErasureFn(tp)
   def semiErasure(tp: Type)(implicit ctx: Context): Type = semiErasureFn(tp)
   def sigName(tp: Type, isJava: Boolean)(implicit ctx: Context): TypeName = {
+    val seqClass = if(isJava) defn.ArrayClass else defn.SeqClass
     val normTp =
-      if (tp.isRepeatedParam) tp.translateParameterized(defn.RepeatedParamClass, defn.SeqClass)
+      if (tp.isRepeatedParam) tp.translateParameterized(defn.RepeatedParamClass, seqClass)
       else tp
     (if (isJava) javaSigFn else scalaSigFn).sigName(normTp)
   }