refactor: Use LineSuffixBoundary to bound inline comments

Use the `LineSuffixBoundary` for comments instead of having a special case for `LineSuffix` in flat mode.
rome · May 18, 2022 · c1b267a · c1b267a
1 parent 9deb82c
commit c1b267a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/crates/rome_formatter/src/printer/mod.rs b/crates/rome_formatter/src/printer/mod.rs
@@ -605,7 +605,7 @@ fn fits_on_line<'a>(
         pending_indent: printer.state.pending_indent,
         pending_space: printer.state.pending_space,
         line_width: printer.state.line_width,
-        has_line_suffix: printer.state.line_suffixes.len() > 0,
+        has_line_suffix: !printer.state.line_suffixes.is_empty(),
     };
 
     let result = loop {
@@ -747,12 +747,6 @@ fn fits_element_on_line<'a, 'rest>(
         }
 
         FormatElement::LineSuffix(_) => {
-            // The current behavior is to return `false` for all line suffixes if trying to print
-            // something in "flat" mode.
-            if args.mode.is_flat() {
-                return Fits::No;
-            }
-
             state.has_line_suffix = true;
         }
 

diff --git a/crates/rome_js_formatter/src/formatter.rs b/crates/rome_js_formatter/src/formatter.rs
@@ -216,7 +216,10 @@ where
                     ]),
                 ]
             } else {
-                line_suffix(format_elements![space_token(), comment, space_token()])
+                format_elements![
+                    line_suffix(format_elements![space_token(), comment]),
+                    expand_parent()
+                ]
             };
 
             elements.push(crate::comment(content));

diff --git a/crates/rome_js_formatter/src/js/expressions/assignment_expression.rs b/crates/rome_js_formatter/src/js/expressions/assignment_expression.rs
@@ -21,6 +21,7 @@ impl FormatNodeFields<JsAssignmentExpression> for FormatNodeRule<JsAssignmentExp
                 left.format(),
                 space_token(),
                 operator_token.format(),
+                line_suffix_boundary(),
                 group_elements(soft_line_indent_or_space(formatted![
                     formatter,
                     [right.format()]

diff --git a/crates/rome_js_formatter/src/jsx/attribute/expression_attribute_value.rs b/crates/rome_js_formatter/src/jsx/attribute/expression_attribute_value.rs
@@ -64,6 +64,7 @@ impl FormatNodeFields<JsxExpressionAttributeValue> for FormatNodeRule<JsxExpress
             [
                 l_curly_token.format(),
                 formatted_expression,
+                line_suffix_boundary(),
                 r_curly_token.format(),
             ]
         ]?))