Merge pull request #1380 from olafurpg/upgrade-fmt

Upgrade to latest scalafmt.

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=1.6.0-RC4
+version=2.0.0-RC5
 project.git = true
 project.excludeFilters = [
   scalafmt-benchmarks/src/resources,

project/plugins.sbt

@@ -9,7 +9,8 @@ addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.6.0-RC4")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.2")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
 addSbtPlugin(
-  "io.get-coursier" % "sbt-coursier" % coursier.util.Properties.version)
+  "io.get-coursier" % "sbt-coursier" % coursier.util.Properties.version
+)
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.4")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")

readme/src/main/scala/org/scalafmt/readme/Adopters.scala

@@ -5,7 +5,8 @@ import scalatags.Text.TypedTag
 case class Adopter(
     name: String,
     url: String,
-    description: Option[String] = None) {
+    description: Option[String] = None
+) {
   import scalatags.Text.all._
   def bullet: TypedTag[String] = li(
     a(href := url, name),
@@ -18,56 +19,69 @@ object Adopters {
     Adopter(
       "scalafmt",
       "http://scalafmt.org",
-      Some("Code formatter for Scala")),
+      Some("Code formatter for Scala")
+    ),
     Adopter(
       "sbt",
       "https://github.com/sbt/sbt",
-      Some("The interactive build tool for Scala")),
+      Some("The interactive build tool for Scala")
+    ),
     Adopter(
       "scala-native",
       "https://github.com/scala-native/scala-native",
-      Some("Your favourite language gets closer to bare metal.")),
+      Some("Your favourite language gets closer to bare metal.")
+    ),
     Adopter("HERE", "http://here.com", None),
     Adopter("Letgo", "http://letgo.com", None),
     Adopter(
       "Seventh Sense",
       "http://7thsense.io",
-      Some("Predictive analytics for sales and marketing")),
+      Some("Predictive analytics for sales and marketing")
+    ),
     Adopter(
       "Teralytics",
       "http://teralytics.net",
-      Some("We transform raw, human activity data into valuable insights.")),
+      Some("We transform raw, human activity data into valuable insights.")
+    ),
     Adopter(
       "Venatus Media",
       "https://venatusmedia.com",
       Some(
-        "We represent some of the largest entertainment publishers and monetize billions of ads.")),
+        "We represent some of the largest entertainment publishers and monetize billions of ads."
+      )
+    ),
     Adopter(
       "http4s",
       "http://http4s.org",
-      Some("A minimal, idiomatic Scala interface for HTTP")),
+      Some("A minimal, idiomatic Scala interface for HTTP")
+    ),
     Adopter(
       "Mendix",
       "https://mendix.com",
       Some(
-        "The fastest and easiest platform to create and continuously improve mobile and web apps at scale.")),
+        "The fastest and easiest platform to create and continuously improve mobile and web apps at scale."
+      )
+    ),
     Adopter(
       "Foursquare",
       "https://enterprise.foursquare.com",
       Some(
-        "We use location intelligence to build meaningful consumer experiences and business solutions.")
+        "We use location intelligence to build meaningful consumer experiences and business solutions."
+      )
     ),
     Adopter(
       "Codacy",
       "https://codacy.com",
       Some(
-        "Codacy is an Automated Code Review Tool that monitors your technical debt, helps you improve your code quality, teaches best practices to your developers, and helps you save time in Code Reviews.")
+        "Codacy is an Automated Code Review Tool that monitors your technical debt, helps you improve your code quality, teaches best practices to your developers, and helps you save time in Code Reviews."
+      )
     ),
     Adopter(
       "ZyseMe",
       "https://www.zyse.me/",
       Some(
-        "We use ML to predict body measurements and automate pattern creation to integrate with production, allowing companies to produce and/or sell made-to-measure garments at scale.")
+        "We use ML to predict body measurements and automate pattern creation to integrate with production, allowing companies to produce and/or sell made-to-measure garments at scale."
+      )
     )
   )
 }

readme/src/main/scala/org/scalafmt/readme/Readme.scala

@@ -121,11 +121,13 @@ object Readme {
 
   def configurationBlock(
       style: ScalafmtConfig,
-      collapsed: Boolean = false): TypedTag[String] = {
+      collapsed: Boolean = false
+  ): TypedTag[String] = {
     div(
       span(
         "Show/hide configuration used for this example",
-        `class` := "scalafmt-configuration-toggle"),
+        `class` := "scalafmt-configuration-toggle"
+      ),
       pre(changedConfig(style)),
       `class` := {
         "scalafmt-configuration" + (
@@ -143,8 +145,10 @@ object Readme {
         List(
           div(hl.scala(code), `class` := "before"),
           div(hl.scala(formatted), `class` := "after")
-        )),
-      configurationBlock(style))
+        )
+      ),
+      configurationBlock(style)
+    )
   }
 
   def demoStyle(style: ScalafmtConfig)(code: String): TypedTag[String] = {
@@ -166,7 +170,9 @@ object Readme {
         code,
         ScalafmtConfig.default40.copy(
           align =
-            ScalafmtConfig.default40.align.copy(tokens = AlignToken.default)))
+            ScalafmtConfig.default40.align.copy(tokens = AlignToken.default)
+        )
+      )
       .get
     hl.scala(formatted)
   }
@@ -178,13 +184,15 @@ object Readme {
     ScalafmtConfig.default.copy(
       rewrite = ScalafmtConfig.default.rewrite.copy(
         rules = Seq(AvoidInfix)
-      ))
+      )
+    )
 
   val rewriteImportSelectors =
     ScalafmtConfig.default.copy(
       rewrite = ScalafmtConfig.default.rewrite.copy(
         rules = Seq(ExpandImportSelectors)
-      ))
+      )
+    )
 
   val rewriteBraces =
     ScalafmtConfig.default.copy(
@@ -193,31 +201,36 @@ object Readme {
           stringInterpolation = true
         ),
         rules = Seq(RedundantBraces)
-      ))
+      )
+    )
 
   val rewriteParens =
     ScalafmtConfig.default.copy(
       rewrite = ScalafmtConfig.default.rewrite.copy(
         rules = Seq(RedundantParens)
-      ))
+      )
+    )
 
   val rewriteImports =
     ScalafmtConfig.default.copy(
       rewrite = ScalafmtConfig.default.rewrite.copy(
         rules = Seq(SortImports)
-      ))
+      )
+    )
 
   val rewriteAsciiImports =
     ScalafmtConfig.default.copy(
       rewrite = ScalafmtConfig.default.rewrite.copy(
         rules = Seq(AsciiSortImports)
-      ))
+      )
+    )
 
   val rewriteSortModifiers =
     ScalafmtConfig.default120.copy(
       rewrite = ScalafmtConfig.default.rewrite.copy(
         rules = Seq(SortModifiers)
-      ))
+      )
+    )
 
   /**
     * This looks way too hacky. But can't seem to find a typeclass
@@ -241,7 +254,8 @@ object Readme {
     ScalafmtConfig.default.copy(
       rewrite = ScalafmtConfig.default.rewrite.copy(
         rules = Seq(PreferCurlyFors)
-      ))
+      )
+    )
 
   val verticalAlign = ScalafmtConfig.default.copy(
     maxColumn = 60,
@@ -250,9 +264,10 @@ object Readme {
 
   val VerticalMultilineDefultConfigStr = Conf.printHocon(
     Conf.Obj(
-      "verticalMultiline" -> ConfEncoder[VerticalMultiline].write(
-        ScalafmtConfig.default.verticalMultiline)
-    ))
+      "verticalMultiline" -> ConfEncoder[VerticalMultiline]
+        .write(ScalafmtConfig.default.verticalMultiline)
+    )
+  )
 
   val verticalAlignImplicitBefore = ScalafmtConfig.default.copy(
     maxColumn = 60,
@@ -317,7 +332,8 @@ object Readme {
   val alignMost = ScalafmtConfig.default.copy(align = Align.most)
   val alignCaseArrow = ScalafmtConfig.default
   val alignArrowEnum = ScalafmtConfig.defaultWithAlign.copy(
-    align = Align.default.copy(arrowEnumeratorGenerator = true))
+    align = Align.default.copy(arrowEnumeratorGenerator = true)
+  )
   val alignModuleId = ScalafmtConfig.defaultWithAlign
 
   def format(style: ScalafmtConfig)(code: String): TypedTag[String] = {

scalafmt-benchmarks/src/main/scala/org/scalafmt/benchmarks/MacroBenchmark.scala

@@ -31,7 +31,8 @@ trait FormatBenchmark {
           rewrite = RewriteSettings(
             rules = Seq(SortImports, RedundantBraces)
           )
-        ))
+        )
+      )
       .get
   }
 }
@@ -61,7 +62,9 @@ abstract class MacroBenchmark(parallel: Boolean, maxFiles: Int)
         .files(
           Corpus.fastparse.copy(
             // TODO(olafur) remove once testkit 1.7 is out
-            url = Corpus.fastparse.url.replace("olafurpg", "scalameta")))
+            url = Corpus.fastparse.url.replace("olafurpg", "scalameta")
+          )
+        )
         .filter { f =>
           f.projectUrl.contains("scala-js")
         }

scalafmt-benchmarks/src/main/scala/org/scalafmt/benchmarks/MicroBenchmark.scala

@@ -51,7 +51,8 @@ abstract class MicroBenchmark(path: String*) extends FormatBenchmark {
     if (filename.isFile) filename
     else
       FileOps.getFile(
-        Seq("scalafmt-benchmarks", "src", "resources") ++ path: _*)
+        Seq("scalafmt-benchmarks", "src", "resources") ++ path: _*
+      )
   }
 
   def scalametaParser(): Unit = {

scalafmt-cli/src/main/scala/org/scalafmt/cli/Cli.scala

@@ -11,8 +11,10 @@ object Cli {
   def nailMain(nGContext: NGContext): Unit = {
     val workingDirectory =
       AbsoluteFile.fromPath(nGContext.getWorkingDirectory).getOrElse {
-        throw new IllegalStateException(s"Expected absolute path, " +
-          s"obtained nGContext.getWorkingDirectory = ${nGContext.getWorkingDirectory}")
+        throw new IllegalStateException(
+          s"Expected absolute path, " +
+            s"obtained nGContext.getWorkingDirectory = ${nGContext.getWorkingDirectory}"
+        )
       }
     val exit = mainWithOptions(
       nGContext.getArgs,
@@ -33,7 +35,8 @@ object Cli {
       in: InputStream,
       out: PrintStream,
       err: PrintStream,
-      workingDirectory: String): Unit = {
+      workingDirectory: String
+  ): Unit = {
     val options = CliOptions.default.copy(
       common = CommonOptions(
         in = in,

scalafmt-cli/src/main/scala/org/scalafmt/cli/CliArgParser.scala

@@ -30,7 +30,8 @@ object CliArgParser {
       override def showUsageOnError = false
 
       private def printAndExit(
-          inludeUsage: Boolean)(ignore: Unit, c: CliOptions): CliOptions = {
+          inludeUsage: Boolean
+      )(ignore: Unit, c: CliOptions): CliOptions = {
         if (inludeUsage) showUsage
         else showHeader
         sys.exit
@@ -43,7 +44,8 @@ object CliArgParser {
 
       private def readConfigFromFile(
           file: String,
-          c: CliOptions): CliOptions = {
+          c: CliOptions
+      ): CliOptions = {
         val configFile =
           AbsoluteFile.fromFile(new File(file), c.common.workingDirectory)
         c.copy(config = Some(configFile.jfile.toPath))
@@ -67,16 +69,21 @@ object CliArgParser {
         .unbounded()
         .action((file, c) => addFile(file, c))
         .text(
-          "file or directory, in which case all *.scala files are formatted.")
+          "file or directory, in which case all *.scala files are formatted."
+        )
 
       opt[Seq[File]]('f', "files")
         .action { (files, c) =>
-          c.copy(customFiles =
-            AbsoluteFile.fromFiles(files, c.common.workingDirectory))
+          c.copy(
+            customFiles =
+              AbsoluteFile.fromFiles(files, c.common.workingDirectory)
+          )
         }
         .hidden() // this option isn't needed anymore. Simply pass the files as
         // arguments. Keeping for backwards compatibility
-        .text("file or directory, in which case all *.scala files are formatted. Deprecated: pass files as arguments")
+        .text(
+          "file or directory, in which case all *.scala files are formatted. Deprecated: pass files as arguments"
+        )
 
       opt[Unit]('i', "in-place")
         .action((opt, c) => c.copy(writeMode = Override))
@@ -94,7 +101,8 @@ object CliArgParser {
       opt[Seq[String]]("exclude")
         .action((excludes, c) => c.copy(customExcludes = excludes))
         .text(
-          "file or directory, in which case all *.scala files are formatted.")
+          "file or directory, in which case all *.scala files are formatted."
+        )
       opt[String]('c', "config")
         .action(readConfigFromFile)
         .text("a file path to .scalafmt.conf.")
@@ -110,21 +118,30 @@ object CliArgParser {
       opt[String]("assume-filename")
         .action((filename, c) => c.copy(assumeFilename = filename))
         .text(
-          "when using --stdin, use --assume-filename to hint to scalafmt that the input is an .sbt file.")
+          "when using --stdin, use --assume-filename to hint to scalafmt that the input is an .sbt file."
+        )
       opt[Unit]("test")
         .action((_, c) => c.copy(testing = true))
         .text("test for mis-formatted code, exits with status 1 on failure.")
       opt[File]("migrate2hocon")
-        .action((file, c) =>
-          c.copy(migrate =
-            Some(AbsoluteFile.fromFile(file, c.common.workingDirectory))))
-        .text("""migrate .scalafmt CLI style configuration to hocon style configuration in .scalafmt.conf""")
+        .action(
+          (file, c) =>
+            c.copy(
+              migrate =
+                Some(AbsoluteFile.fromFile(file, c.common.workingDirectory))
+            )
+        )
+        .text(
+          """migrate .scalafmt CLI style configuration to hocon style configuration in .scalafmt.conf"""
+        )
       opt[Unit]("diff")
         .action((_, c) => c.copy(diff = Some("master")))
         .text("If set, only format edited files in git diff against master.")
       opt[String]("diff-branch")
         .action((branch, c) => c.copy(diff = Some(branch)))
-        .text("If set, only format edited files in git diff against provided branch.")
+        .text(
+          "If set, only format edited files in git diff against provided branch."
+        )
       opt[Unit]("build-info")
         .action({
           case (_, c) =>