scala/scala — pull request #1481 by odersky (2012-10-09 17:07:22+00:00)
Title: Proposed fix for SI-6490.

Issues a "companions must be in same file" error only if both class and module exist. This can certainly do no harm. I believe it should adress SI-6490, but, lacking a test case, I don't have evidence for that.

Review by @paulp @dragos