Fixes Shape::width bleed from file to file (FuelLabs#2727)

* Fixes width bleed from file to file * remove println, add indent level * rmv testing from previous branch
Kristal1523 · Sep 6, 2022 · f6e3300 · f6e3300
1 parent a989e6c
commit f6e3300
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/swayfmt/src/formatter/mod.rs b/swayfmt/src/formatter/mod.rs
@@ -89,6 +89,7 @@ impl Formatter {
         if !formatted_code.ends_with('\n') {
             writeln!(formatted_code)?;
         }
+        self.shape.reset_width(); // bandaid shape reset TODO:(#2495)
 
         Ok(formatted_code)
     }

diff --git a/swayfmt/src/items/item_fn/mod.rs b/swayfmt/src/items/item_fn/mod.rs
@@ -27,9 +27,14 @@ impl Format for ItemFn {
         formatter: &mut Formatter,
     ) -> Result<(), FormatterError> {
         self.fn_signature.format(formatted_code, formatter)?;
-        Self::open_curly_brace(formatted_code, formatter)?;
-        self.body.get().format(formatted_code, formatter)?;
-        Self::close_curly_brace(formatted_code, formatter)?;
+        let body = self.body.get();
+        if !body.statements.is_empty() || body.final_expr_opt.is_some() {
+            Self::open_curly_brace(formatted_code, formatter)?;
+            self.body.get().format(formatted_code, formatter)?;
+            Self::close_curly_brace(formatted_code, formatter)?;
+        } else {
+            write!(formatted_code, " {{}}")?;
+        }
 
         Ok(())
     }