Merge pull request #886 from dotty-staging/fix-#884

Fix #884 - misdiagnosed ambiguous definition.

Author: smarter

src/dotty/tools/dotc/typer/Typer.scala

@@ -200,7 +200,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
        */
       def isDefinedInCurrentUnit(denot: Denotation): Boolean = denot match {
         case MultiDenotation(d1, d2) => isDefinedInCurrentUnit(d1) || isDefinedInCurrentUnit(d2)
-        case denot: SingleDenotation => denot.symbol.sourceFile == ctx.source
+        case denot: SingleDenotation => denot.symbol.sourceFile == ctx.source.file
       }
 
       /** Is `denot` the denotation of a self symbol? */

test/dotc/tests.scala

@@ -77,7 +77,7 @@ class tests extends CompilerTest {
   @Test def pos_desugar() = compileFile(posDir, "desugar", twice)
   @Test def pos_sigs() = compileFile(posDir, "sigs", twice)
   @Test def pos_typers() = compileFile(posDir, "typers", twice)
-  @Test def pos_typedidents() = compileFile(posDir, "typedIdents", twice)
+  @Test def pos_typedIdents() = compileDir(posDir, "typedIdents", twice)
   @Test def pos_assignments() = compileFile(posDir, "assignments", twice)
   @Test def pos_packageobject() = compileFile(posDir, "packageobject", twice)
   @Test def pos_overloaded() = compileFile(posDir, "overloaded", twice)
@@ -103,7 +103,7 @@ class tests extends CompilerTest {
   @Test def neg_abstractOverride() = compileFile(negDir, "abstract-override", xerrors = 2)
   @Test def neg_blockescapes() = compileFile(negDir, "blockescapesNeg", xerrors = 1)
   @Test def neg_typedapply() = compileFile(negDir, "typedapply", xerrors = 4)
-  @Test def neg_typedidents() = compileFile(negDir, "typedIdents", xerrors = 2)
+  @Test def neg_typedIdents() = compileDir(negDir, "typedIdents", xerrors = 2)
   @Test def neg_assignments() = compileFile(negDir, "assignments", xerrors = 3)
   @Test def neg_typers() = compileFile(negDir, "typers", xerrors = 14)(allowDoubleBindings)
   @Test def neg_privates() = compileFile(negDir, "privates", xerrors = 2)

tests/neg/typedIdents/PQ.scala

@@ -0,0 +1,6 @@
+package P {
+  object X { val x = 1; val y = 2 }
+}
+package Q {
+  object X { val x = true; val y = "" }
+}

tests/neg/typedIdents.scala renamed to tests/neg/typedIdents/typedIdents.scala

@@ -1,9 +1,3 @@
-package P {
-  object X { val x = 1; val y = 2 }
-}
-package Q {
-  object X { val x = true; val y = "" }
-}
 package P { // `X' bound by package clause
   import Console._ // `println' bound by wildcard import
   object A {

tests/pos/i884.scala

@@ -0,0 +1,4 @@
+import scala.reflect._
+
+object `package` {
+}

tests/pos/overloadedAccess.scala

@@ -14,5 +14,4 @@ object overloadedAccess {
     val x = f("abc")
     val y: Int = x
   }
-
 }

tests/pos/typedIdents/PQ.scala

@@ -0,0 +1,6 @@
+package P {
+  object X { val x = 1; val y = 2 }
+}
+package Q {
+  object X { val x = true; val y = "" }
+}

tests/pos/typedIdents.scala renamed to tests/pos/typedIdents/typedIdents.scala

@@ -1,9 +1,3 @@
-package P {
-  object X { val x = 1; val y = 2 }
-}
-package Q {
-  object X { val x = true; val y = "" }
-}
 package P { // `X' bound by package clause
   import Console._ // `println' bound by wildcard import
   object A {