Merge pull request #5550 from retronym/ticket/3772

SI-3772 Fix detection of term-owned companions

4 files changed, 40 insertions, 0 deletions

diff --git a/test/files/neg/t3772.check b/test/files/neg/t3772.check
new file mode 100644
index 0000000000..d1ed39d8b6
--- /dev/null
+++ b/test/files/neg/t3772.check
@@ -0,0 +1,7 @@
+t3772.scala:7: error: value inner is not a member of object CC
+     CC.inner
+        ^
+t3772.scala:14: error: value outer is not a member of object CC
+      CC.outer
+         ^
+two errors found
diff --git a/test/files/neg/t3772.scala b/test/files/neg/t3772.scala
new file mode 100644
index 0000000000..cac4932d4a
--- /dev/null
+++ b/test/files/neg/t3772.scala
@@ -0,0 +1,17 @@
+class Test {
+   def m = {
+     case class CC(c: Int)
+     if ("".isEmpty) {
+       object CC { def inner = 42}
+     }
+     CC.inner
+   }
+  def n = {
+    object CC { val outer = 42 }
+    if ("".isEmpty) {
+      case class CC(c: Int)
+      CC(0).c
+      CC.outer
+    }
+  }
+}
diff --git a/test/files/neg/t8002-nested-scope.check b/test/files/neg/t8002-nested-scope.check
new file mode 100644
index 0000000000..f66249e432
--- /dev/null
+++ b/test/files/neg/t8002-nested-scope.check
@@ -0,0 +1,4 @@
+t8002-nested-scope.scala:8: error: method x in class C cannot be accessed in C
+        new C().x
+                ^
+one error found
diff --git a/test/files/neg/t8002-nested-scope.scala b/test/files/neg/t8002-nested-scope.scala
new file mode 100644
index 0000000000..44704a12b1
--- /dev/null
+++ b/test/files/neg/t8002-nested-scope.scala
@@ -0,0 +1,12 @@
+class C {
+  def foo = {
+    class C { private def x = 0 }
+
+    {
+      val a = 0
+      object C {
+        new C().x
+      }
+    }
+  }
+}