diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-06-05 20:24:22 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-06-05 20:24:22 -0700 |
| commit | cc6a25114fa85f928d3da604837a57511fc1b6da (patch) | |
| tree | 853f6c07b74da4200ad934ceff87db7ae39c557f /src/repl/scala/tools/nsc | |
| parent | af93c7a147156f69cad78cc80a36aeaeb89cbe0c (diff) | |
| parent | 650fbee7855c7162bf3cf23cb8340704274834d9 (diff) | |
| download | scala-cc6a25114fa85f928d3da604837a57511fc1b6da.tar.gz scala-cc6a25114fa85f928d3da604837a57511fc1b6da.tar.bz2 scala-cc6a25114fa85f928d3da604837a57511fc1b6da.zip | |
Merge branch '2.11.x' into 2.12.x
Diffstat (limited to 'src/repl/scala/tools/nsc')
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/ILoop.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala index 66a5f08e96..ea6ab6aad5 100644 --- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala @@ -966,7 +966,10 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) // while we go fire up the REPL try { - createInterpreter() + // don't allow ancient sbt to hijack the reader + savingReader { + createInterpreter() + } intp.initializeSynchronous() globalFuture = Future successful true if (intp.reporter.hasErrors) { |