From bcd3796ca3f9d8185f668a627a83724e721ef2aa Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Thu, 9 May 2019 18:53:31 +0200
Subject: [PATCH 1/2] Add test

---
 tests/neg/module-class-name.scala | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tests/neg/module-class-name.scala

diff --git a/tests/neg/module-class-name.scala b/tests/neg/module-class-name.scala
new file mode 100644
index 000000000000..e4bf6c0f4e98
--- /dev/null
+++ b/tests/neg/module-class-name.scala
@@ -0,0 +1,16 @@
+object Test {
+  class C
+  object C
+
+  def f[T](x: T): T = x
+
+  val x: C = C    // error: Found:    Test.C.type
+
+  val y: C = f(C) // error: Found:    Test.C.type
+
+  def z = f(C)
+  val z1: C = z    // error: Found:    object Test.C
+  val z2: Int = z  // error: Found:    object Test.C
+
+  C.foo  // error: value foo is not a member of object Test.C
+}

From 4d8de4e0b4f12636fcbe58e42065f8c574bb73c6 Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Fri, 10 May 2019 14:31:25 +0200
Subject: [PATCH 2/2] Add checkfile

---
 tests/neg/module-class-name.check | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tests/neg/module-class-name.check

diff --git a/tests/neg/module-class-name.check b/tests/neg/module-class-name.check
new file mode 100644
index 000000000000..a0a8dee0dc68
--- /dev/null
+++ b/tests/neg/module-class-name.check
@@ -0,0 +1,14 @@
+[287..289..292] in module-class-name.scala
+value foo is not a member of object Test.C
+[247..248] in module-class-name.scala
+Found:    object Test.C
+Required: Int
+[192..193] in module-class-name.scala
+Found:    object Test.C
+Required: Test.C
+[127..128] in module-class-name.scala
+Found:    Test.C.type
+Required: Test.C
+[74..75] in module-class-name.scala
+Found:    Test.C.type
+Required: Test.C