Skip to content

Commit 28e0e18

Browse files
committed
Merge pull request scala#5216 from adriaanm/2.12.x
Merge 2.11.x into 2.12.x for the fix for SI-7898
2 parents 34dbd39 + cc6a251 commit 28e0e18

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/repl/scala/tools/nsc/interpreter/ILoop.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,10 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
966966

967967
// while we go fire up the REPL
968968
try {
969-
createInterpreter()
969+
// don't allow ancient sbt to hijack the reader
970+
savingReader {
971+
createInterpreter()
972+
}
970973
intp.initializeSynchronous()
971974
globalFuture = Future successful true
972975
if (intp.reporter.hasErrors) {

0 commit comments

Comments
 (0)