scalafmt: enable RedundantBraces rewrite

Author: kitbellew

.scalafmt.conf

@@ -19,9 +19,14 @@ newlines {
 }
 rewrite {
   rules = [
+    RedundantBraces,
     RedundantParens,
     SortModifiers,
   ]
+  redundantBraces {
+    ifElseExpressions = true
+    stringInterpolation = true
+  }
   sortModifiers.preset = styleGuide
 }
 # Disabled in default since this operation is potentially

build.sbt

@@ -235,7 +235,7 @@ val ReleaseCandidate = s"($V-RC\\d+).*".r
 val Milestone = s"($V-M\\d+).*".r
 
 lazy val stableVersion = Def
-  .setting { (ThisBuild / version).value.replaceAll("\\+.*", "") }
+  .setting((ThisBuild / version).value.replaceAll("\\+.*", ""))
 
 lazy val buildInfoSettings: Seq[Def.Setting[_]] = Seq(
   buildInfoKeys := Seq[BuildInfoKey](

project/Mima.scala

@@ -1,7 +1,7 @@
 import com.typesafe.tools.mima.core._
 
 object Mima {
-  val ignoredABIProblems: Seq[ProblemFilter] = {
+  val ignoredABIProblems: Seq[ProblemFilter] =
     // After v0.5, start running mima checks in CI and document breaking changes here.
     // See https://github.com/typesafehub/migration-manager/wiki/sbt-plugin#basic-usage
     Seq(
@@ -12,5 +12,4 @@ object Mima {
       ProblemFilters.exclude[Problem]("org.scalafmt.rewrite.*"),
       ProblemFilters.exclude[Problem]("org.scalafmt.util.*")
     )
-  }
 }

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

@@ -65,7 +65,7 @@ object Readme {
     hl.scala(result)
   }
 
-  def config(frags: Frag*) = { cliFlags(frags.render) }
+  def config(frags: Frag*) = cliFlags(frags.render)
   def cliFlags(flags: String) = {
     Config.fromHoconString(flags).get
     hl.scala(flags)
@@ -118,18 +118,14 @@ object Readme {
   def configurationBlock(
       style: ScalafmtConfig,
       collapsed: Boolean = false
-  ): TypedTag[String] = {
-    div(
-      span(
-        "Show/hide configuration used for this example",
-        `class` := "scalafmt-configuration-toggle"
-      ),
-      pre(changedConfig(style)),
-      `class` := {
-        "scalafmt-configuration" + (if (collapsed) " collapsed" else "")
-      }
-    )
-  }
+  ): TypedTag[String] = div(
+    span(
+      "Show/hide configuration used for this example",
+      `class` := "scalafmt-configuration-toggle"
+    ),
+    pre(changedConfig(style)),
+    `class` := "scalafmt-configuration" + (if (collapsed) " collapsed" else "")
+  )
 
   def fullWidthDemo(style: ScalafmtConfig)(code: String): TypedTag[String] = {
     val formatted = Scalafmt.format(code, style).get
@@ -148,9 +144,8 @@ object Readme {
     div(sideBySide(code, formatted), configurationBlock(style))
   }
 
-  def example(code: String): TypedTag[String] = {
+  def example(code: String): TypedTag[String] =
     example(code, ScalafmtConfig.default40)
-  }
 
   def exampleAlign(code: String): TypedTag[String] = {
     val formatted = Scalafmt.format(
@@ -270,9 +265,8 @@ object Readme {
   def lastUpdated = new SimpleDateFormat("MMM d, y")
     .format(new Date(Versions.timestamp.toLong))
 
-  def format(code: String): TypedTag[String] = {
+  def format(code: String): TypedTag[String] =
     format(ScalafmtConfig.default)(code)
-  }
 
   val alignNone = ScalafmtConfig.default.copy(align = Align.none)
   val alignSome = ScalafmtConfig.default.copy(align = Align.some)
@@ -283,9 +277,8 @@ object Readme {
     .copy(align = Align.default.copy(arrowEnumeratorGenerator = true))
   val alignModuleId = ScalafmtConfig.defaultWithAlign
 
-  def format(style: ScalafmtConfig)(code: String): TypedTag[String] = {
+  def format(style: ScalafmtConfig)(code: String): TypedTag[String] =
     example(code, style.copy(runner = ScalafmtRunner.sbt))
-  }
 
   def example(code: String, style: ScalafmtConfig): TypedTag[String] = {
     val formatted = Scalafmt.format(code, style).get

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

@@ -27,15 +27,13 @@ abstract class MacroBenchmark(parallel: Boolean, maxFiles: Int)
   override def toString = s"${this.getClass.getName}(parallel=$parallel)"
 
   @Setup
-  def setup(): Unit = {
-    files = {
-      val x = Corpus.files(Corpus.fastparse.copy(
-        // TODO(olafur) remove once testkit 1.7 is out
-        url = Corpus.fastparse.url.replace("olafurpg", "scalameta")
-      )).filter { f => f.projectUrl.contains("scala-js") }.take(maxFiles)
-        .map(_.read).toBuffer
-      if (parallel) x.par else x
-    }
+  def setup(): Unit = files = {
+    val x = Corpus.files(Corpus.fastparse.copy(
+      // TODO(olafur) remove once testkit 1.7 is out
+      url = Corpus.fastparse.url.replace("olafurpg", "scalameta")
+    )).filter(f => f.projectUrl.contains("scala-js")).take(maxFiles).map(_.read)
+      .toBuffer
+    if (parallel) x.par else x
   }
 
   def testMe(): Unit = {
@@ -44,14 +42,10 @@ abstract class MacroBenchmark(parallel: Boolean, maxFiles: Int)
   }
 
   @Benchmark
-  def scalafmt(): Unit = {
-    files.foreach { file => Try(Scalafmt.format(file)) }
-  }
+  def scalafmt(): Unit = files.foreach(file => Try(Scalafmt.format(file)))
 
   @Benchmark
-  def scalafmt_rewrite(): Unit = {
-    files.foreach { file => Try(formatRewrite(file)) }
-  }
+  def scalafmt_rewrite(): Unit = files.foreach(file => Try(formatRewrite(file)))
 
 }
 

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

@@ -5,11 +5,9 @@ import org.scalafmt.config.{RewriteSettings, ScalafmtConfig}
 import org.scalafmt.rewrite.{RedundantBraces, SortImports}
 
 trait FormatBenchmark {
-  def formatRewrite(code: String): String = {
-    Scalafmt.formatCode(
-      code,
-      baseStyle = ScalafmtConfig.default
-        .copy(rewrite = RewriteSettings(rules = Seq(SortImports, RedundantBraces)))
-    ).get
-  }
+  def formatRewrite(code: String): String = Scalafmt.formatCode(
+    code,
+    baseStyle = ScalafmtConfig.default
+      .copy(rewrite = RewriteSettings(rules = Seq(SortImports, RedundantBraces)))
+  ).get
 }

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

@@ -26,7 +26,7 @@ abstract class MicroBenchmark(path: String*) extends FormatBenchmark {
   var code: String = _
 
   @Setup
-  def setup(): Unit = { code = FileOps.readFile(getPath) }
+  def setup(): Unit = code = FileOps.readFile(getPath)
 
   def getPath: Path = {
     val filename = FileOps.getFile(Seq("src", "resources") ++ path)
@@ -42,10 +42,10 @@ abstract class MicroBenchmark(path: String*) extends FormatBenchmark {
   }
 
   @Benchmark
-  def scalafmt(): String = { Scalafmt.format(code).get }
+  def scalafmt(): String = Scalafmt.format(code).get
 
   @Benchmark
-  def scalafmt_rewrite(): String = { formatRewrite(code) }
+  def scalafmt_rewrite(): String = formatRewrite(code)
 
   def testMe(): Unit = {
     setup()

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

@@ -34,20 +34,16 @@ object Cli {
     nGContext.exit(exit.code)
   }
 
-  private def throwIfError(exit: ExitCode): Unit = {
-    if (exit != ExitCode.Ok) {
-      throw new RuntimeException(exit.toString) with NoStackTrace
-    }
-  }
+  private def throwIfError(exit: ExitCode): Unit = if (exit != ExitCode.Ok)
+    throw new RuntimeException(exit.toString) with NoStackTrace
 
   def main(args: Array[String]): Unit = {
     val exit = mainWithOptions(args, CliOptions.default)
     sys.exit(exit.code)
   }
 
-  def exceptionThrowingMain(args: Array[String]): Unit = {
+  def exceptionThrowingMain(args: Array[String]): Unit =
     exceptionThrowingMainWithOptions(args, CliOptions.default)
-  }
 
   def exceptionThrowingMainWithOptions(
       args: Array[String],
@@ -57,12 +53,11 @@ object Cli {
     throwIfError(exit)
   }
 
-  def mainWithOptions(args: Array[String], options: CliOptions): ExitCode = {
+  def mainWithOptions(args: Array[String], options: CliOptions): ExitCode =
     getConfig(args, options) match {
       case Some(x) => run(x)
       case None => ExitCode.CommandLineArgumentError
     }
-  }
 
   def getConfig(args: Array[String], init: CliOptions): Option[CliOptions] = {
     val expandedArguments = expandArguments(args)
@@ -81,14 +76,13 @@ object Cli {
     builder.result()
   }
 
-  private[cli] def run(options: CliOptions): ExitCode = {
+  private[cli] def run(options: CliOptions): ExitCode =
     findRunner(options) match {
       case Left(message) =>
         options.common.err.println(message)
         ExitCode.UnsupportedVersion
       case Right(runner) => runWithRunner(options, runner)
     }
-  }
 
   private val isNativeImage: Boolean = "true" ==
     System.getProperty("scalafmt.native-image", "false")
@@ -125,7 +119,7 @@ object Cli {
               |""".stripMargin
         )
       } {
-        case Left(error) => Left(s"error: invalid configuration: ${error}")
+        case Left(error) => Left(s"error: invalid configuration: $error")
         case Right(`stableVersion`) =>
           options.common.debug.println(s"Using core runner [$stableVersion]")
           Right(ScalafmtCoreRunner)
@@ -162,20 +156,19 @@ object Cli {
 
     val exit = runner.run(options, termDisplayMessage)
 
-    if (options.writeMode == WriteMode.Test) {
-      if (exit.isOk) {
-        options.common.out.println("All files are formatted with scalafmt :)")
-      } else if (exit.is(ExitCode.TestError)) {
+    if (options.writeMode == WriteMode.Test)
+      if (exit.isOk) options.common.out
+        .println("All files are formatted with scalafmt :)")
+      else if (exit.is(ExitCode.TestError)) {
         options.common.out.println("error: --test failed")
         options.onTestFailure.foreach(options.common.out.println)
-      } else { options.common.out.println(s"error: $exit") }
-    }
+      } else options.common.out.println(s"error: $exit")
     if (
       options.writeMode == WriteMode.Test && !options.fatalWarnings &&
       exit.is(ExitCode.ParseError)
-    ) {
+    )
       // Ignore parse errors etc.
       ExitCode.Ok
-    } else { exit }
+    else exit
   }
 }

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

@@ -8,7 +8,7 @@ import scopt.OptionParser
 
 object CliArgParser {
 
-  implicit val readPath: scopt.Read[Path] = scopt.Read.reads { Paths.get(_) }
+  implicit val readPath: scopt.Read[Path] = scopt.Read.reads(Paths.get(_))
 
   val usageExamples: String =
     """|scalafmt # Format all files in the current project, configuration is determined in this order:
@@ -40,9 +40,8 @@ object CliArgParser {
         c
       }
 
-      private def readConfig(contents: String, c: CliOptions): CliOptions = {
-        c.copy(configStr = Some(contents))
-      }
+      private def readConfig(contents: String, c: CliOptions): CliOptions = c
+        .copy(configStr = Some(contents))
 
       head("scalafmt", Versions.nightly)
       opt[Unit]('h', "help").action(printAndExit(includeUsage = true))
@@ -114,7 +113,7 @@ object CliArgParser {
           s"""|Format files listed in `git diff` against given git ref.
               |Deprecated: use --mode diff-ref=<ref> instead""".stripMargin
         )
-      opt[Unit]("build-info").action((_, _) => { println(buildInfo); sys.exit })
+      opt[Unit]("build-info").action { (_, _) => println(buildInfo); sys.exit }
         .text("prints build information")
       opt[Unit]("quiet").action((_, c) => c.copy(quiet = true))
         .text("don't print out stuff to console.")
@@ -148,7 +147,7 @@ object CliArgParser {
         |build time: ${new Date(Versions.timestamp.toLong)}""".stripMargin
 
   private def writeMode(c: CliOptions, writeMode: WriteMode): CliOptions = c
-    .writeModeOpt.fold { c.copy(writeModeOpt = Some(writeMode)) } { x =>
+    .writeModeOpt.fold(c.copy(writeModeOpt = Some(writeMode))) { x =>
       if (x != writeMode)
         throw new Conflict(s"writeMode changing from $x to $writeMode")
       c

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

@@ -132,7 +132,7 @@ case class CliOptions(
 
   private[cli] def getProposedConfigFile: Path = canonicalConfigFile
     .flatMap(_.toOption)
-    .getOrElse { gitOps.getProposedConfigFile(cwd, config).path }
+    .getOrElse(gitOps.getProposedConfigFile(cwd, config).path)
 
   /** Parse the scalafmt configuration and try to encode it to `ScalafmtConfig`.
     * If `--config-str` is specified, this will parse the configuration string

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

@@ -32,22 +32,20 @@ object ExitCode {
     : ExitCode = generateExitStatus
   // format: on
   lazy val all: List[ExitCode] = allInternal.toList
-  private def codeToName(code: Int): String = {
+  private def codeToName(code: Int): String =
     if (code == 0) Ok.name
     else {
       val names = all
         .collect { case exit if (exit.code & code) != 0 => exit.name }
       names.mkString("+")
     }
-  }
-  def apply(code: Int): ExitCode = {
+  def apply(code: Int): ExitCode =
     if (cache.contains(code)) cache.get(code)
     else {
       val result = new ExitCode(code, codeToName(code)) {}
       cache.put(code, result)
       result
     }
-  }
 
   def merge(exit1: ExitCode, exit2: ExitCode): ExitCode =
     apply(exit1.code | exit2.code)

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

@@ -43,10 +43,9 @@ sealed abstract class InputMethod {
 object InputMethod {
 
   object StdinCode {
-    def apply(assumeFilename: String, inputStream: InputStream): StdinCode = {
+    def apply(assumeFilename: String, inputStream: InputStream): StdinCode =
       StdinCode
         .apply(assumeFilename, Source.fromInputStream(inputStream).mkString)
-    }
   }
   case class StdinCode(filename: String, input: String) extends InputMethod {
     override def path: Path = Paths.get(filename)
@@ -92,10 +91,8 @@ object InputMethod {
     val b = jList(revised, original.isEmpty || noEol(original.last))
     val diff = difflib.DiffUtils.diff(a, b)
     if (diff.getDeltas.isEmpty) ""
-    else {
-      difflib.DiffUtils
-        .generateUnifiedDiff(s"a$filename", s"b$filename", a, diff, 1)
-        .iterator().asScala.mkString("\n")
-    }
+    else difflib.DiffUtils
+      .generateUnifiedDiff(s"a$filename", s"b$filename", a, diff, 1).iterator()
+      .asScala.mkString("\n")
   }
 }