Merge pull request #215 from scala/backport-lts-3.3-22391

Backport "Fix annotations being not expected in the middle of an array type by java parser" to 3.3 LTS

Author: tgodzik

compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala

@@ -254,14 +254,16 @@ object JavaParsers {
       t
     }
 
-    def optArrayBrackets(tpt: Tree): Tree =
+    def optArrayBrackets(tpt: Tree): Tree = {
+      annotations()
       if (in.token == LBRACKET) {
         val tpt1 = atSpan(tpt.span.start, in.offset) { arrayOf(tpt) }
         in.nextToken()
         accept(RBRACKET)
         optArrayBrackets(tpt1)
       }
       else tpt
+    }
 
     def basicType(): Tree =
       atSpan(in.offset) {
@@ -335,7 +337,7 @@ object JavaParsers {
     }
 
     def annotations(): List[Tree] = {
-      var annots = new ListBuffer[Tree]
+      val annots = new ListBuffer[Tree]
       while (in.token == AT) {
         in.nextToken()
         annotation() match {

tests/pos/i19642/Valid.java

@@ -0,0 +1,17 @@
+package lib;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE_USE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target({ METHOD, FIELD, CONSTRUCTOR, PARAMETER, TYPE_USE })
+@Retention(RUNTIME)
+@Documented
+public @interface Valid {}

tests/pos/i19642/i19642.java

@@ -0,0 +1,9 @@
+package app;
+
+import java.util.Optional;
+import lib.*;
+
+public class i19642 {
+  private String @lib.Valid [] flatArray;
+  private String @lib.Valid [] @lib.Valid [] nestedArray;
+}