Unified: Handle additionalTrailingClosures for more expression kinds

Author: paldepind

unified/extractor/src/languages/swift/swift.rs

@@ -671,7 +671,8 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 calledExpression: (arrayExpr
                     elements: (arrayElement expression: (genericSpecializationExpr) @element)) @@array
                 arguments: _* @args
-                trailingClosure: @tc)
+                trailingClosure: @tc
+                additionalTrailingClosures: _* @additional)
             =>
             call_expr {
                 let callee = tree_at!(
@@ -683,7 +684,8 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 tree!((call_expr
                     callee: {callee}
                     argument: {args}
-                    argument: (argument value: {tc})))
+                    argument: (argument value: {tc})
+                    argument: {additional}))
             }
         ),
         rule!(
@@ -705,12 +707,14 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // A function/method call (`foo(1, 2)`). `calledExpression` is the callee
         // and `arguments` is an (elided) list of `labeledExpr`, each translated
         // to an `argument` below. A trailing closure (`xs.map { … }`) becomes
-        // a final unlabelled argument.
+        // a final unlabelled argument, followed by any additional labeled
+        // trailing closures.
         rule!(
             (functionCallExpr
                 calledExpression: @@rawCallee
                 arguments: _* @args
-                trailingClosure: _? @trailing)
+                trailingClosure: _? @trailing
+                additionalTrailingClosures: _* @additional)
             =>
             expr {
                 // Always translate the callee in non-pattern context.
@@ -722,6 +726,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                     callee: {callee}
                     argument: {args}
                     argument: {trailing.map(|trailing| tree!((argument value: {trailing})))}
+                    argument: {additional}
                 ))
             }
         ),
@@ -1021,9 +1026,17 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // subscripts their own shape needs only a `subscript_expr` node in
         // ast_types.yml and a remap here.
         rule!(
-            (subscriptCallExpr calledExpression: @callee arguments: _* @args)
+            (subscriptCallExpr
+                calledExpression: @callee
+                arguments: _* @args
+                trailingClosure: _? @trailing
+                additionalTrailingClosures: _* @additional)
             =>
-            (call_expr callee: {callee} argument: {args})
+            (call_expr
+                callee: {callee}
+                argument: {args}
+                argument: {trailing.map(|trailing| tree!((argument value: {trailing})))}
+                argument: {additional})
         ),
         // ---- Optionals and errors ----
         // Optional chaining — unwrap the marker

unified/extractor/tests/corpus/swift/expressions/subscript-call.output

@@ -104,8 +104,34 @@ top_level source="⟨body⟩"
           argument:
             argument source="⟨value⟩"
               value: int_literal "0" source="0"
-        call_expr source="⟨callee⟩[⟨argument⟩] {\n  first()\n} completion: {\n  second()\n} failure: {\n  third()\n}"
+        call_expr source="⟨callee⟩[⟨argument⟩] ⟨argument⟩ ⟨argument⟩ ⟨argument⟩"
           callee: identifier "handlers" source="handlers"
           argument:
             argument source="⟨value⟩"
               value: int_literal "0" source="0"
+            argument source="⟨value⟩"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "first" source="first"
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "completion" source="completion"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "second" source="second"
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "failure" source="failure"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "third" source="third"

unified/extractor/tests/corpus/swift/functions/function-call.output

@@ -105,7 +105,7 @@ top_level source="⟨body⟩"
               value: int_literal "1" source="1"
             argument source="⟨value⟩"
               value: int_literal "2" source="2"
-        call_expr source="⟨callee⟩ ⟨argument⟩ completion: {\n  second()\n} failure: {\n  third()\n}"
+        call_expr source="⟨callee⟩ ⟨argument⟩ ⟨argument⟩ ⟨argument⟩"
           callee: identifier "handle" source="handle"
           argument:
             argument source="⟨value⟩"
@@ -116,3 +116,21 @@ top_level source="⟨body⟩"
                       stmt:
                         call_expr source="⟨callee⟩()"
                           callee: identifier "first" source="first"
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "completion" source="completion"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "second" source="second"
+            argument source="⟨name_node⟩: ⟨value⟩"
+              name_node: identifier "failure" source="failure"
+              value:
+                function_expr source="{\n  ⟨body⟩\n}"
+                  body:
+                    block source="⟨stmt⟩"
+                      stmt:
+                        call_expr source="⟨callee⟩()"
+                          callee: identifier "third" source="third"