Add config flags for extra spaces, fixes #116.

scalameta · Apr 19, 2016 · dd537bf · dd537bf
1 parent 2b07938
commit dd537bf
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 8 deletions.
diff --git a/cli/src/main/scala/org/scalafmt/cli/Cli.scala b/cli/src/main/scala/org/scalafmt/cli/Cli.scala
@@ -125,6 +125,15 @@ object Cli {
     opt[Boolean]("alignStripMarginStrings") action { (bool, c) =>
       c.copy(style = c.style.copy(alignStripMarginStrings = bool))
     } text s"See ScalafmtConfig scaladoc."
+    opt[Boolean]("spacesInParentheses") action { (bool, c) =>
+      c.copy(style = c.style.copy(spacesInParentheses = bool))
+    } text s"See ScalafmtConfig scaladoc."
+    opt[Boolean]("spacesInSquareBrackets") action { (bool, c) =>
+      c.copy(style = c.style.copy(spacesInSquareBrackets = bool))
+    } text s"See ScalafmtConfig scaladoc."
+    opt[Boolean]("spacesInImportCurlyBraces") action { (bool, c) =>
+      c.copy(style = c.style.copy(spacesInImportCurlyBrackets = bool))
+    } text s"See ScalafmtConfig scaladoc."
     opt[Seq[String]]("alignTokens") action { (tokens, c) =>
       val alignsTokens = tokens.map { token =>
         val splitted = token.split(";", 2)

diff --git a/core/src/main/scala/org/scalafmt/ScalafmtStyle.scala b/core/src/main/scala/org/scalafmt/ScalafmtStyle.scala
@@ -43,7 +43,10 @@ case class ScalafmtStyle(maxColumn: Int,
                          noNewlinesBeforeJsNative: Boolean,
                          continuationIndentCallSite: Int,
                          continuationIndentDefnSite: Int,
-                         alignTokens: Set[AlignToken]) {
+                         alignTokens: Set[AlignToken],
+                         spacesInParentheses: Boolean,
+                         spacesInSquareBrackets: Boolean,
+                         spacesInImportCurlyBrackets: Boolean) {
   lazy val alignMap: Map[String, Regex] =
     alignTokens.map(x => x.code -> x.owner.r).toMap
   ValidationOps.assertNonNegative(
@@ -64,8 +67,12 @@ object ScalafmtStyle {
       noNewlinesBeforeJsNative = false,
       continuationIndentCallSite = 4,
       continuationIndentDefnSite = 4,
-      alignTokens = Set.empty[AlignToken]
+      alignTokens = Set.empty[AlignToken],
+      spacesInParentheses = false,
+      spacesInSquareBrackets = false,
+      spacesInImportCurlyBrackets = false
   )
+
   val defaultWithAlign = default.copy(alignTokens = AlignToken.default)
 
   val default40 = default.copy(maxColumn = 40)

diff --git a/core/src/main/scala/org/scalafmt/internal/Router.scala b/core/src/main/scala/org/scalafmt/internal/Router.scala
@@ -103,13 +103,14 @@ class Router(formatOps: FormatOps) {
           if (leftOwner.isInstanceOf[Term.Interpolate]) NoPolicy
           else SingleLineBlock(matchingParentheses(hash(open)))
         Seq(
-            Split(NoSplit, 0).withPolicy(policy)
+            Split(if (style.spacesInImportCurlyBrackets) Space else NoSplit, 0)
+              .withPolicy(policy)
         )
       case FormatToken(_, close: `}`, _)
           if parents(rightOwner).exists(_.isInstanceOf[Import]) ||
           rightOwner.isInstanceOf[Term.Interpolate] =>
         Seq(
-            Split(NoSplit, 0)
+            Split(if (style.spacesInImportCurlyBrackets) Space else NoSplit, 0)
         )
       case FormatToken(_: `.`, underscore: `_ `, _)
           if parents(rightOwner).exists(_.isInstanceOf[Import]) =>
@@ -426,6 +427,9 @@ class Router(formatOps: FormatOps) {
 
         val modification =
           if (right.isInstanceOf[Comment]) newlines2Modification(between)
+          else if (args.isEmpty) NoSplit
+          else if (isBracket && style.spacesInSquareBrackets) Space
+          else if (!isBracket && style.spacesInParentheses) Space
           else NoSplit
 
         val newlineModification: Modification =
@@ -611,9 +615,9 @@ class Router(formatOps: FormatOps) {
         )
       case FormatToken(bind: `@`, _, _) if leftOwner.isInstanceOf[Pat.Bind] =>
         Seq(
-          Split(Space, 0)
+            Split(Space, 0)
         )
-      case FormatToken(_: `@`, right: Delim, _)=>
+      case FormatToken(_: `@`, right: Delim, _) =>
         Seq(Split(NoSplit, 0))
       case FormatToken(_: `@`, right: Ident, _) =>
         // Add space if right starts with a symbol
@@ -922,9 +926,13 @@ class Router(formatOps: FormatOps) {
         Seq(
             Split(NoSplit, 0)
         )
-      case FormatToken(_, _: `)` | _: `]`, _) =>
+      case FormatToken(_, _: `)`, _) =>
         Seq(
-            Split(NoSplit, 0)
+            Split(if (style.spacesInParentheses) Space else NoSplit, 0)
+        )
+      case FormatToken(_, _: `]`, _) =>
+        Seq(
+            Split(if (style.spacesInSquareBrackets) Space else NoSplit, 0)
         )
       case FormatToken(_, _: Keyword, _) =>
         Seq(

diff --git a/core/src/test/resources/spaces/Spaces.stat b/core/src/test/resources/spaces/Spaces.stat
@@ -0,0 +1,17 @@
+80 columns                                                                     |
+<<< square bracket
+function[A, B]
+>>>
+function[ A, B ]
+<<< parens empty
+function()
+>>>
+function()
+<<< parens
+function(a, b)
+>>>
+function( a, b )
+<<< import
+import a.b.{c => d}
+>>>
+import a.b.{ c => d }
diff --git a/core/src/test/scala/org/scalafmt/util/HasTests.scala b/core/src/test/scala/org/scalafmt/util/HasTests.scala
@@ -95,6 +95,12 @@ trait HasTests extends FunSuiteLike with FormatAssertions {
       case "default" | "standard" | "scala" => ScalafmtStyle.unitTest80
       case "scalajs" => ScalafmtStyle.scalaJs
       case "stripMargin" => ScalafmtStyle.default
+      case "spaces" =>
+        ScalafmtStyle.default.copy(
+            spacesInImportCurlyBrackets = true,
+            spacesInParentheses = true,
+            spacesInSquareBrackets = true
+        )
       case "align" =>
         ScalafmtStyle.default.copy(alignTokens = AlignToken.default)
       case style => throw UnknownStyle(style)