diff options
author | Paul Phillips <paulp@improving.org> | 2013-05-02 14:08:32 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-05-02 14:08:32 -0700 |
commit | 4a627e7f279231853f361bbd31032642eabe565c (patch) | |
tree | 7e753dd628070da1fe43e12ed68ab948a2fbeb82 /src/interactive | |
parent | 13cf0481d2f584e464216b59eb73e33881d91bc6 (diff) | |
parent | 49f50727944a478bc5d10ad0658437286f47e422 (diff) | |
download | scala-4a627e7f279231853f361bbd31032642eabe565c.tar.gz scala-4a627e7f279231853f361bbd31032642eabe565c.tar.bz2 scala-4a627e7f279231853f361bbd31032642eabe565c.zip |
Merge pull request #2483 from adriaanm/merge-2.10.x
Merge 2.10.x
Diffstat (limited to 'src/interactive')
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Global.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala index b6f4779bc4..c9b4603d74 100644 --- a/src/interactive/scala/tools/nsc/interactive/Global.scala +++ b/src/interactive/scala/tools/nsc/interactive/Global.scala @@ -905,9 +905,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)) @@ -920,6 +920,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 { |