Simple code cleanup

Reviewed By: cortinico Differential Revision: D58254727 fbshipit-source-id: e017dacc602ae0999395be27e4bb7d93a671a9d7
grodin · Jun 7, 2024 · 6cc7efb · 6cc7efb
1 parent 7d23e59
commit 6cc7efb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/core/src/main/java/com/facebook/ktfmt/cli/ParsedArgs.kt b/core/src/main/java/com/facebook/ktfmt/cli/ParsedArgs.kt
@@ -39,11 +39,13 @@ data class ParsedArgs(
   companion object {
 
     fun processArgs(args: Array<String>): ParseResult {
-      if (args.size == 1 && args[0].startsWith("@")) {
-        return parseOptions(File(args[0].substring(1)).readLines(UTF_8).toTypedArray())
-      } else {
-        return parseOptions(args)
-      }
+      val arguments =
+          if (args.size == 1 && args[0].startsWith("@")) {
+            File(args[0].substring(1)).readLines(UTF_8).toTypedArray()
+          } else {
+            args
+          }
+      return parseOptions(arguments)
     }
 
     /** parseOptions parses command-line arguments passed to ktfmt. */

diff --git a/core/src/main/java/com/facebook/ktfmt/kdoc/KDocFormattingOptions.kt b/core/src/main/java/com/facebook/ktfmt/kdoc/KDocFormattingOptions.kt
@@ -41,7 +41,7 @@ class KDocFormattingOptions(
     /**
      * Limit comment to be at most [maxCommentWidth] characters even if more would fit on the line.
      */
-    var maxCommentWidth: Int = min(maxLineWidth, 72)
+    var maxCommentWidth: Int = min(maxLineWidth, 72),
 ) {
   /** Whether to collapse multi-line comments that would fit on a single line into a single line. */
   var collapseSingleLine: Boolean = true

diff --git a/core/src/test/java/com/facebook/ktfmt/cli/ParsedArgsTest.kt b/core/src/test/java/com/facebook/ktfmt/cli/ParsedArgsTest.kt
@@ -165,7 +165,7 @@ class ParsedArgsTest {
   @Test
   fun `last style in args wins`() {
     val testResult =
-        ParsedArgs.parseOptions(arrayOf<String>("--google-style", "--dropbox-style", "File.kt"))
+        ParsedArgs.parseOptions(arrayOf("--google-style", "--dropbox-style", "File.kt"))
     assertThat(testResult)
         .isEqualTo(
             parseResultOk(
@@ -176,8 +176,7 @@ class ParsedArgsTest {
 
   @Test
   fun `error when parsing multiple args and one is unknown`() {
-    val testResult =
-        ParsedArgs.parseOptions(arrayOf<String>("@unknown", "--google-style", "File.kt"))
+    val testResult = ParsedArgs.parseOptions(arrayOf("@unknown", "--google-style", "File.kt"))
     assertThat(testResult).isEqualTo(ParseResult.Error("Unexpected option: @unknown"))
   }