diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-07-30 17:32:53 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-07-30 17:32:53 -0700 |
| commit | 04536a37dc5af56f9be269163369a4bda53131ea (patch) | |
| tree | 8ecf17cb086c62025e178d12effcbdd1a6094bb2 /test/files/neg | |
| parent | f429c64601ee1c9036eafe9e7ace9b941d24ed07 (diff) | |
| parent | 2a14dd2d23e78775301d38dd235873e5cddc6e23 (diff) | |
| download | scala-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/neg')
| -rw-r--r-- | test/files/neg/t5031.check | 5 | ||||
| -rw-r--r-- | test/files/neg/t5031/Id.scala | 4 | ||||
| -rw-r--r-- | test/files/neg/t5031/package.scala | 3 |
3 files changed, 12 insertions, 0 deletions
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 +} |