diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2012-05-21 00:04:52 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2012-05-21 00:04:52 +0200 |
| commit | 03e6d929ee639de292daa778dde514e1b7014eac (patch) | |
| tree | 0023a804cfc04aa5c429cb26e55b28e933118c19 /src | |
| parent | 1f5584fbe183041d4af269278f0125e2f0b94a44 (diff) | |
| download | scala-03e6d929ee639de292daa778dde514e1b7014eac.tar.gz scala-03e6d929ee639de292daa778dde514e1b7014eac.tar.bz2 scala-03e6d929ee639de292daa778dde514e1b7014eac.zip | |
Consider method-scoped companions in the implicit scope.
Fixes SI-4975.
I'll reproduce a relevant snippet of dialogue from Namers#companionSymbolOf:
/** The companion class or companion module of `original`.
* Calling .companionModule does not work for classes defined inside methods.
*
* !!! Then why don't we fix companionModule? Does the presence of these
* methods imply all the places in the compiler calling sym.companionModule are
* bugs waiting to be reported? If not, why not? When exactly do we need to
* call this method?
*/
def companionSymbolOf(original: Symbol, ctx: Context): Symbol = {
This was one such bug.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 8f025336bb..9d33f3d828 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -929,7 +929,7 @@ trait Implicits { } case None => if (pre.isStable) { - val companion = sym.companionModule + val companion = companionSymbolOf(sym, context) companion.moduleClass match { case mc: ModuleClassSymbol => val infos = |