fix(rome_formatter): Printer fill fits (#3307)

* fix(rome_formatter): Printer fill fits * Undo unintended change
rome · Oct 1, 2022 · 1fd9b7b · 1fd9b7b
1 parent 407dbbc
commit 1fd9b7b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/crates/rome_formatter/src/printer/mod.rs b/crates/rome_formatter/src/printer/mod.rs
@@ -382,7 +382,6 @@ impl<'a> Printer<'a> {
                 // variant.
 
                 // Try to fit only the first variant on a single line
-
                 if !matches!(variant.first(), Some(&FormatElement::Tag(Tag::StartEntry))) {
                     return invalid_start_tag(TagKind::Entry, variant.first());
                 }
@@ -438,6 +437,8 @@ impl<'a> Printer<'a> {
         let mut current_fits =
             self.fits_fill_entry(SingleEntryPredicate::default(), queue, stack)?;
 
+        self.state.measured_group_fits = current_fits;
+
         self.print_entry(
             queue,
             stack,
@@ -458,6 +459,8 @@ impl<'a> Printer<'a> {
                 false
             };
 
+            self.state.measured_group_fits = all_fits;
+
             let separator_mode = if all_fits {
                 PrintMode::Flat
             } else {
@@ -480,6 +483,8 @@ impl<'a> Printer<'a> {
                 let next_fits =
                     self.fits_fill_entry(SingleEntryPredicate::default(), queue, stack)?;
 
+                self.state.measured_group_fits = next_fits;
+
                 self.print_entry(
                     queue,
                     stack,

diff --git a/crates/rome_js_formatter/src/jsx/tag/closing_element.rs b/crates/rome_js_formatter/src/jsx/tag/closing_element.rs
@@ -1,6 +1,6 @@
 use crate::prelude::*;
 
-use rome_formatter::{format_args, write};
+use rome_formatter::write;
 use rome_js_syntax::{JsxClosingElement, JsxClosingElementFields};
 
 #[derive(Debug, Clone, Default)]
@@ -21,13 +21,13 @@ impl FormatNodeRule<JsxClosingElement> for FormatJsxClosingElement {
 
         write![
             formatter,
-            [group(&format_args![
+            [
                 l_angle_token.format(),
                 slash_token.format(),
                 name.format(),
                 line_suffix_boundary(),
                 r_angle_token.format(),
-            ])]
+            ]
         ]
     }
 }
diff --git a/crates/rome_js_formatter/src/jsx/tag/opening_element.rs b/crates/rome_js_formatter/src/jsx/tag/opening_element.rs
@@ -66,7 +66,7 @@ impl Format<JsFormatContext> for JsxAnyOpeningElement {
                         line_suffix_boundary(),
                         space(),
                         attributes.format(),
-                        line_suffix_boundary(),
+                        (!attributes.is_empty()).then_some(line_suffix_boundary()),
                         attribute_spacing,
                         format_close
                     ]
@@ -82,7 +82,7 @@ impl Format<JsFormatContext> for JsxAnyOpeningElement {
                             type_arguments.format(),
                             line_suffix_boundary(),
                             soft_line_indent_or_space(&attributes.format()),
-                            line_suffix_boundary(),
+                            (!attributes.is_empty()).then_some(line_suffix_boundary()),
                         ]
                     )?;