diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 3 | ||||
| -rw-r--r-- | test/files/presentation/akka.check | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 03f8e9d92e..7fea76c7b1 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -153,6 +153,7 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "") protected[interactive] def getUnit(s: SourceFile): Option[RichCompilationUnit] = { toBeRemoved.synchronized { for (f <- toBeRemoved) { + informIDE("removed: "+s) unitOfFile -= f allSources = allSources filter (_.file != f) } @@ -730,7 +731,7 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "") val originalTypeParams = sym.owner.typeParams parseAndEnter(unit) val pre = adaptToNewRunMap(ThisType(sym.owner)) - val newsym = pre.decl(sym.name) filter { alt => + val newsym = pre.typeSymbol.info.decl(sym.name) filter { alt => sym.isType || { try { val tp1 = pre.memberType(alt) onTypeError NoType diff --git a/test/files/presentation/akka.check b/test/files/presentation/akka.check index 27e6ab7248..2f7b90da96 100644 --- a/test/files/presentation/akka.check +++ b/test/files/presentation/akka.check @@ -474,7 +474,7 @@ askHyperlinkPos for `Actor` at (24,28) pi.scala askHyperlinkPos for `reply` at (36,18) pi.scala ================================================================================ -[response] found askHyperlinkPos for `reply` at <no position> ActorRef.scala +[response] found askHyperlinkPos for `reply` at (1382,7) ActorRef.scala ================================================================================ askHyperlinkPos for `nrOfResults` at (73,19) pi.scala |