Fix for SI-6340, error message regression.

3 files changed, 31 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index 62f01b8afa..161df00220 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -496,7 +496,6 @@ trait Namers extends MethodSynthesis {
             // for Java code importing Scala objects
             if (!nme.isModuleName(from) || isValid(nme.stripModuleSuffix(from))) {
               typer.TyperErrorGen.NotAMemberError(tree, expr, from)
-              typer.infer.setError(tree)
             }
           }
           // Setting the position at the import means that if there is
diff --git a/test/files/neg/t6340.check b/test/files/neg/t6340.check
new file mode 100644
index 0000000000..f18b8c3f4b
--- /dev/null
+++ b/test/files/neg/t6340.check
@@ -0,0 +1,10 @@
+t6340.scala:11: error: value D is not a member of object Foo
+  import Foo.{ A, B, C, D, E, X, Y, Z }
+         ^
+t6340.scala:16: error: not found: type D
+  val d = new D
+              ^
+t6340.scala:17: error: not found: type W
+  val w = new W
+              ^
+three errors found
diff --git a/test/files/neg/t6340.scala b/test/files/neg/t6340.scala
new file mode 100644
index 0000000000..8934d5c15d
--- /dev/null
+++ b/test/files/neg/t6340.scala
@@ -0,0 +1,21 @@
+object Foo {
+  class A
+  class B
+  class C
+  class X
+  class Y
+  class Z
+}
+
+object Test {
+  import Foo.{ A, B, C, D, E, X, Y, Z }
+
+  val a = new A
+  val b = new B
+  val c = new C
+  val d = new D
+  val w = new W
+  val x = new X
+  val y = new Y
+  val z = new Z
+}