Fix formatting of abi & trait function signatures (#5186)

Closes #4285 What this does: - Adds the necessary information in `Shape` for `FnSignature`'s `Format` implementation, to always format as a `Function`. This bug occurred because `FnSignature` always inherited the parent type's `ExprKind`, meaning it will format correctly so long as the parent type (`ItemFn`) exists. Otherwise it will default to the normal format. - Adds tests for `ItemAbi` & `ItemTrait` - Removes an unnecessary indentation from `ItemImpl` --------- Co-authored-by: Chris O'Brien <[email protected]> Co-authored-by: Sophie Dankel <[email protected]>
FuelLabs · Oct 12, 2023 · 53fd58d · 53fd58d
1 parent 66a4abc
commit 53fd58d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/swayfmt/src/items/item_abi/tests.rs b/swayfmt/src/items/item_abi/tests.rs
@@ -39,3 +39,17 @@ fn hi() -> bool;
     fn hi2(hello: bool);
         fn hi3(hello: bool)-> u64;// here too
 }");
+
+fmt_test_item!(abi_multiline_method
+"abi MyContract {
+    fn complex_function(
+        arg1: MyStruct<[b256; 3], u8>,
+        arg2: [MyStruct<u64, bool>; 4],
+        arg3: (str[5], bool),
+        arg4: MyOtherStruct,
+    ) -> str[6];
+}",
+intermediate_whitespace
+"abi MyContract {
+    fn complex_function(    arg1: MyStruct<[b256;  3], u8> , arg2: [MyStruct <u64, bool>; 4], arg3: ( str[5], bool ), arg4: MyOtherStruct)    -> str[6] ;
+}");
diff --git a/swayfmt/src/items/item_fn/mod.rs b/swayfmt/src/items/item_fn/mod.rs
@@ -129,7 +129,9 @@ impl Format for FnSignature {
         formatter: &mut Formatter,
     ) -> Result<(), FormatterError> {
         formatter.shape.code_line.has_where_clause = formatter.with_shape(
-            formatter.shape,
+            formatter
+                .shape
+                .with_code_line_from(LineStyle::Normal, ExprKind::Function),
             |formatter| -> Result<bool, FormatterError> {
                 let mut fn_sig = FormattedCode::new();
                 let mut fn_args = FormattedCode::new();

diff --git a/swayfmt/src/items/item_impl/mod.rs b/swayfmt/src/items/item_impl/mod.rs
@@ -53,7 +53,6 @@ impl Format for ItemImpl {
             formatter.indent();
             writeln!(formatted_code)?;
             for item in contents.iter() {
-                write!(formatted_code, "{}", formatter.indent_to_str()?,)?;
                 item.format(formatted_code, formatter)?;
                 writeln!(formatted_code)?;
             }

diff --git a/swayfmt/src/items/item_trait/tests.rs b/swayfmt/src/items/item_trait/tests.rs
@@ -92,3 +92,16 @@ intermediate_whitespace
          fn b(self);
     }   "
 );
+fmt_test_item!(trait_multiline_method
+"trait MyComplexTrait {
+    fn complex_function(
+        arg1: MyStruct<[b256; 3], u8>,
+        arg2: [MyStruct<u64, bool>; 4],
+        arg3: (str[5], bool),
+        arg4: MyOtherStruct,
+    ) -> str[6];
+}",
+intermediate_whitespace
+"trait MyComplexTrait {
+    fn complex_function(    arg1: MyStruct<[b256;  3], u8> , arg2: [MyStruct <u64, bool>; 4], arg3: ( str[5], bool ), arg4: MyOtherStruct)    -> str[6] ;
+}");