diff options
author | Paul Phillips <paulp@improving.org> | 2013-06-08 02:29:32 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-06-08 02:29:32 -0700 |
commit | 04837e710552cc53b0b06b2bc47ee7d2856ae230 (patch) | |
tree | 935040ee5b99f636dbe5b85a8775e043ebf51522 | |
parent | 800a17d9c22631dc2cd1a217486832e6aca1ea89 (diff) | |
parent | b42bb1808979c714fd80d4ecee0b8e497ea687a3 (diff) | |
download | scala-04837e710552cc53b0b06b2bc47ee7d2856ae230.tar.gz scala-04837e710552cc53b0b06b2bc47ee7d2856ae230.tar.bz2 scala-04837e710552cc53b0b06b2bc47ee7d2856ae230.zip |
Merge pull request #2627 from retronym/ticket/7418
SI-7418 Avoid concurrent use of compiler in REPL startup
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/ILoop.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala index 9f841f2c44..8ec8b2ed5f 100644 --- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala @@ -642,10 +642,6 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) } private def loopPostInit() { - in match { - case x: JLineReader => x.consoleReader.postInit - case _ => - } // Bind intp somewhere out of the regular namespace where // we can get at it in generated code. intp.quietBind(NamedParam[IMain]("$intp", intp)(tagOfIMain, classTag[IMain])) @@ -661,6 +657,11 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) unleashAndSetPhase() asyncMessage(power.banner) } + // SI-7418 Now, and only now, can we enable TAB completion. + in match { + case x: JLineReader => x.consoleReader.postInit + case _ => + } } def process(settings: Settings): Boolean = savingContextLoader { this.settings = settings |