Fixed let-else formatting by using higher precedence values. (#8008)

Author: orizi

corelib/src/math.cairo

@@ -47,12 +47,9 @@ pub fn egcd<
 ) -> (T, T, T, bool) {
     let (q, r) = DivRem::<T>::div_rem(a.into(), b);
 
-    let Some(r) = r
-        .try_into() else {
-            return (
-                b.into(), core::num::traits::Zero::zero(), core::num::traits::One::one(), false,
-            );
-        };
+    let Some(r) = r.try_into() else {
+        return (b.into(), core::num::traits::Zero::zero(), core::num::traits::One::one(), false);
+    };
 
     // `sign` (1 for true, -1 for false) is the sign of `g` in the current iteration.
     // 0 is considered negative for this purpose.

corelib/src/poseidon.cairo

@@ -141,10 +141,9 @@ fn _poseidon_hash_span_inner(
     let Some(x) = span.pop_front() else {
         return HashState { s0, s1, s2, odd: false }.finalize();
     };
-    let Some(y) = span
-        .pop_front() else {
-            return HashState { s0: s0 + *x, s1, s2, odd: true }.finalize();
-        };
+    let Some(y) = span.pop_front() else {
+        return HashState { s0: s0 + *x, s1, s2, odd: true }.finalize();
+    };
     let next_state = hades_permutation(s0 + *x, s1 + *y, s2);
     crate::gas::withdraw_gas_all(builtin_costs).expect('Out of gas');
     _poseidon_hash_span_inner(builtin_costs, next_state, ref span)

corelib/src/starknet/storage_access.cairo

@@ -874,8 +874,8 @@ fn inner_byte_array_pointer(address: StorageAddress, chunk: felt252) -> StorageB
 fn inner_read_byte_array(address_domain: u32, address: StorageAddress) -> SyscallResult<ByteArray> {
     let Some::<usize>(len) = starknet::syscalls::storage_read_syscall(address_domain, address)?
         .try_into() else {
-            return Err(array!['Invalid ByteArray length']);
-        };
+        return Err(array!['Invalid ByteArray length']);
+    };
     let (mut remaining_full_words, pending_word_len) = core::DivRem::div_rem(
         len, BYTES_IN_BYTES31.try_into().unwrap(),
     );

crates/cairo-lang-formatter/src/node_properties.rs

@@ -384,7 +384,8 @@ impl SyntaxNodeFormat for SyntaxNode {
                         | SyntaxKind::ExprListParenthesized
                         | SyntaxKind::ArgListBraced
                         | SyntaxKind::ArgListBracketed
-                        | SyntaxKind::ExprUnary => Some(1),
+                        | SyntaxKind::ExprUnary => Some(9),
+                        SyntaxKind::LetElseClause => Some(7),
                         SyntaxKind::TerminalEq => Some(10),
                         SyntaxKind::PatternEnum
                         | SyntaxKind::PatternTuple

crates/cairo-lang-formatter/test_data/cairo_files/linebreaking.cairo

@@ -82,6 +82,14 @@ fn comment_remains_after_last_comma() {
 fn struct_line_breaking() {
     let MyStruct {long_long_long_long_key_a, long_long_long_long_key_b, long_long_long_long_key_c, long_long_long_long_key_d, long_long_long_long_key_e, } = my_val;
 }
+fn let_else_line_breaking() {
+    let MyEnum::MyVariant(info) = my_val
+        .calc0()
+        .calc1()
+        .calc2() else {
+            return rather_long_return_value;
+        };
+}
 fn closure_line_breaking() {
     let closure_with_a_very_very_very_very_very_very_very_very_large_name = |left: usize, right: usize| -> usize {
             left + right

crates/cairo-lang-formatter/test_data/expected_results/linebreaking.cairo

@@ -306,6 +306,11 @@ fn struct_line_breaking() {
         long_long_long_long_key_e,
     } = my_val;
 }
+fn let_else_line_breaking() {
+    let MyEnum::MyVariant(info) = my_val.calc0().calc1().calc2() else {
+        return rather_long_return_value;
+    };
+}
 fn closure_line_breaking() {
     let closure_with_a_very_very_very_very_very_very_very_very_large_name = |
         left: usize, right: usize,

crates/cairo-lang-starknet/cairo_level_tests/storage_access.cairo

@@ -240,32 +240,24 @@ fn test_storage_vec_of_vecs() {
 fn test_enum_sub_pointers() {
     let mut state = test_contract::contract_state_for_testing();
     state.queryable_enum.write(QueryableEnum::A);
-    let QueryableEnumVariants::A(_) = (@state)
-        .queryable_enum
-        .sub_pointers() else {
-            panic!("expected QueryableEnumVariants::A(_)");
-        };
+    let QueryableEnumVariants::A(_) = (@state).queryable_enum.sub_pointers() else {
+        panic!("expected QueryableEnumVariants::A(_)");
+    };
     state.queryable_enum.write(QueryableEnum::B(123_u128));
-    let QueryableEnumVariants::B(ptr) = (@state)
-        .queryable_enum
-        .sub_pointers() else {
-            panic!("expected QueryableEnumVariants::B(_)");
-        };
+    let QueryableEnumVariants::B(ptr) = (@state).queryable_enum.sub_pointers() else {
+        panic!("expected QueryableEnumVariants::B(_)");
+    };
     assert_eq!(ptr.read(), 123);
     state.queryable_enum.write(QueryableEnum::C(456_u256));
-    let QueryableEnumVariants::C(ptr) = (@state)
-        .queryable_enum
-        .sub_pointers() else {
-            panic!("expected QueryableEnumVariants::C(_)");
-        };
+    let QueryableEnumVariants::C(ptr) = (@state).queryable_enum.sub_pointers() else {
+        panic!("expected QueryableEnumVariants::C(_)");
+    };
     assert_eq!(ptr.low.read(), 456);
     assert_eq!(ptr.high.read(), 0);
     state.queryable_enum.write(QueryableEnum::C(789_u256));
-    let QueryableEnumVariants::C(ptr) = (@state)
-        .queryable_enum
-        .sub_pointers() else {
-            panic!("expected QueryableEnumVariants::C(_)");
-        };
+    let QueryableEnumVariants::C(ptr) = (@state).queryable_enum.sub_pointers() else {
+        panic!("expected QueryableEnumVariants::C(_)");
+    };
     assert_eq!(ptr.low.read(), 789);
     assert_eq!(ptr.high.read(), 0);
 }