Fix formatting precedence of for loop parts.

starkware-libs · Sep 9, 2024 · 582eda1 · 582eda1
1 parent 6679166
commit 582eda1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/corelib/src/test/language_features/for_test.cairo b/corelib/src/test/language_features/for_test.cairo
@@ -21,9 +21,7 @@ fn test_for_loop_array_variables() {
 #[test]
 fn test_for_loop_array_tuples() {
     let mut i = 10;
-    for (
-        x, y
-    ) in array![(10, 10), (11, 11), (12, 12)] {
+    for (x, y) in array![(10, 10), (11, 11), (12, 12)] {
         assert_eq!(x, i);
         assert_eq!(y, i);
         i += 1;

diff --git a/crates/cairo-lang-formatter/src/node_properties.rs b/crates/cairo-lang-formatter/src/node_properties.rs
@@ -299,6 +299,29 @@ impl SyntaxNodeFormat for SyntaxNode {
                 | SyntaxKind::ExprUnary => Some(10),
                 _ => None,
             },
+            Some(SyntaxKind::ExprFor) => match self.kind(db) {
+                SyntaxKind::ExprBlock => Some(1),
+                SyntaxKind::ExprBinary
+                | SyntaxKind::ExprErrorPropagate
+                | SyntaxKind::ExprFieldInitShorthand
+                | SyntaxKind::ExprFunctionCall
+                | SyntaxKind::ExprIf
+                | SyntaxKind::ExprList
+                | SyntaxKind::ExprMatch
+                | SyntaxKind::ExprMissing
+                | SyntaxKind::ExprParenthesized
+                | SyntaxKind::ExprPath
+                | SyntaxKind::ExprStructCtorCall
+                | SyntaxKind::ExprListParenthesized
+                | SyntaxKind::ArgListBraced
+                | SyntaxKind::ArgListBracketed
+                | SyntaxKind::ExprUnary => Some(2),
+                SyntaxKind::PatternEnum
+                | SyntaxKind::PatternTuple
+                | SyntaxKind::PatternStruct
+                | SyntaxKind::PatternFixedSizeArray => Some(3),
+                _ => None,
+            },
             Some(SyntaxKind::StatementLet) => match self.kind(db) {
                 SyntaxKind::ExprBinary
                 | SyntaxKind::ExprBlock