From f654b036185b79bd6042f68c75a54d8a861b2cad Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 24 Jul 2011 17:36:42 -0400 Subject: [PATCH] allow running last from load failure prompt --- main/Main.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/Main.scala b/main/Main.scala index 7c51ed2bd..77142c631 100644 --- a/main/Main.scala +++ b/main/Main.scala @@ -367,7 +367,7 @@ object BuiltinCommands def loadFailed = Command.command(LoadFailed)(handleLoadFailed) @tailrec def handleLoadFailed(s: State): State = { - val result = (SimpleReader.readLine("Project loading failed: (r)etry, (q)uit, or (i)gnore? ") getOrElse Quit).toLowerCase + val result = (SimpleReader.readLine("Project loading failed: (r)etry, (q)uit, (l)ast, or (i)gnore? ") getOrElse Quit).toLowerCase def matches(s: String) = !result.isEmpty && (s startsWith result) if(result.isEmpty || matches("retry")) @@ -380,6 +380,8 @@ object BuiltinCommands logger(s).warn("Ignoring load failure: " + (if(hadPrevious) "using previously loaded project." else "no project loaded.")) s } + else if(matches("last")) + LastCommand :: LoadFailed :: s else { println("Invalid response.")