Handle lambda destructuring declarations with explicit type

Summary: Fixes #317 Reviewed By: hick209 Differential Revision: D36188965 fbshipit-source-id: 744b503691fea24eb857218786a1191a2f16f4ce
facebook · May 6, 2022 · b7ff8ba · b7ff8ba
1 parent 687b6f7
commit b7ff8ba
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt
@@ -2020,15 +2020,23 @@ class KotlinInputAstVisitor(
     builder.sync(parameter)
     builder.block(ZERO) {
       val destructuringDeclaration = parameter.destructuringDeclaration
+      val typeReference = parameter.typeReference
       if (destructuringDeclaration != null) {
-        visit(destructuringDeclaration)
+        builder.block(ZERO) {
+          visit(destructuringDeclaration)
+          if (typeReference != null) {
+            builder.token(":")
+            builder.space()
+            visit(typeReference)
+          }
+        }
       } else {
         declareOne(
             kind = DeclarationKind.PARAMETER,
             modifiers = parameter.modifierList,
             valOrVarKeyword = parameter.valOrVarKeyword?.text,
             name = parameter.nameIdentifier?.text,
-            type = parameter.typeReference,
+            type = typeReference,
             initializer = parameter.defaultValue)
       }
     }

diff --git a/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt b/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt
@@ -3638,6 +3638,16 @@ class FormatterTest {
       |""".trimMargin(),
           deduceMaxWidth = true)
 
+  @Test
+  fun `handle lambda with destructuring and type`() =
+      assertFormatted(
+          """
+      |fun f() {
+      |  g { (a, b): List<Int> -> a }
+      |  g { (a, b): List<Int>, (c, d): List<Int> -> a }
+      |}
+      |""".trimMargin())
+
   @Test
   fun `handle parenthesis in lambda calls for now`() =
       assertFormatted(