From 2fcbc9b728c4749da69c4af227e3a04037c0fb07 Mon Sep 17 00:00:00 2001
From: Taus <tausbn@github.com>
Date: Mon, 20 Jul 2026 12:00:28 +0000
Subject: [PATCH] unified: Port loop rules to swift-syntax

Retarget loops to the swift-syntax AST, output unchanged: `forStmt` ->
`for_each_stmt` (the optional `where` clause becomes the `guard`),
`whileStmt` -> `while_stmt`, `repeatStmt` -> `do_while_stmt`, and
`labeledStmt` -> `labeled_stmt`. Unlike the tree-sitter grammar,
swift-syntax stores a labeled statement's label and colon as separate
tokens, so the label token is already the bare name (no trailing `:` to
strip). A `repeat`-`while` loop has a single condition in swift-syntax
(not a condition list), so it needs no `and_chain`.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../extractor/src/languages/swift/swift.rs    | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/unified/extractor/src/languages/swift/swift.rs b/unified/extractor/src/languages/swift/swift.rs
index 752e5ae90be..e0c2f66e210 100644
--- a/unified/extractor/src/languages/swift/swift.rs
+++ b/unified/extractor/src/languages/swift/swift.rs
@@ -808,42 +808,42 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // expression (a plain expression statement, e.g. a call, is not wrapped).
         rule!((expressionStmt expression: @e) => expr { e }),
         // ---- Loops ----
-        // For-in loop with optional where-clause guard.
+        // A `for`-`in` loop. The optional `where` clause becomes the `guard`.
         rule!(
-            (for_statement
-                item: @pat
-                collection: @iter
-                where: (where_clause expr: @guard)?
-                body: (block statement: _* @body))
+            (forStmt
+                pattern: @pat
+                sequence: @iter
+                whereClause: (whereClause condition: @guard)?
+                body: @body)
             =>
             (for_each_stmt
                 pattern: {pat}
                 iterable: {iter}
                 guard: {guard}
-                body: (block stmt: {body}))
+                body: {body})
         ),
-        // While loop
+        // A `while` loop.
         rule!(
-            (while_statement condition: _* @cond body: (block statement: _* @body))
+            (whileStmt conditions: _* @cond body: @body)
             =>
             (while_stmt
                 condition: {and_chain(&mut ctx, cond)}
-                body: (block stmt: {body}))
+                body: {body})
         ),
-        // Repeat-while loop
+        // A `repeat { } while c` loop desugars to a `do_while_stmt`.
         rule!(
-            (repeat_while_statement condition: _* @cond body: (block statement: _* @body))
+            (repeatStmt body: @body condition: @cond)
             =>
-            (do_while_stmt
-                condition: {and_chain(&mut ctx, cond)}
-                body: (block stmt: {body}))
+            (do_while_stmt condition: {cond} body: {body})
+        ),
+        // A labeled statement (`outer: for … { }`). swift-syntax stores the
+        // label and colon as separate tokens, so the label token is already the
+        // bare name (no trailing `:` to strip).
+        rule!(
+            (labeledStmt label: @@lbl statement: @stmt)
+            =>
+            (labeled_stmt label: (identifier #{lbl}) stmt: {stmt})
         ),
-        // Labeled statement (e.g. `outer: for ...`). Strip the trailing ':' from the label token.
-        rule!((labeled_statement label: (statement_label) @lbl statement: @stmt) => labeled_stmt {
-            let text = ctx.ast.source_text(lbl);
-            let name = &text[..text.len() - 1];
-            tree!((labeled_stmt label: (identifier #{name}) stmt: {stmt}))
-        }),
         // ---- Collections ----
         // Array literal
         rule!((array_literal element: _* @elems) => (array_literal element: {elems})),