From b80f27780458da880d47392e4ac747d196af355e Mon Sep 17 00:00:00 2001 From: Hubert Plociniczak Date: Tue, 2 Nov 2010 00:15:06 +0000 Subject: Don't crash the compiler for the 'companions in... Don't crash the compiler for the 'companions in different files' error. This turned out to be pretty bad for the presentation compiler. References #1286. Review by extempore --- test/files/neg/bug1286.check | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'test/files/neg') diff --git a/test/files/neg/bug1286.check b/test/files/neg/bug1286.check index 9bf63252cc..734964e9cf 100644 --- a/test/files/neg/bug1286.check +++ b/test/files/neg/bug1286.check @@ -1,2 +1,7 @@ -error: fatal error: Companions 'object Foo' and 'trait Foo' must be defined in same file. -one error found +a.scala:1: error: Companions 'object Foo' and 'trait Foo' must be defined in same file +trait Foo { + ^ +b.scala:1: error: Companions 'trait Foo' and 'object Foo' must be defined in same file +object Foo extends Foo { + ^ +two errors found -- cgit v1.2.3