Merge pull request #3057 from xeno-by/topic/fancy-java-classes

fixes handling of fancy nested classes in runtime reflection

3 files changed, 37 insertions, 0 deletions

diff --git a/test/files/run/reflection-fancy-java-classes.check b/test/files/run/reflection-fancy-java-classes.check
new file mode 100644
index 0000000000..258208dd99
--- /dev/null
+++ b/test/files/run/reflection-fancy-java-classes.check
@@ -0,0 +1,12 @@
+===== JAVA POV =====
+class Foo_1$1
+getEnclosingClass = class Foo_1
+getEnclosingMethod = null
+getEnclosingConstructor = null
+isMemberClass = false
+isLocalClass = false
+isAnonymousClass = true
+
+===== SCALA POV =====
+class 1
+object Foo_1
diff --git a/test/files/run/reflection-fancy-java-classes/Foo_1.java b/test/files/run/reflection-fancy-java-classes/Foo_1.java
new file mode 100644
index 0000000000..f6fd76124b
--- /dev/null
+++ b/test/files/run/reflection-fancy-java-classes/Foo_1.java
@@ -0,0 +1,5 @@
+public class Foo_1 {
+  public static Bar bar = new Bar();
+  private static class Bar {
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/reflection-fancy-java-classes/Test_2.scala b/test/files/run/reflection-fancy-java-classes/Test_2.scala
new file mode 100644
index 0000000000..271960ee79
--- /dev/null
+++ b/test/files/run/reflection-fancy-java-classes/Test_2.scala
@@ -0,0 +1,20 @@
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+
+object Test extends App {
+  println("===== JAVA POV =====")
+  val jfancy = Class.forName("Foo_1$1")
+  println(jfancy)
+  println("getEnclosingClass = " + jfancy.getEnclosingClass)
+  println("getEnclosingMethod = " + jfancy.getEnclosingMethod)
+  println("getEnclosingConstructor = " + jfancy.getEnclosingConstructor)
+  println("isMemberClass = " + jfancy.isMemberClass)
+  println("isLocalClass = " + jfancy.isLocalClass)
+  println("isAnonymousClass = " + jfancy.isAnonymousClass)
+
+  println("")
+  println("===== SCALA POV =====")
+  val sfancy = cm.classSymbol(jfancy)
+  println(sfancy)
+  println(sfancy.owner)
+}
\ No newline at end of file