Fix #580: use isContainedIn to support cases where the enclosing class is also the top-level class

2 files changed, 26 insertions, 0 deletions

diff --git a/tests/run/innerInObject.check b/tests/run/innerInObject.check
new file mode 100644
index 000000000..1191247b6
--- /dev/null
+++ b/tests/run/innerInObject.check
@@ -0,0 +1,2 @@
+1
+2
diff --git a/tests/run/innerInObject.scala b/tests/run/innerInObject.scala
new file mode 100644
index 000000000..5a5ece416
--- /dev/null
+++ b/tests/run/innerInObject.scala
@@ -0,0 +1,24 @@
+object Test {
+  def foo(x: Int) = {
+    println(x)
+  }
+
+  def outer(x: Int) = {
+    def inner() = {
+      foo(x)
+    }
+    inner()
+  }
+
+  def outer2(x: Int) = {
+    def inner2() = {
+      Test.foo(x)
+    }
+    inner2()
+  }
+
+  def main(args: Array[String]): Unit = {
+    outer(1)
+    outer2(2)
+  }
+}