Update dependency com.facebook:ktfmt to v0.62 (#2089)

* Update dependency com.facebook:ktfmt to v0.62

* Reformat

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jake Wharton <jw@jakewharton.com>

Author: renovate[bot]

gradle/libs.versions.toml

@@ -36,4 +36,4 @@ kotlinCompileTesting = { module = "dev.zacsweers.kctfork:core", version.ref = "k
 kotlinCompileTesting-ksp = { module = "dev.zacsweers.kctfork:ksp", version.ref ="kotlinCompileTesting" }
 truth = "com.google.truth:truth:1.4.5"
 googleJavaFormat = "com.google.googlejavaformat:google-java-format:1.35.0"
-ktfmt = "com.facebook:ktfmt:0.61"
+ktfmt = "com.facebook:ktfmt:0.62"

moshi-kotlin-codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/ProguardRules.kt

@@ -45,54 +45,53 @@ public data class ProguardConfig(
     return "META-INF/proguard/moshi-$canonicalName"
   }
 
-  public fun writeTo(out: Appendable): Unit =
-    out.run {
+  public fun writeTo(out: Appendable): Unit = out.run {
+    //
+    // -keepnames class {the target class}
+    // -if class {the target class}
+    // -keep class {the generated adapter} {
+    //    <init>(...);
+    //    private final {adapter fields}
+    // }
+    //
+    val targetName = targetClass.reflectionName()
+    val adapterCanonicalName = ClassName(targetClass.packageName, adapterName).canonicalName
+    // Keep the class name for Moshi's reflective lookup based on it
+    appendLine("-keepnames class $targetName")
+
+    appendLine("-if class $targetName")
+    appendLine("-keep class $adapterCanonicalName {")
+    // Keep the constructor for Moshi's reflective lookup
+    val constructorArgs = adapterConstructorParams.joinToString(",")
+    appendLine("    public <init>($constructorArgs);")
+    appendLine("}")
+
+    if (targetConstructorHasDefaults) {
+      // If the target class has default parameter values, keep its synthetic constructor
       //
-      // -keepnames class {the target class}
       // -if class {the target class}
-      // -keep class {the generated adapter} {
-      //    <init>(...);
-      //    private final {adapter fields}
+      // -keepnames class kotlin.jvm.internal.DefaultConstructorMarker
+      // -keepclassmembers @com.squareup.moshi.JsonClass @kotlin.Metadata class * {
+      //     synthetic <init>(...);
       // }
       //
-      val targetName = targetClass.reflectionName()
-      val adapterCanonicalName = ClassName(targetClass.packageName, adapterName).canonicalName
-      // Keep the class name for Moshi's reflective lookup based on it
-      appendLine("-keepnames class $targetName")
-
       appendLine("-if class $targetName")
-      appendLine("-keep class $adapterCanonicalName {")
-      // Keep the constructor for Moshi's reflective lookup
-      val constructorArgs = adapterConstructorParams.joinToString(",")
-      appendLine("    public <init>($constructorArgs);")
+      appendLine("-keepnames class kotlin.jvm.internal.DefaultConstructorMarker")
+      appendLine("-keepclassmembers class $targetName {")
+      val allParams = targetConstructorParams.toMutableList()
+      val maskCount =
+        if (targetConstructorParams.isEmpty()) {
+          0
+        } else {
+          (targetConstructorParams.size + 31) / 32
+        }
+      repeat(maskCount) { allParams += "int" }
+      allParams += "kotlin.jvm.internal.DefaultConstructorMarker"
+      val params = allParams.joinToString(",")
+      appendLine("    public synthetic <init>($params);")
       appendLine("}")
-
-      if (targetConstructorHasDefaults) {
-        // If the target class has default parameter values, keep its synthetic constructor
-        //
-        // -if class {the target class}
-        // -keepnames class kotlin.jvm.internal.DefaultConstructorMarker
-        // -keepclassmembers @com.squareup.moshi.JsonClass @kotlin.Metadata class * {
-        //     synthetic <init>(...);
-        // }
-        //
-        appendLine("-if class $targetName")
-        appendLine("-keepnames class kotlin.jvm.internal.DefaultConstructorMarker")
-        appendLine("-keepclassmembers class $targetName {")
-        val allParams = targetConstructorParams.toMutableList()
-        val maskCount =
-          if (targetConstructorParams.isEmpty()) {
-            0
-          } else {
-            (targetConstructorParams.size + 31) / 32
-          }
-        repeat(maskCount) { allParams += "int" }
-        allParams += "kotlin.jvm.internal.DefaultConstructorMarker"
-        val params = allParams.joinToString(",")
-        appendLine("    public synthetic <init>($params);")
-        appendLine("}")
-      }
     }
+  }
 }
 
 /**

moshi-kotlin-codegen/src/main/java/com/squareup/moshi/kotlin/codegen/ksp/JsonClassSymbolProcessorProvider.kt

@@ -65,13 +65,12 @@ private class JsonClassSymbolProcessor(environment: SymbolProcessorEnvironment)
     environment.options[OPTION_GENERATE_PROGUARD_RULES]?.toBooleanStrictOrNull() ?: true
 
   override fun process(resolver: Resolver): List<KSAnnotated> {
-    val generatedAnnotation =
-      generatedOption?.let {
-        AnnotationSpec.builder(ClassName.bestGuess(it))
-          .addMember("value = [%S]", JsonClassSymbolProcessor::class.java.canonicalName)
-          .addMember("comments = %S", "https://github.com/square/moshi")
-          .build()
-      }
+    val generatedAnnotation = generatedOption?.let {
+      AnnotationSpec.builder(ClassName.bestGuess(it))
+        .addMember("value = [%S]", JsonClassSymbolProcessor::class.java.canonicalName)
+        .addMember("comments = %S", "https://github.com/square/moshi")
+        .build()
+    }
 
     for (type in resolver.getSymbolsWithAnnotation(JSON_CLASS_NAME)) {
       // For the smart cast

moshi-kotlin-codegen/src/main/java/com/squareup/moshi/kotlin/codegen/ksp/MoshiApiUtil.kt

@@ -77,8 +77,9 @@ internal fun TargetProperty.generator(
     }
   }
 
-  val jsonQualifierSpecs =
-    qualifiers.map { it.toBuilder().useSiteTarget(AnnotationSpec.UseSiteTarget.FIELD).build() }
+  val jsonQualifierSpecs = qualifiers.map {
+    it.toBuilder().useSiteTarget(AnnotationSpec.UseSiteTarget.FIELD).build()
+  }
 
   return PropertyGenerator(this, DelegateKey(type, jsonQualifierSpecs))
 }

moshi-kotlin/src/main/java/com/squareup/moshi/kotlin/reflect/IndexedParameterMap.kt

@@ -10,10 +10,9 @@ internal class IndexedParameterMap(
 
   override val entries: MutableSet<MutableMap.MutableEntry<KtParameter, Any?>>
     get() {
-      val allPossibleEntries =
-        parameterKeys.mapIndexed { index, value ->
-          SimpleEntry<KtParameter, Any?>(value, parameterValues[index])
-        }
+      val allPossibleEntries = parameterKeys.mapIndexed { index, value ->
+        SimpleEntry<KtParameter, Any?>(value, parameterValues[index])
+      }
       return allPossibleEntries.filterTo(mutableSetOf()) { it.value !== ABSENT_VALUE }
     }
 

moshi/src/main/java/com/squareup/moshi/internal/Util.kt

@@ -244,8 +244,9 @@ private fun Type.resolve(
       toResolve is ParameterizedType -> {
         val original = toResolve
         val ownerType: Type? = original.ownerType
-        val newOwnerType =
-          ownerType?.let { ownerType.resolve(context, contextRawType, visitedTypeVariables) }
+        val newOwnerType = ownerType?.let {
+          ownerType.resolve(context, contextRawType, visitedTypeVariables)
+        }
         var changed = newOwnerType !== ownerType
         var args = original.actualTypeArguments
         for (t in args.indices) {