diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2016-03-09 19:40:12 +0100 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2016-03-09 19:40:12 +0100 |
| commit | 305a9f06bd2b2ac6070beb184d61ff6db4cb9155 (patch) | |
| tree | 09820e3e17922fea5e1a8c0ff0faf3a6c5a09b9a /src | |
| parent | ff8731041a522b73fde6bddd2d7077d19d35b6b0 (diff) | |
| parent | 8c99865cecf41b844e0710620337d26838e647ef (diff) | |
| download | dotty-305a9f06bd2b2ac6070beb184d61ff6db4cb9155.tar.gz dotty-305a9f06bd2b2ac6070beb184d61ff6db4cb9155.tar.bz2 dotty-305a9f06bd2b2ac6070beb184d61ff6db4cb9155.zip | |
Merge pull request #1163 from dotty-staging/fix-#1145
Fix bug where ambiguous references were not reported
Diffstat (limited to 'src')
| -rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 84344dbb1..fdb92a40b 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -232,7 +232,8 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit } } val curImport = ctx.importInfo - if (curImport != null && curImport.isRootImport && previous.exists) return previous + if (ctx.owner.is(Package) && curImport != null && curImport.isRootImport && previous.exists) + return previous // no more conflicts possible in this case // would import of kind `prec` be not shadowed by a nested higher-precedence definition? def isPossibleImport(prec: Int) = prevPrec < prec || prevPrec == prec && (prevCtx.scope eq ctx.scope) |