diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-08-09 16:24:26 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-08-09 16:25:08 -0700 |
| commit | daee8e25238eaef13f17c3cfd6f26263452c0a37 (patch) | |
| tree | 079679b0a0afa02285edfd963ae5f48f285496a2 | |
| parent | 86647e20f3d9ff935d1be2a2ccf04e17f852e712 (diff) | |
| download | scala-javadoc-dirty-hack.tar.gz scala-javadoc-dirty-hack.tar.bz2 scala-javadoc-dirty-hack.zip | |
Javadoc: experimental proof-of-concept hackjavadoc-dirty-hack
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index 16ef75c863..b9441a5cc4 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -1107,6 +1107,9 @@ trait Contexts { self: Analyzer => // Defined symbols take precedence over erroneous imports. else if (impSym.isError || impSym.name == nme.CONSTRUCTOR) impSym = NoSymbol + // EXTREME HACK: nested, static java classes that define same-named classes themselves + else if (unit.isJava) + defSym = NoSymbol // Otherwise they are irreconcilably ambiguous else return ambiguousDefnAndImport(defSym.alternatives.head.owner, imp1) |