Unified: Translate callee in non-pattern context also for calls with

trailing closure

Previously the callee was handled differently depending on whether the
call had a trailing closure. This merges the two rules for
`functionCallExpr` into one to erase the difference.

Author: paldepind

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

@@ -704,23 +704,25 @@ 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; that variant is matched first.
+        // to an `argument` below. A trailing closure (`xs.map { … }`) becomes
+        // a final unlabelled argument.
         rule!(
-            (functionCallExpr calledExpression: @callee arguments: _* @args trailingClosure: @tc)
-            =>
-            (call_expr callee: {callee} argument: {args} argument: (argument value: {tc}))
-        ),
-        rule!(
-            (functionCallExpr calledExpression: @@rawCallee arguments: _* @args)
+            (functionCallExpr
+                calledExpression: @@rawCallee
+                arguments: _* @args
+                trailingClosure: _? @trailing)
             =>
             expr {
                 // Always translate the callee in non-pattern context.
                 let callee = ctx.scoped(|ctx| {
                     ctx.in_pattern = false;
                     ctx.translate(rawCallee)
                 })?;
-                tree!((call_expr callee: {callee} argument: {args}))
+                tree!((call_expr
+                    callee: {callee}
+                    argument: {args}
+                    argument: {trailing.map(|trailing| tree!((argument value: {trailing})))}
+                ))
             }
         ),
         // A call or enum-case pattern argument.

unified/extractor/tests/corpus/swift/control-flow/nested-enum-case-pattern.output

@@ -269,16 +269,8 @@ top_level source="⟨body⟩"
               pattern:
                 call_expr source="⟨callee⟩ ⟨argument⟩"
                   callee:
-                    member_access_expr source="⟨base⟩.⟨member_name_node⟩"
-                      base:
-                        call_expr source="⟨argument⟩?"
-                          callee:
-                            member_access_expr source=""
-                              base: identifier "Optional" source=""
-                              member_name_node: identifier "some" source=""
-                          argument:
-                            argument source="⟨value⟩"
-                              value: identifier "values" source="values"
+                    member_access_expr source="⟨base⟩?.⟨member_name_node⟩"
+                      base: identifier "values" source="values"
                       member_name_node: identifier "map" source="map"
                   argument:
                     argument source="⟨value⟩"