Codemod format for trailing commas change

Reviewed By: VladimirMakaev

Differential Revision: D80576929

fbshipit-source-id: 1310f77f5d9d489b780b14875454ebda7f7adfc9

Author: Nivaldo Bondança

core/src/main/java/com/facebook/ktfmt/cli/Main.kt

@@ -72,7 +72,8 @@ class Main(
         result.addAll(
             File(arg).walkTopDown().filter {
               it.isFile && (it.extension == "kt" || it.extension == "kts")
-            })
+            }
+        )
       }
       return result
     }

core/src/main/java/com/facebook/ktfmt/cli/ParsedArgs.kt

@@ -124,7 +124,8 @@ data class ParsedArgs(
               stdinName =
                   parseKeyValueArg("--stdin-name", arg)
                       ?: return ParseResult.Error(
-                          "Found option '${arg}', expected '${"--stdin-name"}=<value>'")
+                          "Found option '${arg}', expected '${"--stdin-name"}=<value>'"
+                      )
           arg.startsWith("--") -> return ParseResult.Error("Unexpected option: $arg")
           arg.startsWith("@") -> return ParseResult.Error("Unexpected option: $arg")
           else -> fileNames.add(arg)
@@ -137,7 +138,8 @@ data class ParsedArgs(
           val filesExceptStdin = fileNames - "-"
           return ParseResult.Error(
               "Cannot read from stdin and files in same run. Found stdin specifier '-'" +
-                  " and files ${filesExceptStdin.joinToString(", ")} ")
+                  " and files ${filesExceptStdin.joinToString(", ")} "
+          )
         }
       } else if (stdinName != null) {
         return ParseResult.Error("--stdin-name can only be specified when reading from stdin")
@@ -150,7 +152,8 @@ data class ParsedArgs(
               dryRun,
               setExitIfChanged,
               stdinName,
-          ))
+          )
+      )
     }
 
     private fun parseKeyValueArg(key: String, arg: String): String? {

core/src/main/java/com/facebook/ktfmt/format/Formatter.kt

@@ -131,7 +131,8 @@ object Formatter {
     val tokenRangeSet =
         kotlinInput.characterRangesToTokenRanges(ImmutableList.of(Range.closedOpen(0, code.length)))
     return WhitespaceTombstones.replaceTombstoneWithTrailingWhitespace(
-        JavaOutput.applyReplacements(code, javaOutput.getFormatReplacements(tokenRangeSet)))
+        JavaOutput.applyReplacements(code, javaOutput.getFormatReplacements(tokenRangeSet))
+    )
   }
 
   private fun createAstVisitor(options: FormattingOptions, builder: OpsBuilder): PsiElementVisitor {

core/src/main/java/com/facebook/ktfmt/format/KotlinInput.kt

@@ -84,7 +84,8 @@ class KotlinInput(private val text: String, file: KtFile) : Input() {
           characterRangeToTokenRange(
               characterRange.lowerEndpoint(),
               characterRange.upperEndpoint() - characterRange.lowerEndpoint(),
-          ))
+          )
+      )
     }
     return tokenRangeSet
   }
@@ -106,7 +107,8 @@ class KotlinInput(private val text: String, file: KtFile) : Input() {
               "error: invalid length %d, offset + length (%d) is outside the file",
               length,
               requiredLength,
-          ))
+          )
+      )
     }
     val expandedLength =
         when {

core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt

@@ -657,8 +657,10 @@ class KotlinInputAstVisitor(
               (receiverExpression as? KtQualifiedExpression)?.selectorExpression
                   ?: receiverExpression
           val current = checkNotNull(part.selectorExpression)
-          if (lastIndexToOpen == 0 &&
-              shouldGroupPartWithPrevious(parts, part, index, previous, current)) {
+          if (
+              lastIndexToOpen == 0 &&
+                  shouldGroupPartWithPrevious(parts, part, index, previous, current)
+          ) {
             // this and the previous items should be grouped for better style
             // we add another group to open in index 0
             groupingInfos[0].groupOpenCount++
@@ -702,21 +704,27 @@ class KotlinInputAstVisitor(
       return true
     }
     // this and the previous part are a package name, type name, or property
-    if (previous is KtSimpleNameExpression &&
-        current is KtSimpleNameExpression &&
-        part is KtDotQualifiedExpression) {
+    if (
+        previous is KtSimpleNameExpression &&
+            current is KtSimpleNameExpression &&
+            part is KtDotQualifiedExpression
+    ) {
       return true
     }
     // this is `Foo` in `com.facebook.Foo`, so everything before it is a package name
-    if (current.text.first().isUpperCase() &&
-        current is KtSimpleNameExpression &&
-        part is KtDotQualifiedExpression) {
+    if (
+        current.text.first().isUpperCase() &&
+            current is KtSimpleNameExpression &&
+            part is KtDotQualifiedExpression
+    ) {
       return true
     }
     // this is the `foo()` in `com.facebook.Foo.foo()` or in `Foo.foo()`
-    if (current is KtCallExpression &&
-        (previous !is KtCallExpression) &&
-        previous.text?.firstOrNull()?.isUpperCase() == true) {
+    if (
+        current is KtCallExpression &&
+            (previous !is KtCallExpression) &&
+            previous.text?.firstOrNull()?.isUpperCase() == true
+    ) {
       return true
     }
     // this is an invocation and the last item, and the previous it not, i.e. `a.b.c()`
@@ -915,9 +923,11 @@ class KotlinInputAstVisitor(
       builder.breakOp(Doc.FillMode.UNIFIED, "", bracePlusBlockIndent)
       builder.block(bracePlusBlockIndent) {
         builder.blankLineWanted(OpsBuilder.BlankLineWanted.NO)
-        if (expressionStatements.size == 1 &&
-            expressionStatements.first() !is KtReturnExpression &&
-            !bodyExpression.startsWithComment()) {
+        if (
+            expressionStatements.size == 1 &&
+                expressionStatements.first() !is KtReturnExpression &&
+                !bodyExpression.startsWithComment()
+        ) {
           visitStatement(expressionStatements[0])
         } else {
           visitStatements(expressionStatements)
@@ -1247,8 +1257,10 @@ class KotlinInputAstVisitor(
       val operator = expression.operationReference.text
 
       visit(baseExpression)
-      if (baseExpression is KtPostfixExpression &&
-          baseExpression.operationReference.text.last() == operator.first()) {
+      if (
+          baseExpression is KtPostfixExpression &&
+              baseExpression.operationReference.text.last() == operator.first()
+      ) {
         builder.space()
       }
       builder.token(operator)
@@ -1262,8 +1274,10 @@ class KotlinInputAstVisitor(
       val operator = expression.operationReference.text
 
       builder.token(operator)
-      if (baseExpression is KtPrefixExpression &&
-          operator.last() == baseExpression.operationReference.text.first()) {
+      if (
+          baseExpression is KtPrefixExpression &&
+              operator.last() == baseExpression.operationReference.text.first()
+      ) {
         builder.space()
       }
       visit(baseExpression)
@@ -1467,9 +1481,11 @@ class KotlinInputAstVisitor(
 
     var carry = expression
     if (carry is KtCallExpression) {
-      if (carry.valueArgumentList?.leftParenthesis == null &&
-          carry.lambdaArguments.isNotEmpty() &&
-          carry.typeArgumentList?.arguments.isNullOrEmpty()) {
+      if (
+          carry.valueArgumentList?.leftParenthesis == null &&
+              carry.lambdaArguments.isNotEmpty() &&
+              carry.typeArgumentList?.arguments.isNullOrEmpty()
+      ) {
         carry = carry.lambdaArguments[0].getArgumentExpression()
       } else {
         return false
@@ -2362,9 +2378,11 @@ class KotlinInputAstVisitor(
     visit(expression.leftHandSide)
     if (!openGroupBeforeLeft) builder.open(ZERO)
     val parent = expression.parent
-    if (parent is KtValueArgument ||
-        parent is KtParenthesizedExpression ||
-        parent is KtContainerNode) {
+    if (
+        parent is KtValueArgument ||
+            parent is KtParenthesizedExpression ||
+            parent is KtContainerNode
+    ) {
       builder.breakOp(Doc.FillMode.UNIFIED, " ", expressionBreakIndent)
     } else {
       builder.space()
@@ -2527,7 +2545,8 @@ class KotlinInputAstVisitor(
             child is PsiComment -> continue
             child is KtScript && importListEmpty -> OpsBuilder.BlankLineWanted.PRESERVE
             else -> OpsBuilder.BlankLineWanted.YES
-          })
+          }
+      )
 
       visit(child)
       isFirst = false
@@ -2550,8 +2569,9 @@ class KotlinInputAstVisitor(
         builder.blankLineWanted(OpsBuilder.BlankLineWanted.PRESERVE)
       } else if (lastChildIsContextReceiver) {
         builder.blankLineWanted(OpsBuilder.BlankLineWanted.NO)
-      } else if (child !is PsiComment &&
-          (childGetsBlankLineBefore || lastChildHadBlankLineBefore)) {
+      } else if (
+          child !is PsiComment && (childGetsBlankLineBefore || lastChildHadBlankLineBefore)
+      ) {
         builder.blankLineWanted(OpsBuilder.BlankLineWanted.YES)
       }
       visit(child)

core/src/main/java/com/facebook/ktfmt/format/MultilineStringFormatter.kt

@@ -146,7 +146,8 @@ class MultilineStringFormatter(val continuationIndentSize: Int) {
               candidates.add(Candidate(isTrimMargin, trimOffset, stringOffset))
             }
           }
-        })
+        }
+    )
     return candidates
   }
 }

core/src/main/java/com/facebook/ktfmt/format/ParseError.kt

@@ -21,7 +21,8 @@ import org.jetbrains.kotlin.com.intellij.psi.PsiElement
 
 class ParseError(val errorDescription: String, val lineColumn: LineColumn) :
     IllegalArgumentException(
-        "${lineColumn.line + 1}:${lineColumn.column + 1}: error: $errorDescription") {
+        "${lineColumn.line + 1}:${lineColumn.column + 1}: error: $errorDescription"
+    ) {
 
   constructor(
       errorDescription: String,

core/src/main/java/com/facebook/ktfmt/format/RedundantElementManager.kt

@@ -68,7 +68,8 @@ object RedundantElementManager {
             redundantImportDetector.takeReferenceExpression(expression)
             super.visitReferenceExpression(expression)
           }
-        })
+        }
+    )
 
     val result = StringBuilder(code)
     val elementsToRemove =
@@ -104,7 +105,8 @@ object RedundantElementManager {
             trailingCommaSuggestor.takeElement(element)
             super.visitElement(element)
           }
-        })
+        }
+    )
 
     val result = StringBuilder(code)
     val suggestionElements = trailingCommaSuggestor.getTrailingCommaSuggestions()

core/src/main/java/com/facebook/ktfmt/format/RedundantSemicolonDetector.kt

@@ -65,9 +65,11 @@ internal class RedundantSemicolonDetector {
 
     val prevLeaf = element.prevLeaf(false)
     val prevConcreteSibling = element.getPrevSiblingIgnoringWhitespaceAndComments()
-    if ((prevConcreteSibling is KtIfExpression || prevConcreteSibling is KtWhileExpression) &&
-        prevLeaf is KtContainerNodeForControlStructureBody &&
-        prevLeaf.text.isEmpty()) {
+    if (
+        (prevConcreteSibling is KtIfExpression || prevConcreteSibling is KtWhileExpression) &&
+            prevLeaf is KtContainerNodeForControlStructureBody &&
+            prevLeaf.text.isEmpty()
+    ) {
       return false
     }
 

core/src/main/java/com/facebook/ktfmt/kdoc/KDocCommentsHelper.kt

@@ -54,7 +54,8 @@ class KDocCommentsHelper(private val lineSeparator: String, private val maxLineL
             convertMarkup = false
             nestedListIndent = 4
             optimal = false // Use greedy line breaking for predictability.
-          })
+          }
+      )
 
   override fun rewrite(tok: Tok, maxWidth: Int, column0: Int): String {
     if (!tok.isComment) {