unified: Fix extraction bug

The special-cased labelExpr rules were simply unnecessary

Author: asgerf

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

@@ -672,33 +672,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 tree!((call_expr callee: {callee} argument: {args}))
             }
         ),
-        // A call or enum-case pattern argument. Both use the shared `argument`
-        // shape, preserving the optional label as `name` and the child as `value`.
-        // The pattern-only shapes (`patternExpr`, `discardAssignmentExpr`) are
-        // matched first; they never occur as ordinary call arguments.
-        rule!(
-            (labeledExpr
-                label: _? @@lbl
-                expression: (functionCallExpr
-                    calledExpression: @constructor
-                    arguments: _* @elements))
-            =>
-            argument {
-                tree!((argument
-                    name_node: (identifier #{lbl})?
-                    value: (call_expr callee: {constructor} argument: {elements})))
-            }
-        ),
-        rule!(
-            (labeledExpr label: _? @@lbl expression: (patternExpr pattern: @p))
-            =>
-            (argument name_node: (identifier #{lbl})? value: {p})
-        ),
-        rule!(
-            (labeledExpr label: _? @@lbl expression: (discardAssignmentExpr) @@wildcard)
-            =>
-            (argument name_node: (identifier #{lbl})? value: (identifier #{wildcard}))
-        ),
+        // A call or enum-case pattern argument.
         rule!(
             (labeledExpr label: _? @@lbl expression: @val)
             =>

unified/ql/test/query-tests/unusedentities/UnusedVariable.expected

@@ -1,2 +1,2 @@
 | test.swift:2:9:2:9 | a | Unused local variable 'a' |
-| test.swift:12:9:12:9 | a | Unused local variable 'a' |
+| test.swift:16:13:16:13 | b | Unused local variable 'b' |

unified/ql/test/query-tests/unusedentities/test.swift

@@ -10,9 +10,9 @@ func t2() -> Int {
         return "df"
     }
     // Note: This currently fails because the trailing closure is not extracted correctly
-    let a = 1 // $ SPURIOUS: Alert
+    let a = 1
     print(foo() { _ in
         print(a)
-        let b = 2 // $ MISSING: Alert[unified/unused-variable]
+        let b = 2 // $ Alert[unified/unused-variable]
     })
 }