From 44784f3e41c2cc141c3eb5a0dcb656005befcfa4 Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Thu, 16 Sep 2010 19:30:30 +0000 Subject: 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 --- src/compiler/scala/tools/nsc/interactive/Global.scala | 10 +++++++--- 1 file 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 -- cgit v1.2.3