diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 9e61e880c3..f89001c1fe 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -409,7 +409,7 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "") // ensure all loaded units are parsed for (s <- allSources; unit <- getUnit(s)) { - checkForMoreWork(NoPosition) + // checkForMoreWork(NoPosition) // disabled, as any work done here would be in an inconsistent state if (!unit.isUpToDate && unit.status != JustParsed) reset(unit) // reparse previously typechecked units. parseAndEnter(unit) serviceParsedEntered() @@ -609,7 +609,7 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "") debugLog("at pos "+pos+" was found: "+tree.getClass+" "+tree.pos.show) tree match { case Import(expr, _) => - debugLog("import found"+expr.tpe+" "+expr.tpe.members) + debugLog("import found"+expr.tpe+(if (expr.tpe == null) "" else " "+expr.tpe.members)) case _ => } if (stabilizedType(tree) ne null) { |