Merge pull request #1308 from sbt/wip/moreformatting

some more source getting formatted

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)

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)

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)

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)
     }

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 {

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)

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)

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")