Unified: Fix locations of synthesized array types

Anchor synthesized generic type expressions for Swift array syntax to the original array node. This keeps the closing bracket in the type range without leaking it into surrounding calls or member accesses.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: tausbn

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

@@ -648,27 +648,41 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // `Array<T>` generic type constructor instead.
         rule!(
             (functionCallExpr
-                calledExpression: (arrayExpr elements: (arrayElement expression: (genericSpecializationExpr) @element))
+                calledExpression: (arrayExpr
+                    elements: (arrayElement expression: (genericSpecializationExpr) @element)) @@array
                 arguments: _* @args
                 trailingClosure: @tc)
             =>
-            (call_expr
-                callee: (generic_type_expr
+            call_expr {
+                let callee = tree_at!(
+                    ctx,
+                    array,
+                    (generic_type_expr
                     base: (identifier "Array")
                     type_argument: {element})
-                argument: {args}
-                argument: (argument value: {tc}))
+                );
+                tree!((call_expr
+                    callee: {callee}
+                    argument: {args}
+                    argument: (argument value: {tc})))
+            }
         ),
         rule!(
             (functionCallExpr
-                calledExpression: (arrayExpr elements: (arrayElement expression: (genericSpecializationExpr) @element))
+                calledExpression: (arrayExpr
+                    elements: (arrayElement expression: (genericSpecializationExpr) @element)) @@array
                 arguments: _* @args)
             =>
-            (call_expr
-                callee: (generic_type_expr
+            call_expr {
+                let callee = tree_at!(
+                    ctx,
+                    array,
+                    (generic_type_expr
                     base: (identifier "Array")
                     type_argument: {element})
-                argument: {args})
+                );
+                tree!((call_expr callee: {callee} argument: {args}))
+            }
         ),
         // A function/method call (`foo(1, 2)`). `calledExpression` is the callee
         // and `arguments` is an (elided) list of `labeledExpr`, each translated
@@ -739,14 +753,22 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // meaning as `Array<T>` rather than an array literal.
         rule!(
             (memberAccessExpr
-                base: (arrayExpr elements: (arrayElement expression: (genericSpecializationExpr) @element))
+                base: (arrayExpr
+                    elements: (arrayElement expression: (genericSpecializationExpr) @element)) @@array
                 declName: (declReferenceExpr baseName: @member))
             =>
-            (member_access_expr
-                base: (generic_type_expr
-                    base: (identifier "Array")
-                    type_argument: {element})
-                member_name_node: (identifier #{member}))
+            member_access_expr {
+                let base = tree_at!(
+                    ctx,
+                    array,
+                    (generic_type_expr
+                        base: (identifier "Array")
+                        type_argument: {element})
+                );
+                tree!((member_access_expr
+                    base: {base}
+                    member_name_node: (identifier #{member})))
+            }
         ),
         rule!(
             (memberAccessExpr base: @base declName: (declReferenceExpr baseName: @member))

unified/extractor/tests/corpus/swift/expressions/array-type-constructor.output

@@ -132,9 +132,9 @@ top_level source="⟨body⟩"
           modifier: modifier "let" source="let"
           pattern: identifier "values" source="values"
           value:
-            call_expr source="⟨callee⟩]()"
+            call_expr source="⟨callee⟩()"
               callee:
-                generic_type_expr source="[⟨type_argument⟩"
+                generic_type_expr source="[⟨type_argument⟩]"
                   base: identifier "Array" source=""
                   type_argument:
                     generic_type_expr source="⟨base⟩<⟨type_argument⟩>"
@@ -144,9 +144,9 @@ top_level source="⟨body⟩"
           modifier: modifier "let" source="let"
           pattern: identifier "initialized" source="initialized"
           value:
-            call_expr source="⟨callee⟩](⟨argument⟩) ⟨argument⟩"
+            call_expr source="⟨callee⟩(⟨argument⟩) ⟨argument⟩"
               callee:
-                generic_type_expr source="[⟨type_argument⟩"
+                generic_type_expr source="[⟨type_argument⟩]"
                   base: identifier "Array" source=""
                   type_argument:
                     generic_type_expr source="⟨base⟩<⟨type_argument⟩>"

unified/extractor/tests/corpus/swift/expressions/array-type-metatype.output

@@ -56,9 +56,9 @@ top_level source="⟨body⟩"
           modifier: modifier "let" source="let"
           pattern: identifier "type" source="type"
           value:
-            member_access_expr source="⟨base⟩].⟨member_name_node⟩"
+            member_access_expr source="⟨base⟩.⟨member_name_node⟩"
               base:
-                generic_type_expr source="[⟨type_argument⟩"
+                generic_type_expr source="[⟨type_argument⟩]"
                   base: identifier "Array" source=""
                   type_argument:
                     generic_type_expr source="⟨base⟩<⟨type_argument⟩>"