diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-22 00:42:35 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-22 00:42:35 -0700 |
commit | 4dcb33e6f527f5e2bf978c9e1ca778c40bf29d54 (patch) | |
tree | 8f1558ee8d0730c371490515df214566810c4cbc /src | |
parent | d484c17dbc47559dad8a7ae544d14a285cdfb8b2 (diff) | |
parent | 9d98b6d2ad68ceefce5278f8b980d1a05b3fefd4 (diff) | |
download | scala-4dcb33e6f527f5e2bf978c9e1ca778c40bf29d54.tar.gz scala-4dcb33e6f527f5e2bf978c9e1ca778c40bf29d54.tar.bz2 scala-4dcb33e6f527f5e2bf978c9e1ca778c40bf29d54.zip |
Merge pull request #2387 from vigdorchik/interactive_scaladoc
Interactive scaladoc: demand new typer run when done.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 1f2245abb5..c63cca9b88 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -856,9 +856,9 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") /** Implements CompilerControl.askDocComment */ private[interactive] def getDocComment(sym: Symbol, source: SourceFile, site: Symbol, fragments: List[(Symbol,SourceFile)], response: Response[(String, String, Position)]) { - informIDE(s"getDocComment $sym at $source site $site") + informIDE(s"getDocComment $sym at $source, site $site") respond(response) { - withTempUnits(fragments.toList.unzip._2){ units => + withTempUnits(fragments.unzip._2){ units => for((sym, src) <- fragments) { val mirror = findMirrorSymbol(sym, units(src)) if (mirror ne NoSymbol) forceDocComment(mirror, units(src)) @@ -871,6 +871,8 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") } } } + // New typer run to remove temp units and drop per-run caches that might refer to symbols entered from temp units. + newTyperRun() } def stabilizedType(tree: Tree): Type = tree match { |