Merge pull request #2274 from vigdorchik/ticket/si-5699

SI-5699 correct java parser for annotation defs.

2 files changed, 35 insertions, 0 deletions

diff --git a/test/files/run/t5699.check b/test/files/run/t5699.check
new file mode 100755
index 0000000000..df19644ae6
--- /dev/null
+++ b/test/files/run/t5699.check
@@ -0,0 +1,11 @@
+[[syntax trees at end of                    parser]] // annodef.java
+package <empty> {
+  object MyAnnotation extends  {
+    def <init>() = _
+  };
+  class MyAnnotation extends scala.annotation.Annotation with _root_.java.lang.annotation.Annotation with scala.annotation.ClassfileAnnotation {
+    def <init>() = _;
+    def value(): String
+  }
+}
+
diff --git a/test/files/run/t5699.scala b/test/files/run/t5699.scala
new file mode 100755
index 0000000000..5cef67e3b1
--- /dev/null
+++ b/test/files/run/t5699.scala
@@ -0,0 +1,24 @@
+import scala.tools.partest.DirectTest
+import scala.tools.nsc.util.BatchSourceFile
+
+object Test extends DirectTest {
+  // Java code
+  override def code = """
+    |public @interface MyAnnotation { String value(); }
+  """.stripMargin
+
+  override def extraSettings: String = "-usejavacp -Ystop-after:typer -Xprint:parser"
+
+  override def show(): Unit = {
+    // redirect err to out, for logging
+    val prevErr = System.err
+    System.setErr(System.out)
+    compile()
+    System.setErr(prevErr)
+  }
+
+  override def newSources(sourceCodes: String*) = {
+    assert(sourceCodes.size == 1)
+    List(new BatchSourceFile("annodef.java", sourceCodes(0)))
+  }
+}