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

command error handling

This commit is contained in:
Mark Harrah 2010-08-04 19:41:11 -04:00
parent 7390876874
commit 758380979e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/Main.scala
View File

@ -39,7 +39,12 @@ class xMain extends xsbti.AppMain
new Reboot(app.scalaProvider.version, state.commands, app.id, state.configuration.baseDirectory)
}
}
def next(state: State): State = state.process(process)
def next(state: State): State =
ErrorHandling.wideConvert { state.process(process) } match
{
case Right(s) => s
case Left(t) => Commands.handleException(t, state)
}
def process(command: String, state: State): State =
{
val in = Input(command, None)
@ -193,10 +198,17 @@ object Commands
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) => e.printStackTrace; System.err.println(e.toString); s.fail // TODO: log instead of print
case Left(e) => handleException(e, s)
}
}
def handleException(e: Throwable, s: State): State = {
// TODO: log instead of print
e.printStackTrace
System.err.println(e.toString)
s.fail
}
def runExitHooks(s: State): State = {
ExitHooks.runExitHooks(s.exitHooks.toSeq)
s.copy()(exitHooks = Set.empty)