From 2a14dd2d23e78775301d38dd235873e5cddc6e23 Mon Sep 17 00:00:00 2001
From: Hubert Plociniczak <hubert.plociniczak@gmail.com>
Date: Fri, 27 Jul 2012 11:32:29 +0200
Subject: Fixed SI-5031. Only consider classes when looking for companion
 class. sym.effectiveOwner revealed this piece of inconsistency.
 companionModule is fine because similar check is there already.

Review by @paulp.
---
 test/files/neg/t5031.check         | 5 +++++
 test/files/neg/t5031/Id.scala      | 4 ++++
 test/files/neg/t5031/package.scala | 3 +++
 test/files/pos/t5031/Id.scala      | 4 ++++
 test/files/pos/t5031/package.scala | 3 +++
 test/files/pos/t5031_2.scala       | 7 +++++++
 6 files changed, 26 insertions(+)
 create mode 100644 test/files/neg/t5031.check
 create mode 100644 test/files/neg/t5031/Id.scala
 create mode 100644 test/files/neg/t5031/package.scala
 create mode 100644 test/files/pos/t5031/Id.scala
 create mode 100644 test/files/pos/t5031/package.scala
 create mode 100644 test/files/pos/t5031_2.scala

(limited to 'test/files')

diff --git a/test/files/neg/t5031.check b/test/files/neg/t5031.check
new file mode 100644
index 0000000000..8983d8daf9
--- /dev/null
+++ b/test/files/neg/t5031.check
@@ -0,0 +1,5 @@
+Id.scala:3: error: Companions 'class Test' and 'object Test' must be defined in same file:
+  Found in t5031/package.scala and t5031/Id.scala
+object Test
+       ^
+one error found
diff --git a/test/files/neg/t5031/Id.scala b/test/files/neg/t5031/Id.scala
new file mode 100644
index 0000000000..2f0db002d2
--- /dev/null
+++ b/test/files/neg/t5031/Id.scala
@@ -0,0 +1,4 @@
+package t5031
+
+object Test
+
diff --git a/test/files/neg/t5031/package.scala b/test/files/neg/t5031/package.scala
new file mode 100644
index 0000000000..17b63220be
--- /dev/null
+++ b/test/files/neg/t5031/package.scala
@@ -0,0 +1,3 @@
+package object t5031 {
+  class Test
+}
diff --git a/test/files/pos/t5031/Id.scala b/test/files/pos/t5031/Id.scala
new file mode 100644
index 0000000000..7bc3ebd348
--- /dev/null
+++ b/test/files/pos/t5031/Id.scala
@@ -0,0 +1,4 @@
+package t5031
+
+object ID
+
diff --git a/test/files/pos/t5031/package.scala b/test/files/pos/t5031/package.scala
new file mode 100644
index 0000000000..c02e69db8e
--- /dev/null
+++ b/test/files/pos/t5031/package.scala
@@ -0,0 +1,3 @@
+package object t5031 {
+  type ID = Int
+}
diff --git a/test/files/pos/t5031_2.scala b/test/files/pos/t5031_2.scala
new file mode 100644
index 0000000000..ded3e82301
--- /dev/null
+++ b/test/files/pos/t5031_2.scala
@@ -0,0 +1,7 @@
+package object t5031 {	
+  class ID
+}
+
+package t5031 {
+  object ID
+}
-- 
cgit v1.2.3