Merge branch 'master' into jjcnn/move-external-modules-to-root

swayfmt/src/utils/language/expr/mod.rs

@@ -279,7 +279,7 @@ impl Format for Expr {
                     |formatter| -> Result<(), FormatterError> {
                         write!(formatted_code, "{} ", ForToken::AS_STR)?;
                         value_pattern.format(formatted_code, formatter)?;
-                        write!(formatted_code, "{} ", InToken::AS_STR)?;
+                        write!(formatted_code, " {} ", InToken::AS_STR)?;
                         iterator.format(formatted_code, formatter)?;
                         IfExpr::open_curly_brace(formatted_code, formatter)?;
                         block.get().format(formatted_code, formatter)?;

swayfmt/src/utils/language/expr/tests.rs

@@ -264,3 +264,13 @@ intermediate_whitespace
 "{
 let i = 42;
 }");
+
+fmt_test_expr!(basic_for_loop
+"for iter in [0, 1, 7, 8, 15] {
+    let i = 42;
+}",
+intermediate_whitespace
+"for iter in [0, 1, 7, 8, 15]{
+let i = 42;
+}"
+);

swayfmt/tests/mod.rs

@@ -3449,3 +3449,43 @@ fn tuple_field_access() {
         "#},
     );
 }
+
+#[test]
+fn contract_for_loop() {
+    check(
+        indoc! {r#"
+        contract;
+
+        abi MyContract {
+            fn test_function() -> bool;
+        }
+
+        impl MyContract for Contract {
+            fn test_function() -> bool {
+                let mut my_vec: Vec<u64> = Vec::new();
+                for iter in my_vec.iter() {
+
+                }
+
+                true
+            }
+        }
+        "#},
+        indoc! {r#"
+        contract;
+
+        abi MyContract {
+            fn test_function() -> bool;
+        }
+
+        impl MyContract for Contract {
+            fn test_function() -> bool {
+                let mut my_vec: Vec<u64> = Vec::new();
+                for iter in my_vec.iter() {    }
+
+                true
+            }
+        }
+        "#},
+    );
+}