Upgrade to scalafmt 0.6.2 (#89)

build.sbt

@@ -36,9 +36,9 @@ lazy val gitPushTag = taskKey[Unit]("Push to git tag")
 lazy val release = Command.command("release") { s =>
  "clean" ::
  "very publishSigned" ::
-  "sonatypeRelease" ::
-  "gitPushTag" ::
-  s
+ "sonatypeRelease" ::
+ "gitPushTag" ::
+ s
 }
 
 commands += release

core/src/main/scala/scalafix/rewrite/package.scala

@@ -5,8 +5,8 @@ import scalafix.util.Patch
 
 package object rewrite {
  type ScalafixRewrite = Rewrite[ScalafixMirror]
- val ScalafixRewrite: (RewriteCtx[ScalafixMirror] => Seq[Patch]) => Rewrite[
- ScalafixMirror] =
+ val ScalafixRewrite
+ : (RewriteCtx[ScalafixMirror] => Seq[Patch]) => Rewrite[ScalafixMirror] =
  Rewrite.apply[ScalafixMirror]
  type ScalafixCtx = RewriteCtx[ScalafixMirror]
  type SyntaxRewrite = Rewrite[Any]

core/src/main/scala/scalafix/util/CanonicalImport.scala

@@ -22,7 +22,7 @@ object CanonicalImport {
  renames,
  leadingComments = ctx.comments.leading(ownerImport),
  trailingComments = ctx.comments.trailing(ownerImport) ++
-  (wildcard +: unimports).flatMap(ctx.comments.trailing),
+ (wildcard +: unimports).flatMap(ctx.comments.trailing),
  None
  ) {}
  def fromImportee(ref: Term.Ref, importee: Importee)(
@@ -36,7 +36,7 @@ object CanonicalImport {
  Nil,
  leadingComments = ctx.comments.leading(ownerImport),
  trailingComments = ctx.comments.trailing(ownerImport) ++
-  ctx.comments.trailing(importee),
+ ctx.comments.trailing(importee),
  None
  ) {}
 }

core/src/main/scala/scalafix/util/Replacer.scala

@@ -39,9 +39,10 @@ private[this] class Replacer(implicit ctx: RewriteCtx[Mirror]) {
  x.from == symbol
  }
  .toList
- .flatMap(replace =>
- TokenPatch.AddLeft(ref.tokens.head, replace.to.syntax) +:
- (ref.tokens.map(TokenPatch.Remove.apply) ++
+ .flatMap(
+ replace =>
+ TokenPatch.AddLeft(ref.tokens.head, replace.to.syntax) +:
+ (ref.tokens.map(TokenPatch.Remove.apply) ++
  replace.additionalImports.map(x => AddGlobalImport(x))))
  case imp: Import => // Do nothing
  case _ => super.apply(tree)

scalafix-nsc/src/main/scala/scalafix/nsc/HijackImportInfos.scala

@@ -4,11 +4,11 @@ import scala.language.higherKinds
 import scala.tools.nsc.typechecker.Contexts
 
 trait HijackImportInfos { self: ReflectToolkit =>
- val allUsedSelectors: NonRemovableMap[g.analyzer.ImportInfo,
-   Set[g.ImportSelector]] =
+ val allUsedSelectors
+ : NonRemovableMap[g.analyzer.ImportInfo, Set[g.ImportSelector]] =
  new NonRemovableMap[g.analyzer.ImportInfo, Set[g.ImportSelector]](Set())
- val allImportInfos: NonRemovableMap[g.CompilationUnit,
-   List[g.analyzer.ImportInfo]] =
+ val allImportInfos
+ : NonRemovableMap[g.CompilationUnit, List[g.analyzer.ImportInfo]] =
  new NonRemovableMap[g.CompilationUnit, List[g.analyzer.ImportInfo]](Nil)
 
  /** overrides private lazy maps in g.analyzer's Contexts with custom maps */

scalafix-sbt/src/main/scala/scalafix/sbt/ScalafixPlugin.scala

@@ -65,9 +65,9 @@ object ScalafixPlugin extends AutoPlugin with ScalafixKeys {
  val scalafix: Command = Command.command("scalafix") { state =>
  s"set scalafixEnabled in Global := true" ::
  "clean" ::
-  "test:compile" ::
-  s"set scalafixEnabled in Global := false" ::
-  state
+ "test:compile" ::
+ s"set scalafixEnabled in Global := false" ::
+ state
  }
 
  override def globalSettings: Seq[Def.Setting[_]] = Seq(

scalafix-sbt/src/test-project-template/project/ScalafixTestUtility.scala

@@ -8,14 +8,19 @@ object ScalafixTestUtility {
  private def calcDiff(expected: String, obtained: String): Option[String] = {
  import scala.collection.JavaConverters._
 
- if (expected == obtained) None else {
+ if (expected == obtained) None
+ else {
  def jLinesOf(s: String) = s.lines.toSeq.asJava
 
  val expectedLines = jLinesOf(expected)
  val obtainedLines = jLinesOf(obtained)
 
  val diff = DiffUtils.diff(expectedLines, obtainedLines)
- val unifiedDiff = DiffUtils.generateUnifiedDiff("expected", "obtained", expectedLines, diff, 1)
+ val unifiedDiff = DiffUtils.generateUnifiedDiff("expected",
+ "obtained",
+ expectedLines,
+ diff,
+ 1)
 
  Some(unifiedDiff.asScala.drop(3).mkString("\n"))
  }
@@ -33,25 +38,27 @@ object ScalafixTestUtility {
  ))
  ).trim
 
- calcDiff(expected, obtained).map { diff =>
- val msg =
- s"""File: $file
- |Obtained output:
- |----------------
- |$obtained
- |Expected:
- |---------
- |$expected
- |Diff:
- |-----
- |$diff""".stripMargin
-
- streams.log.error(file)
- streams.log.error(msg)
- false
- }.getOrElse {
- streams.log.success(file)
- true
- }
+ calcDiff(expected, obtained)
+ .map { diff =>
+ val msg =
+ s"""File: $file
+ |Obtained output:
+ |----------------
+ |$obtained
+ |Expected:
+ |---------
+ |$expected
+ |Diff:
+ |-----
+ |$diff""".stripMargin
+
+ streams.log.error(file)
+ streams.log.error(msg)
+ false
+ }
+ .getOrElse {
+ streams.log.success(file)
+ true
+ }
  }
 }

scalafix-tests/src/test/scala/scalafix/tests/IntegrationPropertyTest.scala

@@ -77,9 +77,9 @@ abstract class IntegrationPropertyTest(t: ItTest, skip: Boolean = false)
  val id = s"${t.name}/$cmd"
  logger.info(s"Running $id")
  val args = Seq(
-  "sbt",
-  "++2.11.8"
-  ) ++ cmds.map(_.toString)
+ "sbt",
+ "++2.11.8"
+ ) ++ cmds.map(_.toString)
  failAfter(maxTime) {
  import sys.process._
  val status = Process(args, cwd = t.workingPath.toIO).!