diff options
| author | Eugene Vigdorchik <eugenevigdorchik@epfl.ch> | 2010-09-16 19:30:30 +0000 |
|---|---|---|
| committer | Eugene Vigdorchik <eugenevigdorchik@epfl.ch> | 2010-09-16 19:30:30 +0000 |
| commit | 44784f3e41c2cc141c3eb5a0dcb656005befcfa4 (patch) | |
| tree | c14282566a301b4acb87f7e9ce74117c3df975a9 /src | |
| parent | d505a106f8e77cc54903ac6216a64b2a19db551b (diff) | |
| download | scala-44784f3e41c2cc141c3eb5a0dcb656005befcfa4.tar.gz scala-44784f3e41c2cc141c3eb5a0dcb656005befcfa4.tar.bz2 scala-44784f3e41c2cc141c3eb5a0dcb656005befcfa4.zip | |
include all symbols from enclosing scopes as we...
include all symbols from enclosing scopes as well as member of enclosing
class chain. review by odersky
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 1f90d6c061..454aa5d701 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -438,11 +438,15 @@ self => while (cx != NoContext) { for (sym <- cx.scope) addScopeMember(sym, NoPrefix, EmptyTree) - cx = cx.enclClass + cx = cx.outer + } + + cx = context.enclClass + while (cx != NoContext) { val pre = cx.prefix for (sym <- pre.members) - addScopeMember(sym, pre, EmptyTree) - cx = cx.outer + addScopeMember(sym, pre, EmptyTree) + cx = cx.outer.enclClass } for (imp <- context.imports) { val pre = imp.qual.tpe |