luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small cleanups to exception handling

This commit is contained in:
Mark Harrah 2010-08-10 08:46:27 -04:00
parent 371a66bc3f
commit fe224479bc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main/Main.scala
View File

@ -216,20 +216,23 @@ object Commands
}
def compile = Command.simple(Compile, CompileBrief, CompileDetailed ) { (in, s) =>
val command = Parse.compile(in.arguments)(s.baseDir)
val analysis = Build.compile(command, s.configuration)
s.copy(project = analysis)()
try {
val analysis = Build.compile(command, s.configuration)
s.copy(project = analysis)()
} catch { case e: xsbti.CompileFailed => s.fail /* already logged */ }
}
def load = Command.simple(Load, Parse.helpBrief(Load, LoadLabel), Parse.helpDetail(Load, LoadLabel, false) ) { (in, s) =>
loadCommand(in.arguments, s.configuration, false, "sbt.Project") match // TODO: classOf[Project].getName when ready
{
case Right(Seq(newValue)) => runExitHooks(s).copy(project = newValue)()
case Left(e) => handleException(e, s)
case Left(e) => handleException(e, s, false)
}
}
def handleException(e: Throwable, s: State): State = {
def handleException(e: Throwable, s: State, trace: Boolean = true): State = {
// TODO: log instead of print
e.printStackTrace
if(trace)
e.printStackTrace
System.err.println(e.toString)
s.fail
}
@ -254,7 +257,7 @@ object Commands
case x => error("Not an instance of CommandDefinitions: " + x.asInstanceOf[AnyRef].getClass)
}
s.copy()(processors = asCommands ++ s.processors)
case Left(e) => e.printStackTrace; System.err.println(e.toString); s.fail // TODO: log instead of print
case Left(e) => handleException(e, s, false)
}
def loadCommand(line: String, configuration: xsbti.AppConfiguration, allowMultiple: Boolean, defaultSuper: String): Either[Throwable, Seq[Any]] =