Apply formatting to ktfmt code

Summary: This is here to showcase the changes from the previous diff in action

Differential Revision: D79772884

fbshipit-source-id: c2200e1e198aa032bb76963dcc68dbfb349f4d7c

Author: Nivaldo Bondança

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

@@ -37,19 +37,19 @@ private const val EXIT_CODE_SUCCESS = 0
 
 private val USAGE =
     """
-        |Usage:
-        |  ktfmt [OPTIONS] File1.kt File2.kt ...
-        |  ktfmt @ARGFILE
-        |
-        |For more details see `ktfmt --help`
-        |"""
+    |Usage:
+    |  ktfmt [OPTIONS] File1.kt File2.kt ...
+    |  ktfmt @ARGFILE
+    |
+    |For more details see `ktfmt --help`
+    |"""
         .trimMargin()
 
 class Main(
     private val input: InputStream,
     private val out: PrintStream,
     private val err: PrintStream,
-    private val inputArgs: Array<String>
+    private val inputArgs: Array<String>,
 ) {
   companion object {
     @JvmStatic

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

@@ -150,7 +150,8 @@ object Formatter {
       throw ParseError(
           "ktfmt does not support code which contains one of {\\u0003, \\u0004, \\u0005} character" +
               "; escape it",
-          StringUtil.offsetToLineColumn(code, index))
+          StringUtil.offsetToLineColumn(code, index),
+      )
     }
   }
 
@@ -172,7 +173,8 @@ object Formatter {
       } else if (element !is KtImportDirective && element !is PsiWhiteSpace) {
         throw ParseError(
             "Imports not contiguous: " + element.text,
-            StringUtil.offsetToLineColumn(code, element.startOffset))
+            StringUtil.offsetToLineColumn(code, element.startOffset),
+        )
       }
       element = element.nextSibling
     }
@@ -189,6 +191,7 @@ object Formatter {
     return code.replaceRange(
         importList.startOffset,
         importList.endOffset,
-        importsWithComments.joinToString(separator = "\n") { imprt -> imprt.text } + "\n")
+        importsWithComments.joinToString(separator = "\n") { imprt -> imprt.text } + "\n",
+    )
   }
 }

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

@@ -83,7 +83,8 @@ class KotlinInput(private val text: String, file: KtFile) : Input() {
       tokenRangeSet.add(
           characterRangeToTokenRange(
               characterRange.lowerEndpoint(),
-              characterRange.upperEndpoint() - characterRange.lowerEndpoint()))
+              characterRange.upperEndpoint() - characterRange.lowerEndpoint(),
+          ))
     }
     return tokenRangeSet
   }
@@ -104,7 +105,8 @@ class KotlinInput(private val text: String, file: KtFile) : Input() {
           String.format(
               "error: invalid length %d, offset + length (%d) is outside the file",
               length,
-              requiredLength))
+              requiredLength,
+          ))
     }
     val expandedLength =
         when {
@@ -121,7 +123,9 @@ class KotlinInput(private val text: String, file: KtFile) : Input() {
       EMPTY_RANGE
     } else
         Range.closedOpen(
-            enclosed.iterator().next().tok.index, getLast(enclosed).getTok().getIndex() + 1)
+            enclosed.iterator().next().tok.index,
+            getLast(enclosed).getTok().getIndex() + 1,
+        )
   }
 
   private fun makePositionToColumnMap(toks: List<KotlinTok>) =

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

@@ -135,7 +135,7 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
 /** An AST visitor that builds a stream of {@link Op}s to format. */
 class KotlinInputAstVisitor(
     private val options: FormattingOptions,
-    private val builder: OpsBuilder
+    private val builder: OpsBuilder,
 ) : KtTreeVisitorVoid() {
 
   /** Standard indentation for a block */
@@ -451,7 +451,8 @@ class KotlinInputAstVisitor(
           typeConstraintList = property.typeConstraintList,
           delegate = property.delegate,
           initializer = property.initializer,
-          accessors = property.accessors)
+          accessors = property.accessors,
+      )
     }
     builder.guessToken(";")
     if (property.parent !is KtWhenExpression) {
@@ -644,7 +645,7 @@ class KotlinInputAstVisitor(
    */
   private fun computeGroupingInfo(
       parts: List<KtExpression>,
-      useBlockLikeLambdaStyle: Boolean
+      useBlockLikeLambdaStyle: Boolean,
   ): List<GroupingInfo> {
     val groupingInfos = List(parts.size) { GroupingInfo() }
     var lastIndexToOpen = 0
@@ -690,7 +691,7 @@ class KotlinInputAstVisitor(
       part: KtExpression,
       index: Int,
       previous: KtExpression,
-      current: KtExpression
+      current: KtExpression,
   ): Boolean {
     // this is the second, and the first is short, avoid `.` "hanging in air"
     if (index == 1 && previous.text.length < options.continuationIndent) {
@@ -1280,7 +1281,7 @@ class KotlinInputAstVisitor(
 
   internal enum class DeclarationKind {
     FIELD,
-    PARAMETER
+    PARAMETER,
   }
 
   /**
@@ -1302,7 +1303,7 @@ class KotlinInputAstVisitor(
       typeConstraintList: KtTypeConstraintList? = null,
       initializer: KtExpression?,
       delegate: KtPropertyDelegate? = null,
-      accessors: List<KtPropertyAccessor>? = null
+      accessors: List<KtPropertyAccessor>? = null,
   ): Int {
     val verticalAnnotationBreak = genSym()
 
@@ -1821,7 +1822,7 @@ class KotlinInputAstVisitor(
   /** For example, 'field' in @field:[Inject Named("WEB_VIEW")] */
   override fun visitAnnotationUseSiteTarget(
       annotationTarget: KtAnnotationUseSiteTarget,
-      data: Void?
+      data: Void?,
   ): Void? {
     builder.token(annotationTarget.getAnnotationUseSiteTarget().renderName)
     return null
@@ -1842,12 +1843,13 @@ class KotlinInputAstVisitor(
         annotationEntry.calleeExpression,
         null, // Type-arguments are included in the annotation's callee expression.
         annotationEntry.valueArgumentList,
-        listOf())
+        listOf(),
+    )
   }
 
   override fun visitFileAnnotationList(
       fileAnnotationList: KtFileAnnotationList,
-      data: Void?
+      data: Void?,
   ): Void? {
     for (child in fileAnnotationList.node.children()) {
       if (child is PsiElement) {
@@ -1912,7 +1914,10 @@ class KotlinInputAstVisitor(
               whenEntry.guard?.let { guard ->
                 builder.space()
                 emitKeywordWithCondition(
-                    "if", guard.getExpression(), surroundConditionWithParens = false)
+                    "if",
+                    guard.getExpression(),
+                    surroundConditionWithParens = false,
+                )
               }
             }
           }
@@ -2075,7 +2080,10 @@ class KotlinInputAstVisitor(
       builder.breakOp(Doc.FillMode.UNIFIED, "", expressionBreakIndent)
       builder.block(expressionBreakIndent) {
         visitEachCommaSeparated(
-            expression.indexExpressions, expression.trailingComma != null, wrapInBlock = true)
+            expression.indexExpressions,
+            expression.trailingComma != null,
+            wrapInBlock = true,
+        )
       }
     }
     builder.token("]")
@@ -2095,7 +2103,10 @@ class KotlinInputAstVisitor(
       builder.breakOp(Doc.FillMode.UNIFIED, "", expressionBreakIndent)
       builder.block(expressionBreakIndent) {
         visitEachCommaSeparated(
-            destructuringDeclaration.entries, hasTrailingComma, wrapInBlock = true)
+            destructuringDeclaration.entries,
+            hasTrailingComma,
+            wrapInBlock = true,
+        )
       }
     }
     builder.token(")")
@@ -2273,7 +2284,8 @@ class KotlinInputAstVisitor(
             valOrVarKeyword = parameter.valOrVarKeyword?.text,
             name = parameter.nameIdentifier?.text,
             type = typeReference,
-            initializer = parameter.defaultValue)
+            initializer = parameter.defaultValue,
+        )
       }
     }
   }
@@ -2306,7 +2318,8 @@ class KotlinInputAstVisitor(
           receiverExpression.calleeExpression,
           receiverExpression.typeArgumentList,
           receiverExpression.valueArgumentList,
-          receiverExpression.lambdaArguments)
+          receiverExpression.lambdaArguments,
+      )
     } else {
       visit(receiverExpression)
     }
@@ -2392,7 +2405,8 @@ class KotlinInputAstVisitor(
           expression.trailingComma != null,
           prefix = "[",
           postfix = "]",
-          wrapInBlock = !options.manageTrailingCommas)
+          wrapInBlock = !options.manageTrailingCommas,
+      )
     }
   }
 
@@ -2575,7 +2589,8 @@ class KotlinInputAstVisitor(
         token,
         Doc.Token.RealOrImaginary.REAL,
         plusIndentCommentsBefore,
-        /* breakAndIndentTrailingComment */ Optional.empty())
+        /* breakAndIndentTrailingComment */ Optional.empty(),
+    )
   }
 
   /**

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

@@ -28,7 +28,7 @@ class KotlinTok(
     private val position: Int,
     private val column: Int,
     val isToken: Boolean,
-    private val kind: KtToken
+    private val kind: KtToken,
 ) : Input.Tok {
 
   override fun getIndex(): Int = index

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

@@ -23,7 +23,7 @@ import com.google.googlejavaformat.Input
 class KotlinToken(
     private val toksBefore: ImmutableList<KotlinTok>,
     private val kotlinTok: KotlinTok,
-    private val toksAfter: ImmutableList<KotlinTok>
+    private val toksAfter: ImmutableList<KotlinTok>,
 ) : Input.Token {
 
   override fun getTok(): KotlinTok = kotlinTok

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

@@ -52,10 +52,14 @@ object Parser {
     val configuration = CompilerConfiguration()
     configuration.put(
         CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY,
-        PrintingMessageCollector(System.err, PLAIN_RELATIVE_PATHS, false))
+        PrintingMessageCollector(System.err, PLAIN_RELATIVE_PATHS, false),
+    )
     env =
         KotlinCoreEnvironment.createForProduction(
-            disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
+            disposable,
+            configuration,
+            EnvironmentConfigFiles.JVM_CONFIG_FILES,
+        )
   }
 
   fun parse(code: String): KtFile {
@@ -68,6 +72,8 @@ object Parser {
 
   private fun throwParseError(fileContents: String, error: PsiErrorElement): Nothing {
     throw ParseError(
-        error.errorDescription, StringUtil.offsetToLineColumn(fileContents, error.startOffset))
+        error.errorDescription,
+        StringUtil.offsetToLineColumn(fileContents, error.startOffset),
+    )
   }
 }

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

@@ -67,7 +67,9 @@ class Tokenizer(private val fileText: String, val file: KtFile) : KtTreeVisitorV
       is PsiComment -> {
         if (element.text.startsWith("/*") && !element.text.endsWith("*/")) {
           throw ParseError(
-              "Unclosed comment", StringUtil.offsetToLineColumn(fileText, element.startOffset))
+              "Unclosed comment",
+              StringUtil.offsetToLineColumn(fileText, element.startOffset),
+          )
         }
         toks.add(
             KotlinTok(
@@ -111,7 +113,9 @@ class Tokenizer(private val fileText: String, val file: KtFile) : KtTreeVisitorV
                     index = -1,
                     originalText =
                         fileText.substring(
-                            startIndex + matcher.start(), startIndex + matcher.end()),
+                            startIndex + matcher.start(),
+                            startIndex + matcher.end(),
+                        ),
                     text = text,
                     position = startIndex + matcher.start(),
                     column = 0,

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

@@ -38,7 +38,7 @@ enum class CommentType(
     /** The closing string of the comment. */
     val suffix: String,
     /** For multi line comments, the prefix at each comment line after the first one. */
-    val linePrefix: String
+    val linePrefix: String,
 ) {
   KDOC("/**", "*/", " * "),
   BLOCK("/*", "*/", ""),

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

@@ -70,5 +70,5 @@ class FormattingTask(
     var orderedParameterNames: List<String> = emptyList(),
 
     /** The type of comment being formatted. */
-    val type: CommentType = comment.commentType()
+    val type: CommentType = comment.commentType(),
 )