summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-07-30 17:32:53 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-07-30 17:32:53 -0700
commit04536a37dc5af56f9be269163369a4bda53131ea (patch)
tree8ecf17cb086c62025e178d12effcbdd1a6094bb2 /test/files/pos
parentf429c64601ee1c9036eafe9e7ace9b941d24ed07 (diff)
parent2a14dd2d23e78775301d38dd235873e5cddc6e23 (diff)
downloadscala-04536a37dc5af56f9be269163369a4bda53131ea.tar.gz
scala-04536a37dc5af56f9be269163369a4bda53131ea.tar.bz2
scala-04536a37dc5af56f9be269163369a4bda53131ea.zip
Merge pull request #1016 from hubertp/2.10.x-issue/5031
Fixed SI-5031. Only consider classes when looking for companion class.
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/t5031/Id.scala4
-rw-r--r--test/files/pos/t5031/package.scala3
-rw-r--r--test/files/pos/t5031_2.scala7
3 files changed, 14 insertions, 0 deletions
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
+}