Merge pull request #1214 from olafurpg/1213

Change default to `trailingCommas = never`
scalameta · Jun 5, 2018 · 871555f · 871555f
2 parents 251d601 + b300361
commit 871555f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala
@@ -135,7 +135,7 @@ case class ScalafmtConfig(
     assumeStandardLibraryStripMargin: Boolean = false,
     danglingParentheses: Boolean = true,
     poorMansTrailingCommasInConfigStyle: Boolean = false,
-    trailingCommas: TrailingCommas = TrailingCommas.preserve,
+    trailingCommas: TrailingCommas = TrailingCommas.never,
     @deprecated("Use VerticalMultiline.atDefnSite instead", "1.6.0")
     verticalMultilineAtDefinitionSite: Boolean = false,
     @deprecated("Use VerticalMultiline.arityThreshold instead", "1.6.0")

diff --git a/.../org/scalafmt/config/Trailingcommas.scala → .../org/scalafmt/config/TrailingCommas.scala b/.../org/scalafmt/config/Trailingcommas.scala → .../org/scalafmt/config/TrailingCommas.scala
diff --git a/scalafmt-tests/src/test/resources/unit/Dialect.stat b/scalafmt-tests/src/test/resources/unit/Dialect.stat
@@ -7,7 +7,7 @@ foo(
 >>>
 foo(
     1,
-    2,
+    2
 )
 <<< literal types
 val x : 42 = 42
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ foo( @@
     >>>
     foo(
 ,
-,
     )
     <<< literal types
     val x : 42 = 42
@@ Expand Down @@