From 49b85384e7e93717881dbb8fd1fda858c22c736a Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 19 Aug 2011 22:13:56 -0400 Subject: [PATCH] use -Yrepl-sync for console-project to avoid deadlock on REPL startup in 2.9 --- main/ConsoleProject.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/ConsoleProject.scala b/main/ConsoleProject.scala index 7c0688c73..8f999cb9d 100644 --- a/main/ConsoleProject.scala +++ b/main/ConsoleProject.scala @@ -8,7 +8,7 @@ package sbt object ConsoleProject { - def apply(state: State, extra: String)(implicit log: Logger) + def apply(state: State, extra: String, options: Seq[String] = "-Yrepl-sync" :: Nil)(implicit log: Logger) { val extracted = Project extract state val bindings = ("currentState" -> state) :: ("extracted" -> extracted ) :: Nil @@ -17,6 +17,6 @@ object ConsoleProject val imports = Load.getImports(unit.unit) ++ Load.importAll(bindings.map(_._1)) val importString = imports.mkString("", ";\n", ";\n\n") val initCommands = importString + extra - (new Console(compiler))(unit.classpath, Nil, initCommands)(Some(unit.loader), bindings) + (new Console(compiler))(unit.classpath, options, initCommands)(Some(unit.loader), bindings) } }