diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-06 12:16:14 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-06 12:16:14 +0100 |
| commit | 2ea8aad5bc63582b563bb999c96e980597a84084 (patch) | |
| tree | bd1542c3e653ef13304624a23cbc6d1ee1b09633 /src/interactive/scala/tools/nsc/interactive/REPL.scala | |
| parent | e0c2c14cd80fffa3f8af0836e55a5b8ca8c53d27 (diff) | |
| parent | 7d4109486b2266f8491d3473f43555dec6e996ee (diff) | |
| download | scala-2ea8aad5bc63582b563bb999c96e980597a84084.tar.gz scala-2ea8aad5bc63582b563bb999c96e980597a84084.tar.bz2 scala-2ea8aad5bc63582b563bb999c96e980597a84084.zip | |
Merge commit '7d41094' into merge/2.10.x-and-pr-3209-to-master
Conflicts:
src/interactive/scala/tools/nsc/interactive/CompilerControl.scala
Diffstat (limited to 'src/interactive/scala/tools/nsc/interactive/REPL.scala')
| -rw-r--r-- | src/interactive/scala/tools/nsc/interactive/REPL.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/REPL.scala b/src/interactive/scala/tools/nsc/interactive/REPL.scala index 8e9b0ceee0..ffa61b0524 100644 --- a/src/interactive/scala/tools/nsc/interactive/REPL.scala +++ b/src/interactive/scala/tools/nsc/interactive/REPL.scala @@ -118,7 +118,7 @@ object REPL { comp.askReload(List(toSourceFile(file)), reloadResult) Thread.sleep(millis.toLong) println("ask type now") - comp.askLoadedTyped(toSourceFile(file), typedResult) + comp.askLoadedTyped(toSourceFile(file), keepLoaded = true, typedResult) typedResult.get case List("typeat", file, off1, off2) => doTypeAt(makePos(file, off1, off2)) |