fixup! Configuration option to preserve blank lines at start of block

Author: ayazhafiz

src/formatting/items.rs

@@ -342,7 +342,7 @@ impl<'a> FmtVisitor<'a> {
                 self.push_str(&indent_str);
             } else {
                 let first_non_ws = item.body.first().map(|s| s.span().lo());
-                let opening_nls = &self.trim_spaces_after_opening_brace(first_non_ws);
+                let opening_nls = &self.advance_to_first_block_item(first_non_ws);
                 self.push_str(&opening_nls);
 
                 for item in &item.body {
@@ -866,11 +866,11 @@ pub(crate) fn format_impl(
             visitor.block_indent = item_indent;
             visitor.last_pos = lo + BytePos(open_pos as u32);
 
-            let open_nls = &visitor.trim_spaces_after_opening_brace(
+            let open_nls = &visitor.advance_to_first_block_item(
                 inner_attributes(&item.attrs)
                     .first()
                     .map(|a| a.span.lo())
-                    .or(items.first().map(|i| i.span().lo())),
+                    .or_else(|| items.first().map(|i| i.span().lo())),
             );
 
             visitor.visit_attrs(&item.attrs, ast::AttrStyle::Inner);
@@ -1234,8 +1234,8 @@ pub(crate) fn format_trait(
             visitor.block_indent = offset.block_only().block_indent(context.config);
             visitor.last_pos = block_span.lo() + BytePos(open_pos as u32);
 
-            let open_nls = &visitor
-                .trim_spaces_after_opening_brace(trait_items.first().map(|i| i.span().lo()));
+            let open_nls =
+                &visitor.advance_to_first_block_item(trait_items.first().map(|i| i.span().lo()));
 
             for item in trait_items {
                 visitor.visit_trait_item(item);

src/formatting/visitor.rs

@@ -180,11 +180,12 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
         }
     }
 
-    /// Remove spaces between the opening brace and the first statement or the inner attribute
-    /// of the block, fast-forwarding this position of the visitor.
+    /// Advances the position of the visitor to the first statement or the inner attribute of a
+    /// block.
+    ///
     /// If `preserve_block_start_blank_lines` is true, the return value contains the newlines that
     /// should be preserved.
-    pub(crate) fn trim_spaces_after_opening_brace(
+    pub(crate) fn advance_to_first_block_item(
         &mut self,
         first_item_pos: Option<BytePos>,
     ) -> String {
@@ -266,9 +267,9 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
         self.push_str("{");
 
         let first_non_ws = inner_attrs
-            .and_then(|attrs| inner_attributes(attrs).first().map(|attr| attr.span.lo()))
-            .or(b.stmts.first().map(|s| s.span().lo()));
-        let opening_nls = &self.trim_spaces_after_opening_brace(first_non_ws);
+            .and_then(|attrs| attrs.first().map(|attr| attr.span.lo()))
+            .or_else(|| b.stmts.first().map(|s| s.span().lo()));
+        let opening_nls = &self.advance_to_first_block_item(first_non_ws);
         self.push_str(&opening_nls);
 
         // Format inner attributes if available.
@@ -993,8 +994,8 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                 let first_non_ws = inner_attributes(attrs)
                     .first()
                     .map(|attr| attr.span.lo())
-                    .or(m.items.first().map(|s| s.span().lo()));
-                let opening_nls = &self.trim_spaces_after_opening_brace(first_non_ws);
+                    .or_else(|| m.items.first().map(|s| s.span().lo()));
+                let opening_nls = &self.advance_to_first_block_item(first_non_ws);
                 self.push_str(&opening_nls);
 
                 self.visit_attrs(attrs, ast::AttrStyle::Inner);