diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-08-09 16:18:16 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-08-13 13:25:34 +1000 |
| commit | 4e822d74be9c21377189428ca474ec990af6cc87 (patch) | |
| tree | c7fc4bcb478cf6d1838b5807a720f33a73768aba /src/compiler/scala/tools/nsc/typechecker/Contexts.scala | |
| parent | 4b77734b28f82e2573446bd997e739b80de4af1d (diff) | |
| download | scala-4e822d74be9c21377189428ca474ec990af6cc87.tar.gz scala-4e822d74be9c21377189428ca474ec990af6cc87.tar.bz2 scala-4e822d74be9c21377189428ca474ec990af6cc87.zip | |
Javadoc: java static name resolution
[Jakob Odersky <jodersky@gmail.com>: remove obsolete comments and fix tests]
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index 16ef75c863..c73ea54c3d 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -1016,7 +1016,16 @@ trait Contexts { self: Analyzer => || unit.exists && s.sourceFile != unit.source.file ) ) - def lookupInPrefix(name: Name) = pre member name filter qualifies + def lookupInPrefix(name: Name) = { + val sym = pre.member(name).filter(qualifies) + def isNonPackageNoModuleClass(sym: Symbol) = + sym.isClass && !sym.isModuleClass && !sym.isPackageClass + if (!sym.exists && unit.isJava && isNonPackageNoModuleClass(pre.typeSymbol)) { + // TODO factor out duplication with Typer::inCompanionForJavaStatic + val pre1 = companionSymbolOf(pre.typeSymbol, this).typeOfThis + pre1.member(name).filter(qualifies).andAlso(_ => pre = pre1) + } else sym + } def accessibleInPrefix(s: Symbol) = isAccessible(s, pre, superAccess = false) def searchPrefix = { |