fixup! Simplify advance_to_first_block_item

Author: ayazhafiz

src/formatting/items.rs

@@ -868,20 +868,16 @@ pub(crate) fn format_impl(
                 .first()
                 .map(|a| a.span.lo())
                 .or_else(|| items.first().map(|i| i.span().lo()));
-            let opening_nls = visitor.advance_to_first_block_item(first_non_ws);
+            if let Some(opening_nls) = visitor.advance_to_first_block_item(first_non_ws) {
+                result.push_str(&opening_nls);
+            }
 
             visitor.visit_attrs(&item.attrs, ast::AttrStyle::Inner);
             visitor.visit_impl_items(items);
 
             visitor.format_missing(item.span.hi() - BytePos(1));
 
-            let inner_indent_str = if let Some(opening_nls) = opening_nls {
-                result.push_str(&opening_nls);
-                visitor.block_indent.to_string(context.config)
-            } else {
-                visitor.block_indent.to_string_with_newline(context.config)
-            };
-
+            let inner_indent_str = visitor.block_indent.to_string_with_newline(context.config);
             let outer_indent_str = offset.block_only().to_string_with_newline(context.config);
 
             result.push_str(&inner_indent_str);
@@ -1235,21 +1231,19 @@ 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 opening_nls =
-                visitor.advance_to_first_block_item(trait_items.first().map(|i| i.span().lo()));
+            if let Some(opening_nls) =
+                visitor.advance_to_first_block_item(trait_items.first().map(|i| i.span().lo()))
+            {
+                result.push_str(&opening_nls);
+            }
 
             for item in trait_items {
                 visitor.visit_trait_item(item);
             }
 
             visitor.format_missing(item.span.hi() - BytePos(1));
 
-            let inner_indent_str = if let Some(opening_nls) = opening_nls {
-                result.push_str(&opening_nls);
-                visitor.block_indent.to_string(context.config)
-            } else {
-                visitor.block_indent.to_string_with_newline(context.config)
-            };
+            let inner_indent_str = visitor.block_indent.to_string_with_newline(context.config);
 
             result.push_str(&inner_indent_str);
             result.push_str(visitor.buffer.trim());

src/formatting/visitor.rs

@@ -230,6 +230,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                 if snippet.find('\n') != snippet.rfind('\n') {
                     let mut lines = snippet.lines().map(&str::trim);
                     lines.next(); // Eat block-opening newline
+                    lines.next_back(); // Eat newline before the first item
                     let mut result = String::new();
                     while let Some("") = lines.next() {
                         result.push('\n');
@@ -1001,6 +1002,9 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                     .or_else(|| m.items.first().map(|s| s.span().lo()));
                 if let Some(opening_nls) = self.advance_to_first_block_item(first_non_ws) {
                     self.push_str(&opening_nls);
+                    if attrs.is_empty() {
+                        self.push_str("\n");
+                    }
                 }
 
                 self.visit_attrs(attrs, ast::AttrStyle::Inner);