From 785b0274eeee3426b38df815df198f17a08e9a29 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 2 May 2014 18:07:05 -0400 Subject: [PATCH] some more source getting formatted --- launch/src/main/scala/xsbt/boot/Update.scala | 2 +- main/actions/src/main/scala/sbt/ForkTests.scala | 8 ++++---- main/command/src/main/scala/sbt/BasicCommands.scala | 4 ++-- main/command/src/main/scala/sbt/CommandUtil.scala | 2 +- main/settings/src/main/scala/sbt/Scope.scala | 4 ++-- main/src/main/scala/sbt/Defaults.scala | 4 ++-- main/src/main/scala/sbt/ProjectNavigation.scala | 2 +- util/process/src/main/scala/sbt/InheritInput.scala | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/launch/src/main/scala/xsbt/boot/Update.scala b/launch/src/main/scala/xsbt/boot/Update.scala index fb9f99b4b..de7e96954 100644 --- a/launch/src/main/scala/xsbt/boot/Update.scala +++ b/launch/src/main/scala/xsbt/boot/Update.scala @@ -157,7 +157,7 @@ final class Update(config: UpdateConfiguration) { val target1 = (depVersion, target) match { case (Some(dv), u: UpdateApp) => import u._; new UpdateApp(id.copy(version = new Explicit(dv)), classifiers, tpe) - case _ => target + case _ => target } setScalaVariable(settings, autoScalaVersion) retrieve(eventManager, moduleID, target1, autoScalaVersion) diff --git a/main/actions/src/main/scala/sbt/ForkTests.scala b/main/actions/src/main/scala/sbt/ForkTests.scala index c13ce1a2d..83edd7e75 100755 --- a/main/actions/src/main/scala/sbt/ForkTests.scala +++ b/main/actions/src/main/scala/sbt/ForkTests.scala @@ -112,17 +112,17 @@ private[sbt] object ForkTests { private final class React(is: ObjectInputStream, os: ObjectOutputStream, log: Logger, listeners: Seq[TestReportListener], results: mutable.Map[String, SuiteResult]) { import ForkTags._ @annotation.tailrec def react(): Unit = is.readObject match { - case `Done` => + case `Done` => os.writeObject(Done); os.flush() case Array(`Error`, s: String) => log.error(s); react() - case Array(`Warn`, s: String) => + case Array(`Warn`, s: String) => log.warn(s); react() - case Array(`Info`, s: String) => + case Array(`Info`, s: String) => log.info(s); react() case Array(`Debug`, s: String) => log.debug(s); react() - case t: Throwable => + case t: Throwable => log.trace(t); react() case Array(group: String, tEvents: Array[Event]) => listeners.foreach(_ startGroup group) diff --git a/main/command/src/main/scala/sbt/BasicCommands.scala b/main/command/src/main/scala/sbt/BasicCommands.scala index 9744d15b8..3310158b8 100644 --- a/main/command/src/main/scala/sbt/BasicCommands.scala +++ b/main/command/src/main/scala/sbt/BasicCommands.scala @@ -219,9 +219,9 @@ object BasicCommands { def runAlias(s: State, args: Option[(String, Option[Option[String]])]): State = args match { - case None => + case None => printAliases(s); s - case Some(x ~ None) if !x.isEmpty => + case Some(x ~ None) if !x.isEmpty => printAlias(s, x.trim); s case Some(name ~ Some(None)) => removeAlias(s, name.trim) case Some(name ~ Some(Some(value))) => addAlias(s, name.trim, value.trim) diff --git a/main/command/src/main/scala/sbt/CommandUtil.scala b/main/command/src/main/scala/sbt/CommandUtil.scala index 59d125267..e2bc9f945 100644 --- a/main/command/src/main/scala/sbt/CommandUtil.scala +++ b/main/command/src/main/scala/sbt/CommandUtil.scala @@ -28,7 +28,7 @@ object CommandUtil { def withAttribute[T](s: State, key: AttributeKey[T], ifMissing: String)(f: T => State): State = (s get key) match { - case None => + case None => s.log.error(ifMissing); s.fail case Some(nav) => f(nav) } diff --git a/main/settings/src/main/scala/sbt/Scope.scala b/main/settings/src/main/scala/sbt/Scope.scala index 772fff7f3..c9f0211f9 100644 --- a/main/settings/src/main/scala/sbt/Scope.scala +++ b/main/settings/src/main/scala/sbt/Scope.scala @@ -81,9 +81,9 @@ object Scope { ref match { case ThisProject | LocalRootProject => ProjectRef(current, rootProject(current)) case LocalProject(id) => ProjectRef(current, id) - case RootProject(uri) => + case RootProject(uri) => val res = resolveBuild(current, uri); ProjectRef(res, rootProject(res)) - case ProjectRef(uri, id) => ProjectRef(resolveBuild(current, uri), id) + case ProjectRef(uri, id) => ProjectRef(resolveBuild(current, uri), id) } def resolveBuildRef(current: URI, ref: BuildReference): BuildRef = ref match { diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index e15532a54..b8983d98d 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1384,10 +1384,10 @@ object Classpaths { { val ms: Seq[(String, Seq[String])] = trim(confString.split("->", 2)) match { - case x :: Nil => for (a <- parseList(x, masterConfs)) yield (a, default(a)) + case x :: Nil => for (a <- parseList(x, masterConfs)) yield (a, default(a)) case x :: y :: Nil => val target = parseList(y, depConfs); for (a <- parseList(x, masterConfs)) yield (a, target) - case _ => error("Invalid configuration '" + confString + "'") // shouldn't get here + case _ => error("Invalid configuration '" + confString + "'") // shouldn't get here } val m = ms.toMap s => m.getOrElse(s, Nil) diff --git a/main/src/main/scala/sbt/ProjectNavigation.scala b/main/src/main/scala/sbt/ProjectNavigation.scala index ecfddd47a..ef6ee2e2a 100644 --- a/main/src/main/scala/sbt/ProjectNavigation.scala +++ b/main/src/main/scala/sbt/ProjectNavigation.scala @@ -28,7 +28,7 @@ final class ProjectNavigation(s: State) { def apply(action: Option[ResolvedReference]): State = action match { - case None => + case None => show(); s case Some(BuildRef(uri)) => changeBuild(uri) case Some(ProjectRef(uri, id)) => selectProject(uri, id) diff --git a/util/process/src/main/scala/sbt/InheritInput.scala b/util/process/src/main/scala/sbt/InheritInput.scala index 9502cee49..a9828b04d 100755 --- a/util/process/src/main/scala/sbt/InheritInput.scala +++ b/util/process/src/main/scala/sbt/InheritInput.scala @@ -10,7 +10,7 @@ private[sbt] object InheritInput { def apply(p: JProcessBuilder): Boolean = (redirectInput, inherit) match { case (Some(m), Some(f)) => m.invoke(p, f); true - case _ => false + case _ => false } private[this] val pbClass = Class.forName("java.lang.ProcessBuilder")