Merge pull request #966 from paulp/issue/6117

SI-6117 regression involving import ambiguity. 

1 files changed, 19 insertions, 0 deletions

diff --git a/test/files/pos/t6117.scala b/test/files/pos/t6117.scala
new file mode 100644
index 0000000000..6aca84f72c
--- /dev/null
+++ b/test/files/pos/t6117.scala
@@ -0,0 +1,19 @@
+package test
+
+trait ImportMe {
+  def foo(i: Int) = 1
+  def foo(s: String) = 2
+}
+
+class Test(val importMe: ImportMe) {
+  import importMe._
+  import importMe._
+
+  // A.scala:12: error: reference to foo is ambiguous;
+  // it is imported twice in the same scope by
+  // import importMe._
+  // and import importMe._
+  //   println(foo(1))
+  //           ^
+  println(foo(1))
+}