diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-06-05 20:20:12 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-06-05 20:20:12 -0700 |
| commit | 650fbee7855c7162bf3cf23cb8340704274834d9 (patch) | |
| tree | 7613eba4f7c325d8aa81b5757dc6dc78c2f1abdd | |
| parent | 90215ce2b9cb99b5dea7c0ef474eea50755c0a40 (diff) | |
| parent | fcf17beee7304928cb97c4902a2e2833091d3a8f (diff) | |
| download | scala-650fbee7855c7162bf3cf23cb8340704274834d9.tar.gz scala-650fbee7855c7162bf3cf23cb8340704274834d9.tar.bz2 scala-650fbee7855c7162bf3cf23cb8340704274834d9.zip | |
Merge pull request #5214 from som-snytt/issue/7898-sbt
SI-7898 Preserve reader against subversion
| -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 7dab371caf..b086b2181e 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) { |