Stop emitting multiple trailing commas in enum entry lists with multi…

…line items (#458) Summary: Pull Request resolved: #458 Reviewed By: cortinico Differential Revision: D56467830 Pulled By: hick209 fbshipit-source-id: 0d97ccb01cfa8436443db27ec244a2759a57251d
facebook · Apr 23, 2024 · 4211ac2 · 4211ac2
1 parent 76487c0
commit 4211ac2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/core/src/main/java/com/facebook/ktfmt/format/TrailingCommas.kt b/core/src/main/java/com/facebook/ktfmt/format/TrailingCommas.kt
@@ -82,6 +82,7 @@ object TrailingCommas {
  }
 
  when (element) {
+ is KtEnumEntry, // Only suggest on the KtClassBody container
  is KtWhenEntry -> return
  is KtParameterList -> {
  if (element.parent is KtFunctionLiteral && element.parent.parent is KtLambdaExpression) {

diff --git a/core/src/test/java/com/facebook/ktfmt/format/GoogleStyleFormatterKtTest.kt b/core/src/test/java/com/facebook/ktfmt/format/GoogleStyleFormatterKtTest.kt
@@ -1714,6 +1714,25 @@ class GoogleStyleFormatterKtTest {
  formattingOptions = Formatter.GOOGLE_FORMAT,
  deduceMaxWidth = true)
 
+ @Test
+ fun `trailing commas on multline enum entries`() =
+ assertFormatted(
+ """
+ |enum class MultilineEntries {
+ | A(
+ | arg = 0, //
+ | arg = 0,
+ | ),
+ | /* Comment */
+ | B,
+ | C {
+ | fun foo() {}
+ | },
+ |}
+ |"""
+ .trimMargin(),
+ formattingOptions = Formatter.GOOGLE_FORMAT)
+
  @Test
  fun `trailing commas in enums`() {
  val code =