From 2165d8ee8d222226a602ef383c2cba5037a01b2c Mon Sep 17 00:00:00 2001
From: Denis Bezrukov <6227442+denbezrukov@users.noreply.github.com>
Date: Mon, 19 Sep 2022 10:59:00 +0300
Subject: [PATCH] fix(rome_js_formatter): in JSX, some spaces are removed #3211

---
 .../src/jsx/lists/child_list.rs               |  66 +++-
 crates/rome_js_formatter/src/lib.rs           |  12 +-
 crates/rome_js_formatter/src/utils/jsx.rs     | 110 +++++-
 .../tests/specs/jsx/element.jsx               |  59 ++++
 .../tests/specs/jsx/element.jsx.snap          | 117 +++++-
 .../jsx/significant-space/test.js.snap        |  94 +----
 .../jsx/stateless-arrow-fn/test.js.snap       | 300 ----------------
 .../specs/prettier/jsx/text-wrap/test.js.snap | 334 +++---------------
 8 files changed, 392 insertions(+), 700 deletions(-)
 delete mode 100644 crates/rome_js_formatter/tests/specs/prettier/jsx/stateless-arrow-fn/test.js.snap

diff --git a/crates/rome_js_formatter/src/jsx/lists/child_list.rs b/crates/rome_js_formatter/src/jsx/lists/child_list.rs
index ee9b9027b10d..5eaa54e367c4 100644
--- a/crates/rome_js_formatter/src/jsx/lists/child_list.rs
+++ b/crates/rome_js_formatter/src/jsx/lists/child_list.rs
@@ -116,7 +116,7 @@ impl FormatJsxChildList {
                     flat.write(&format_args![word, separator], f);
 
                     if let Some(separator) = separator {
-                        multiline.write(word, &separator, f);
+                        multiline.write_with_separator(word, &separator, f);
                     } else {
                         multiline.write_with_empty_separator(word, f);
                     }
@@ -151,7 +151,7 @@ impl FormatJsxChildList {
                     // </div>
                     // ```
                     else if last.is_none() {
-                        multiline.write(&JsxRawSpace, &hard_line_break(), f);
+                        multiline.write_with_separator(&JsxRawSpace, &hard_line_break(), f);
                     } else {
                         multiline.write_with_empty_separator(&JsxSpace, f);
                     }
@@ -174,7 +174,7 @@ impl FormatJsxChildList {
                 // Any child that isn't text
                 JsxChild::NonText(non_text) => {
                     let line_mode = match children_iter.peek() {
-                        Some(JsxChild::Newline | JsxChild::Word(_) | JsxChild::Whitespace) => {
+                        Some(JsxChild::Word(word)) => {
                             // Break if the current or next element is a self closing element
                             // ```javascript
                             // <pre className="h-screen overflow-y-scroll" />adefg
@@ -184,7 +184,9 @@ impl FormatJsxChildList {
                             // <pre className="h-screen overflow-y-scroll" />
                             // adefg
                             // ```
-                            if matches!(non_text, JsxAnyChild::JsxSelfClosingElement(_)) {
+                            if matches!(non_text, JsxAnyChild::JsxSelfClosingElement(_))
+                                && !word.is_ascii_punctuation()
+                            {
                                 Some(LineMode::Hard)
                             } else {
                                 Some(LineMode::Soft)
@@ -192,28 +194,43 @@ impl FormatJsxChildList {
                         }
 
                         // Add a hard line break if what comes after the element is not a text or is all whitespace
-                        Some(_) => Some(LineMode::Hard),
+                        Some(JsxChild::NonText(_)) => Some(LineMode::Hard),
 
+                        Some(JsxChild::Newline | JsxChild::Whitespace | JsxChild::EmptyLine) => {
+                            None
+                        }
                         // Don't insert trailing line breaks
                         None => None,
                     };
 
                     child_breaks = line_mode.map_or(false, |mode| mode.is_hard());
 
-                    let format_separator = format_with(|f| match line_mode {
-                        Some(mode) => f.write_element(FormatElement::Line(mode)),
-                        None => Ok(()),
+                    let format_separator = line_mode.map(|mode| {
+                        format_with(move |f| f.write_element(FormatElement::Line(mode)))
                     });
 
                     if force_multiline {
-                        multiline.write(&non_text.format(), &format_separator, f);
+                        if let Some(format_separator) = format_separator {
+                            multiline.write_with_separator(
+                                &non_text.format(),
+                                &format_separator,
+                                f,
+                            );
+                        } else {
+                            multiline.write_with_empty_separator(&non_text.format(), f);
+                        }
                     } else {
                         let mut memoized = non_text.format().memoized();
 
                         force_multiline = memoized.inspect(f)?.will_break();
 
-                        flat.write(&format_args![memoized, format_separator], f);
-                        multiline.write(&memoized, &format_separator, f);
+                        if let Some(format_separator) = format_separator {
+                            multiline.write_with_separator(&memoized, &format_separator, f);
+                            flat.write(&format_args![memoized, format_separator], f);
+                        } else {
+                            multiline.write_with_empty_separator(&memoized, f);
+                            flat.write(&format_args![memoized], f);
+                        }
                     }
                 }
             }
@@ -476,19 +493,30 @@ impl MultilineBuilder {
     }
 
     /// Formats an element that does not require a separator
+    /// It is safe to omit the separator because at the call side we must guarantee that we have reached the end of the iterator
+    /// or the next element is a space/newline that should be written into the separator "slot".
     fn write_with_empty_separator(
         &mut self,
         content: &dyn Format<JsFormatContext>,
         f: &mut JsFormatter,
     ) {
-        self.write(content, &format_with(|_| Ok(())), f)
+        self.write(content, None, f);
     }
 
-    fn write(
+    fn write_with_separator(
         &mut self,
         content: &dyn Format<JsFormatContext>,
         separator: &dyn Format<JsFormatContext>,
         f: &mut JsFormatter,
+    ) {
+        self.write(content, Some(separator), f);
+    }
+
+    fn write(
+        &mut self,
+        content: &dyn Format<JsFormatContext>,
+        separator: Option<&dyn Format<JsFormatContext>>,
+        f: &mut JsFormatter,
     ) {
         let result = std::mem::replace(&mut self.result, Ok(Vec::new()));
 
@@ -502,12 +530,18 @@ impl MultilineBuilder {
                         write!(buffer, [content])?;
                         buffer.write_element(FormatElement::Tag(Tag::EndEntry))?;
 
-                        buffer.write_element(FormatElement::Tag(Tag::StartEntry))?;
-                        write!(buffer, [separator])?;
-                        buffer.write_element(FormatElement::Tag(Tag::EndEntry))?;
+                        if let Some(separator) = separator {
+                            buffer.write_element(FormatElement::Tag(Tag::StartEntry))?;
+                            write!(buffer, [separator])?;
+                            buffer.write_element(FormatElement::Tag(Tag::EndEntry))?;
+                        }
                     }
                     MultilineLayout::NoFill => {
                         write!(buffer, [content, separator])?;
+
+                        if let Some(separator) = separator {
+                            write!(buffer, [separator])?;
+                        }
                     }
                 };
                 buffer.into_vec()
diff --git a/crates/rome_js_formatter/src/lib.rs b/crates/rome_js_formatter/src/lib.rs
index 562643ff6f71..840580881248 100644
--- a/crates/rome_js_formatter/src/lib.rs
+++ b/crates/rome_js_formatter/src/lib.rs
@@ -861,10 +861,14 @@ function() {
     // use this test check if your snippet prints as you wish, without using a snapshot
     fn quick_test() {
         let src = r#"
-new Test()
-  .test()
-  .test([, 0])
-  .test();
+const b4 = (
+	<div>
+		Text <a data-very-long-prop-breakline-rome-playground data-other>
+			some link
+		</a>{" "}
+		| some other text,{" "}
+	</div>
+);
 
 "#;
         let syntax = SourceType::jsx();
diff --git a/crates/rome_js_formatter/src/utils/jsx.rs b/crates/rome_js_formatter/src/utils/jsx.rs
index bb91647c55a3..d397655b8f5b 100644
--- a/crates/rome_js_formatter/src/utils/jsx.rs
+++ b/crates/rome_js_formatter/src/utils/jsx.rs
@@ -223,7 +223,7 @@ pub(crate) fn jsx_split_children<I>(
 where
     I: IntoIterator<Item = JsxAnyChild>,
 {
-    let mut result = Vec::new();
+    let mut builder = JsxSplitChildrenBuilder::new();
 
     for child in children.into_iter() {
         match child {
@@ -253,15 +253,15 @@ where
                                     // </div>
                                     // ```
                                     if newlines > 1 {
-                                        result.push(JsxChild::EmptyLine);
+                                        builder.entry(JsxChild::EmptyLine);
                                     }
 
                                     continue;
                                 }
 
-                                result.push(JsxChild::Newline)
-                            } else if !matches!(result.last(), Some(JsxChild::Whitespace)) {
-                                result.push(JsxChild::Whitespace)
+                                builder.entry(JsxChild::Newline)
+                            } else {
+                                builder.entry(JsxChild::Whitespace)
                             }
                         }
                         _ => unreachable!(),
@@ -274,15 +274,15 @@ where
                             // Only handle trailing whitespace. Words must always be joined by new lines
                             if chunks.peek().is_none() {
                                 if whitespace.contains('\n') {
-                                    result.push(JsxChild::Newline);
+                                    builder.entry(JsxChild::Newline);
                                 } else {
-                                    result.push(JsxChild::Whitespace)
+                                    builder.entry(JsxChild::Whitespace)
                                 }
                             }
                         }
 
                         (relative_start, JsxTextChunk::Word(word)) => {
-                            result.push(JsxChild::Word(JsxWord {
+                            builder.entry(JsxChild::Word(JsxWord {
                                 text: value_token
                                     .token_text()
                                     .slice(TextRange::at(relative_start, word.text_len())),
@@ -295,23 +295,50 @@ where
 
             JsxAnyChild::JsxExpressionChild(child) => {
                 if is_whitespace_jsx_expression(&child, comments) {
-                    match result.last() {
-                        Some(JsxChild::Whitespace) => {
-                            // Ignore
-                        }
-                        _ => result.push(JsxChild::Whitespace),
-                    }
+                    builder.entry(JsxChild::Whitespace)
                 } else {
-                    result.push(JsxChild::NonText(child.into()))
+                    builder.entry(JsxChild::NonText(child.into()))
                 }
             }
             child => {
-                result.push(JsxChild::NonText(child));
+                builder.entry(JsxChild::NonText(child));
+            }
+        }
+    }
+
+    Ok(builder.finish())
+}
+
+/// The builder is used to:
+/// 1. Remove [JsxChild::EmptyLine], [JsxChild::Newline], [JsxChild::Whitespace] if a next element is [JsxChild::Whitespace]
+/// 2. Don't push a new element [JsxChild::EmptyLine], [JsxChild::Newline], [JsxChild::Whitespace] if previous one is [JsxChild::EmptyLine], [JsxChild::Newline], [JsxChild::Whitespace]
+/// [Prettier applies]: https://github.com/prettier/prettier/blob/b0d9387b95cdd4e9d50f5999d3be53b0b5d03a97/src/language-js/print/jsx.js#L144-L180
+#[derive(Debug)]
+struct JsxSplitChildrenBuilder {
+    buffer: Vec<JsxChild>,
+}
+
+impl JsxSplitChildrenBuilder {
+    fn new() -> Self {
+        JsxSplitChildrenBuilder { buffer: vec![] }
+    }
+
+    fn entry(&mut self, child: JsxChild) {
+        match self.buffer.last_mut() {
+            Some(last @ (JsxChild::EmptyLine | JsxChild::Newline | JsxChild::Whitespace)) => {
+                if matches!(child, JsxChild::Whitespace) {
+                    *last = child;
+                } else if matches!(child, JsxChild::NonText(_) | JsxChild::Word(_)) {
+                    self.buffer.push(child);
+                }
             }
+            _ => self.buffer.push(child),
         }
     }
 
-    Ok(result)
+    fn finish(self) -> Vec<JsxChild> {
+        self.buffer
+    }
 }
 
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -378,6 +405,17 @@ pub(crate) struct JsxWord {
     source_position: TextSize,
 }
 
+impl JsxWord {
+    pub fn is_ascii_punctuation(&self) -> bool {
+        self.text.chars().count() == 1
+            && self
+                .text
+                .chars()
+                .next()
+                .map_or(false, |char| char.is_ascii_punctuation())
+    }
+}
+
 impl Format<JsFormatContext> for JsxWord {
     fn fmt(&self, f: &mut Formatter<JsFormatContext>) -> FormatResult<()> {
         f.write_element(FormatElement::Text(Text::SyntaxTokenTextSlice {
@@ -645,6 +683,44 @@ mod tests {
         assert_eq!(children[3], JsxChild::Whitespace);
     }
 
+    #[test]
+    fn split_children_remove_in_row_jsx_whitespaces() {
+        let child_list = parse_jsx_children(r#"a{' '}{' '}{' '}c{" "}{' '}{" "}"#);
+
+        let children = jsx_split_children(&child_list, &Comments::default()).unwrap();
+
+        assert_eq!(
+            4,
+            children.len(),
+            "Expected to contain four elements. Actual:\n{children:#?} "
+        );
+        assert_word(&children[0], "a");
+        assert_eq!(children[1], JsxChild::Whitespace);
+        assert_word(&children[2], "c");
+        assert_eq!(children[3], JsxChild::Whitespace);
+    }
+
+    #[test]
+    fn split_children_remove_new_line_before_jsx_whitespaces() {
+        let child_list = parse_jsx_children(
+            r#"a
+            {' '}c{" "}
+            "#,
+        );
+
+        let children = jsx_split_children(&child_list, &Comments::default()).unwrap();
+
+        assert_eq!(
+            4,
+            children.len(),
+            "Expected to contain four elements. Actual:\n{children:#?} "
+        );
+        assert_word(&children[0], "a");
+        assert_eq!(children[1], JsxChild::Whitespace);
+        assert_word(&children[2], "c");
+        assert_eq!(children[3], JsxChild::Whitespace);
+    }
+
     fn assert_word(child: &JsxChild, text: &str) {
         match child {
             JsxChild::Word(word) => {
diff --git a/crates/rome_js_formatter/tests/specs/jsx/element.jsx b/crates/rome_js_formatter/tests/specs/jsx/element.jsx
index 77f6f14a310a..6ddad1660e11 100644
--- a/crates/rome_js_formatter/tests/specs/jsx/element.jsx
+++ b/crates/rome_js_formatter/tests/specs/jsx/element.jsx
@@ -41,6 +41,65 @@ c = <div>a{' '}{' '}{' '}{' '}{' '}{' '}{' '}{' '}b{' '}{' '}{' '}{' '}{' '}{' '
 
 c2 = <div>a{' '}{' '}{' '}{' '}{' '}{' '}{' '}{' '}<div></div>content{' '}{' '}{' '}{' '}{' '}{' '}</div>;
 
+// this group should fit one line jsx whitespaces are hidden
+b =
+	<div>
+		<a></a>
+
+		{' '}
+
+		<a></a>
+
+		{' '}
+		1
+	</div>;
+
+// this group should break first tag and show only first jsx whitespace
+b1 =
+	<div>
+		<a>
+			{`
+12312
+12312
+			`}
+		</a>
+
+		{' '}
+
+		<a></a>
+
+		{' '}
+		1
+	</div>;
+
+// this group fit one line and hide jsx whitespace
+b2 =
+	<>
+		<a>123
+		</a>
+
+		{' '}
+		1
+	</>;
+
+// this group break group and show jsx whitespace
+b3 =
+	<>
+		<a>{`
+123`}
+		</a>
+
+		{' '}
+		1
+	</>;
+
+const b4 = <div>
+	Text <a data-very-long-prop-breakline-rome-playground data-other>
+	some link
+</a>{' '}
+	| some other text,{' '}
+</div>;
+
 <div><div></div><a> jumps over the lazy dog </a></div>;
 
 const Essay = () => <div>The films of Wong Kar-Wai exemplify the synthesis of French New Wave cinema—specifically the unrelenting
diff --git a/crates/rome_js_formatter/tests/specs/jsx/element.jsx.snap b/crates/rome_js_formatter/tests/specs/jsx/element.jsx.snap
index 9878595dcc75..2717805f33e3 100644
--- a/crates/rome_js_formatter/tests/specs/jsx/element.jsx.snap
+++ b/crates/rome_js_formatter/tests/specs/jsx/element.jsx.snap
@@ -46,6 +46,65 @@ c = <div>a{' '}{' '}{' '}{' '}{' '}{' '}{' '}{' '}b{' '}{' '}{' '}{' '}{' '}{' '
 
 c2 = <div>a{' '}{' '}{' '}{' '}{' '}{' '}{' '}{' '}<div></div>content{' '}{' '}{' '}{' '}{' '}{' '}</div>;
 
+// this group should fit one line jsx whitespaces are hidden
+b =
+	<div>
+		<a></a>
+
+		{' '}
+
+		<a></a>
+
+		{' '}
+		1
+	</div>;
+
+// this group should break first tag and show only first jsx whitespace
+b1 =
+	<div>
+		<a>
+			{`
+12312
+12312
+			`}
+		</a>
+
+		{' '}
+
+		<a></a>
+
+		{' '}
+		1
+	</div>;
+
+// this group fit one line and hide jsx whitespace
+b2 =
+	<>
+		<a>123
+		</a>
+
+		{' '}
+		1
+	</>;
+
+// this group break group and show jsx whitespace
+b3 =
+	<>
+		<a>{`
+123`}
+		</a>
+
+		{' '}
+		1
+	</>;
+
+const b4 = <div>
+	Text <a data-very-long-prop-breakline-rome-playground data-other>
+	some link
+</a>{' '}
+	| some other text,{' '}
+</div>;
+
 <div><div></div><a> jumps over the lazy dog </a></div>;
 
 const Essay = () => <div>The films of Wong Kar-Wai exemplify the synthesis of French New Wave cinema—specifically the unrelenting
@@ -296,6 +355,54 @@ c2 = (
 	</div>
 );
 
+// this group should fit one line jsx whitespaces are hidden
+b = (
+	<div>
+		<a></a> <a></a> 1
+	</div>
+);
+
+// this group should break first tag and show only first jsx whitespace
+b1 = (
+	<div>
+		<a>
+			{`
+12312
+12312
+			`}
+		</a>{" "}
+		<a></a> 1
+	</div>
+);
+
+// this group fit one line and hide jsx whitespace
+b2 = (
+	<>
+		<a>123</a> 1
+	</>
+);
+
+// this group break group and show jsx whitespace
+b3 = (
+	<>
+		<a>
+			{`
+123`}
+		</a>{" "}
+		1
+	</>
+);
+
+const b4 = (
+	<div>
+		Text{" "}
+		<a data-very-long-prop-breakline-rome-playground data-other>
+			some link
+		</a>{" "}
+		| some other text,{" "}
+	</div>
+);
+
 <div>
 	<div></div>
 	<a> jumps over the lazy dog </a>
@@ -505,9 +612,9 @@ const breadcrumbItems = [
     2: <div tooltip="A very long tooltip text that would otherwise make the attribute break onto the same line but it is not because of the single string layout"></div>;
     7: 		tooltip="A very long tooltip text that would otherwise make the attribute break
    14: 	<ASuperLongComponentNameThatWouldBreakButDoesntSinceTheComponent></ASuperLongComponentNameThatWouldBreakButDoesntSinceTheComponent>
-  126: 							"ui-monospace,SFMono-Regular,SF Mono,Consolas,Liberation Mono,Menlo,monospace",
-  147: 							"ui-monospace,SFMono-Regular,SF Mono,Consolas,Liberation Mono,Menlo,monospace",
-  160: 							"ui-monospace,SFMono-Regular,SF Mono,Consolas,Liberation Mono,Menlo,monospace",
-  185: 				<pre className="h-screen overflow-y-scroll whitespace-pre-wrap text-red-500 text-xs">
-  234: 		Uncle Boonmee Who Can Recall His Past Lives dir. Apichatpong Weerasethakul{" "}
+  174: 							"ui-monospace,SFMono-Regular,SF Mono,Consolas,Liberation Mono,Menlo,monospace",
+  195: 							"ui-monospace,SFMono-Regular,SF Mono,Consolas,Liberation Mono,Menlo,monospace",
+  208: 							"ui-monospace,SFMono-Regular,SF Mono,Consolas,Liberation Mono,Menlo,monospace",
+  233: 				<pre className="h-screen overflow-y-scroll whitespace-pre-wrap text-red-500 text-xs">
+  282: 		Uncle Boonmee Who Can Recall His Past Lives dir. Apichatpong Weerasethakul{" "}
 
diff --git a/crates/rome_js_formatter/tests/specs/prettier/jsx/significant-space/test.js.snap b/crates/rome_js_formatter/tests/specs/prettier/jsx/significant-space/test.js.snap
index 054555963c5e..1af27e8e61c5 100644
--- a/crates/rome_js_formatter/tests/specs/prettier/jsx/significant-space/test.js.snap
+++ b/crates/rome_js_formatter/tests/specs/prettier/jsx/significant-space/test.js.snap
@@ -89,74 +89,18 @@ not_broken_begin =
 ```diff
 --- Prettier
 +++ Rome
-@@ -12,7 +12,7 @@
+@@ -12,8 +12,9 @@
  
  before_break1 = (
    <span>
 -    <span barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar />{" "}
-+    <span barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar />
-     foo
-   </span>
- );
-@@ -21,15 +21,16 @@
-   <span>
-     <span
-       barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar
--    />{" "}
-+    />
-     foo
-   </span>
- );
- 
- after_break = (
-   <span>
--    foo{" "}
--    <span barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar />
-+    foo <span
+-    foo
++    <span
 +      barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar
-+    />
-   </span>
- );
- 
-@@ -79,7 +80,8 @@
- 
- regression_not_transformed_2 = (
-   <span>
--    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />{" "}
-+    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
-+    {" "}
-   </span>
- );
- 
-@@ -92,13 +94,15 @@
- 
- similar_2 = (
-   <span>
--    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />{" "}
-+    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
-+    {" "}
-   </span>
- );
- 
- similar_3 = (
-   <span>
--    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" /> <Icon icon="" />
-+    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
-+    <Icon icon="" />
++    /> foo
    </span>
  );
  
-@@ -111,7 +115,8 @@
- 
- not_broken_begin = (
-   <div>
--    <br /> long text long text long text long text long text long text long text
--    long text<link>url</link> long text long text
-+    <br />
-+    long text long text long text long text long text long text long text long
-+    text<link>url</link> long text long text
-   </div>
- );
 ```
 
 # Output
@@ -176,8 +120,9 @@ before = (
 
 before_break1 = (
   <span>
-    <span barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar />
-    foo
+    <span
+      barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar
+    /> foo
   </span>
 );
 
@@ -185,16 +130,15 @@ before_break2 = (
   <span>
     <span
       barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar
-    />
+    />{" "}
     foo
   </span>
 );
 
 after_break = (
   <span>
-    foo <span
-      barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar
-    />
+    foo{" "}
+    <span barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar />
   </span>
 );
 
@@ -244,8 +188,7 @@ regression_not_transformed_1 = (
 
 regression_not_transformed_2 = (
   <span>
-    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
-    {" "}
+    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />{" "}
   </span>
 );
 
@@ -258,15 +201,13 @@ similar_1 = (
 
 similar_2 = (
   <span>
-    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
-    {" "}
+    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />{" "}
   </span>
 );
 
 similar_3 = (
   <span>
-    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
-    <Icon icon="" />
+    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" /> <Icon icon="" />
   </span>
 );
 
@@ -279,12 +220,15 @@ not_broken_end = (
 
 not_broken_begin = (
   <div>
-    <br />
-    long text long text long text long text long text long text long text long
-    text<link>url</link> long text long text
+    <br /> long text long text long text long text long text long text long text
+    long text<link>url</link> long text long text
   </div>
 );
 ```
 
 
+# Lines exceeding max width of 80 characters
+```
+   96:     <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />{" "}
+```
 
diff --git a/crates/rome_js_formatter/tests/specs/prettier/jsx/stateless-arrow-fn/test.js.snap b/crates/rome_js_formatter/tests/specs/prettier/jsx/stateless-arrow-fn/test.js.snap
deleted file mode 100644
index bd71e968e673..000000000000
--- a/crates/rome_js_formatter/tests/specs/prettier/jsx/stateless-arrow-fn/test.js.snap
+++ /dev/null
@@ -1,300 +0,0 @@
----
-source: crates/rome_js_formatter/tests/prettier_tests.rs
-info:
-  test_file: jsx/stateless-arrow-fn/test.js
----
-
-# Input
-
-```js
-const render1 = ({ styles }) => (
-  <div style={styles} key="something">
-    Keep the wrapping parens. Put each key on its own line.
-  </div>
-);
-
-const render2 = ({ styles }) => <div style={styles} key="something">
-  Create wrapping parens.
-</div>;
-
-const render3 = ({ styles }) => <div style={styles} key="something">Create wrapping parens.</div>;
-
-const render4 = ({ styles }) => <div style={styles} key="something">Create wrapping parens and indent <strong>all the things</strong>.</div>;
-
-const render5 = ({ styles }) => <div>Keep it on one line.</div>;
-
-const render6 = ({ styles }) => (
-  <div attr1="aaaaaaaaaaaaaaaaa" attr2="bbbbbbbbbbb" attr3="cccccccccccc">
-    <div attr1="aaaaaaaaaaaaaaaaa" attr2="bbbbbbbbbbb" attr3="cccccccccccc" attr4>ddd d dd d d dddd dddd <strong>hello</strong></div>
-    <div attr1="aaaaaaaaaaaaaaaaa" attr2="bbbbbbbbbbb" attr3="cccccccccccc" attr4>ddd d dd d d dddd dddd <strong>hello</strong></div>
-    <div attr1="aaaaaaaaaaaaaaaaa" attr2="bbbbbbbbbbb" attr3="cccccccccccc" attr4>
-      <div attr1="aaaaaaaaaaaaaaaaa" attr2="bbbbbbbbbbb" attr3="cccccccccccc" attr4>ddd d dd d d dddd dddd <strong>hello</strong></div> <strong>hello</strong></div>
-  </div>
-)
-
-const render7 = () =>
-  <div>
-    <span /><span>Dont break each elem onto its own line.</span> <span />
-    <div /> <div />
-  </div>
-
-const render7A = () => (
-  <div>
-    <div /><div /><div />
-  </div>
-)
-
-const render7B = () => (
-  <div>
-    <span> <span/> Dont break plz</span>
-    <span><span/>Dont break plz</span>
-    <span>Dont break plz<span/></span>
-  </div>
-)
-
-const render8 = (props) => <div>{props.text}</div>
-const render9 = (props) => <div>{props.looooooooooooooooooooooooooooooong_text}</div>
-const render10 = (props) => <div>{props.even_looooooooooooooooooooooooooooooooooooooooooonger_contents}</div>
-
-const notJSX = (aaaaaaaaaaaaaaaaa, bbbbbbbbbbb) => this.someLongCallWithParams(aaaaaa, bbbbbbb).anotherLongCallWithParams(cccccccccccc, dddddddddddddddddddddd)
-
-React.render(
-  <BaseForm url="/auth/google" method="GET" colour="blue" size="large" submitLabel="Sign in with Google" />
-  , document.querySelector('#react-root')
-)
-
-
-const renderTernary = (props) =>
-  <BaseForm url="/auth/google" method="GET" colour="blue" size="large" submitLabel="Sign in with Google">
-    {props.showTheThing ?
-      <BaseForm url="/auth/google" method="GET" colour="blue" size="large" submitLabel="Sign in with Google">Hello world</BaseForm>
-      : "hello " + "howdy! "}
-    {props.showTheThing ?
-      <BaseForm url="/auth/google" method="GET" colour="blue" size="large" submitLabel="Sign in with Google">Hello world</BaseForm>
-      :
-      null
-    }
-    {props.showTheThing ? null :
-      <BaseForm url="/auth/google" method="GET" colour="blue" size="large" submitLabel="Sign in with Google">Hello world</BaseForm>
-    }
-    {props.showTheOtherThing ? <div>I am here</div> : <div attr="blah" />}
-    {props.showTheOtherThing ? <div>I am here!!</div> : null}
-  </BaseForm>
-```
-
-
-# Prettier differences
-
-```diff
---- Prettier
-+++ Rome
-@@ -55,7 +55,7 @@
-         attr4
-       >
-         ddd d dd d d dddd dddd <strong>hello</strong>
--      </div>{" "}
-+      </div>
-       <strong>hello</strong>
-     </div>
-   </div>
-@@ -65,7 +65,8 @@
-   <div>
-     <span />
-     <span>Dont break each elem onto its own line.</span> <span />
--    <div /> <div />
-+    <div />
-+    <div />
-   </div>
- );
- 
-@@ -81,7 +82,8 @@
-   <div>
-     <span>
-       {" "}
--      <span /> Dont break plz
-+      <span />
-+      Dont break plz
-     </span>
-     <span>
-       <span />
-```
-
-# Output
-
-```js
-const render1 = ({ styles }) => (
-  <div style={styles} key="something">
-    Keep the wrapping parens. Put each key on its own line.
-  </div>
-);
-
-const render2 = ({ styles }) => (
-  <div style={styles} key="something">
-    Create wrapping parens.
-  </div>
-);
-
-const render3 = ({ styles }) => (
-  <div style={styles} key="something">
-    Create wrapping parens.
-  </div>
-);
-
-const render4 = ({ styles }) => (
-  <div style={styles} key="something">
-    Create wrapping parens and indent <strong>all the things</strong>.
-  </div>
-);
-
-const render5 = ({ styles }) => <div>Keep it on one line.</div>;
-
-const render6 = ({ styles }) => (
-  <div attr1="aaaaaaaaaaaaaaaaa" attr2="bbbbbbbbbbb" attr3="cccccccccccc">
-    <div
-      attr1="aaaaaaaaaaaaaaaaa"
-      attr2="bbbbbbbbbbb"
-      attr3="cccccccccccc"
-      attr4
-    >
-      ddd d dd d d dddd dddd <strong>hello</strong>
-    </div>
-    <div
-      attr1="aaaaaaaaaaaaaaaaa"
-      attr2="bbbbbbbbbbb"
-      attr3="cccccccccccc"
-      attr4
-    >
-      ddd d dd d d dddd dddd <strong>hello</strong>
-    </div>
-    <div
-      attr1="aaaaaaaaaaaaaaaaa"
-      attr2="bbbbbbbbbbb"
-      attr3="cccccccccccc"
-      attr4
-    >
-      <div
-        attr1="aaaaaaaaaaaaaaaaa"
-        attr2="bbbbbbbbbbb"
-        attr3="cccccccccccc"
-        attr4
-      >
-        ddd d dd d d dddd dddd <strong>hello</strong>
-      </div>
-      <strong>hello</strong>
-    </div>
-  </div>
-);
-
-const render7 = () => (
-  <div>
-    <span />
-    <span>Dont break each elem onto its own line.</span> <span />
-    <div />
-    <div />
-  </div>
-);
-
-const render7A = () => (
-  <div>
-    <div />
-    <div />
-    <div />
-  </div>
-);
-
-const render7B = () => (
-  <div>
-    <span>
-      {" "}
-      <span />
-      Dont break plz
-    </span>
-    <span>
-      <span />
-      Dont break plz
-    </span>
-    <span>
-      Dont break plz
-      <span />
-    </span>
-  </div>
-);
-
-const render8 = (props) => <div>{props.text}</div>;
-const render9 = (props) => (
-  <div>{props.looooooooooooooooooooooooooooooong_text}</div>
-);
-const render10 = (props) => (
-  <div>
-    {props.even_looooooooooooooooooooooooooooooooooooooooooonger_contents}
-  </div>
-);
-
-const notJSX = (aaaaaaaaaaaaaaaaa, bbbbbbbbbbb) =>
-  this.someLongCallWithParams(aaaaaa, bbbbbbb).anotherLongCallWithParams(
-    cccccccccccc,
-    dddddddddddddddddddddd,
-  );
-
-React.render(
-  <BaseForm
-    url="/auth/google"
-    method="GET"
-    colour="blue"
-    size="large"
-    submitLabel="Sign in with Google"
-  />,
-  document.querySelector("#react-root"),
-);
-
-const renderTernary = (props) => (
-  <BaseForm
-    url="/auth/google"
-    method="GET"
-    colour="blue"
-    size="large"
-    submitLabel="Sign in with Google"
-  >
-    {props.showTheThing ? (
-      <BaseForm
-        url="/auth/google"
-        method="GET"
-        colour="blue"
-        size="large"
-        submitLabel="Sign in with Google"
-      >
-        Hello world
-      </BaseForm>
-    ) : (
-      "hello " + "howdy! "
-    )}
-    {props.showTheThing ? (
-      <BaseForm
-        url="/auth/google"
-        method="GET"
-        colour="blue"
-        size="large"
-        submitLabel="Sign in with Google"
-      >
-        Hello world
-      </BaseForm>
-    ) : null}
-    {props.showTheThing ? null : (
-      <BaseForm
-        url="/auth/google"
-        method="GET"
-        colour="blue"
-        size="large"
-        submitLabel="Sign in with Google"
-      >
-        Hello world
-      </BaseForm>
-    )}
-    {props.showTheOtherThing ? <div>I am here</div> : <div attr="blah" />}
-    {props.showTheOtherThing ? <div>I am here!!</div> : null}
-  </BaseForm>
-);
-```
-
-
-
diff --git a/crates/rome_js_formatter/tests/specs/prettier/jsx/text-wrap/test.js.snap b/crates/rome_js_formatter/tests/specs/prettier/jsx/text-wrap/test.js.snap
index 03eb80216919..a5a890515dec 100644
--- a/crates/rome_js_formatter/tests/specs/prettier/jsx/text-wrap/test.js.snap
+++ b/crates/rome_js_formatter/tests/specs/prettier/jsx/text-wrap/test.js.snap
@@ -473,147 +473,7 @@ let myDiv = ReactTestUtils.renderIntoDocument(
 ```diff
 --- Prettier
 +++ Rome
-@@ -9,8 +9,10 @@
- // Wrapping tags
- x = (
-   <div>
--    <first>f</first> <first>f</first> <first>f</first> <first>f</first>{" "}
--    <first>f</first> <first>f</first>
-+    <first>f</first> <first>f</first> <first>f</first> <first>f</first> <first>
-+      f
-+    </first>
-+    <first>f</first>
-   </div>
- );
- 
-@@ -32,15 +34,16 @@
-     <a />
-     <b />
-     <c />
--    <first>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</first>{" "}
--    <first>f</first>
-+    <first>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</first> <first>
-+      f
-+    </first>
-   </div>
- );
- 
- // Wrapping tags
- x = (
-   <div>
--    <sadashdkjahsdkjhaskjdhaksjdhkashdkashdkasjhdkajshdkashdkashd />{" "}
-+    <sadashdkjahsdkjhaskjdhaksjdhkashdkashdkasjhdkajshdkashdkashd />
-     <first>f</first>
-   </div>
- );
-@@ -66,15 +69,19 @@
- 
- x = (
-   <div>
--    before {stuff} after {stuff} after {stuff} after {stuff} after {stuff} after{" "}
--    {stuff} {stuff} {stuff} after {stuff} after
-+    before {stuff} after {stuff} after {stuff} after {stuff} after {stuff} after {
-+      stuff
-+    }
-+    {stuff} {stuff} after {stuff} after
-   </div>
- );
- 
- x = (
-   <div>
--    Please state your <b>name</b> and <b>occupation</b> for the board of{" "}
--    <b>school</b> directors.
-+    Please state your <b>name</b> and <b>occupation</b> for the board of <b>
-+      school
-+    </b>
-+    directors.
-   </div>
- );
- 
-@@ -101,9 +108,10 @@
- x = (
-   <font size={-3}>
-     <i>
--      Starting at minute {graphActivity.startTime}, running for{" "}
--      {graphActivity.length} to minute{" "}
--      {graphActivity.startTime + graphActivity.length}
-+      Starting at minute {graphActivity.startTime}, running for {
-+        graphActivity.length
-+      }
-+      to minute {graphActivity.startTime + graphActivity.length}
-     </i>
-   </font>
- );
-@@ -176,19 +184,17 @@
- 
- unstable_before = (
-   <div className="yourScore">
--    Your score:{" "}
--    <span className="score">{`${mini.crosstable.users[sessionUserId]} - ${
--      mini.crosstable.users[user.id]
--    }`}</span>
-+    Your score: <span className="score">{`${
-+      mini.crosstable.users[sessionUserId]
-+    } - ${mini.crosstable.users[user.id]}`}</span>
-   </div>
- );
- 
- unstable_after_first_run = (
-   <div className="yourScore">
--    Your score:{" "}
--    <span className="score">{`${mini.crosstable.users[sessionUserId]} - ${
--      mini.crosstable.users[user.id]
--    }`}</span>
-+    Your score: <span className="score">{`${
-+      mini.crosstable.users[sessionUserId]
-+    } - ${mini.crosstable.users[user.id]}`}</span>
-   </div>
- );
- 
-@@ -213,24 +219,22 @@
- 
- jsx_around_multiline_element = (
-   <div>
--    Before{" "}
--    <div>
-+    Before <div>
-       {
-         "Enough text to make this element wrap on to multiple lines when formatting"
-       }
--    </div>{" "}
-+    </div>
-     After
-   </div>
- );
- 
- jsx_around_multiline_element_second_pass = (
-   <div>
--    Before{" "}
--    <div>
-+    Before <div>
-       {
-         "Enough text to make this element wrap on to multiple lines when formatting"
-       }
--    </div>{" "}
-+    </div>
-     After
-   </div>
- );
-@@ -251,8 +255,11 @@
- const Abc = () => {
-   return (
-     <div>
--      Please state your <b>name</b> and <b>occupation</b> for the board of
--      directors.
-+      Please state your
-+      {" "}<b>name</b>
-+      and
-+      {" "}<b>occupation</b>
-+      for the board of directors.
-     </div>
-   );
- };
-@@ -318,19 +325,25 @@
+@@ -318,7 +318,11 @@
  
  line_after_br_2 = (
    <div>
@@ -626,14 +486,7 @@ let myDiv = ReactTestUtils.renderIntoDocument(
    </div>
  );
  
- br_followed_by_whitespace = (
-   <div>
--    <br /> text
-+    <br />
-+    text
-   </div>
- );
- 
+@@ -331,6 +335,7 @@
  dont_preserve_blank_lines_when_jsx_contains_text = (
    <div>
      <div>Zeroth</div>
@@ -641,71 +494,7 @@ let myDiv = ReactTestUtils.renderIntoDocument(
      <div>First</div>
      Second
    </div>
-@@ -346,15 +359,18 @@
- 
- single_expression_child_tags = (
-   <div>
--    You currently have <strong>{dashboardStr}</strong> and{" "}
--    <strong>{userStr}</strong>
-+    You currently have <strong>{dashboardStr}</strong> and <strong>
-+      {userStr}
-+    </strong>
-   </div>
- );
- 
- expression_does_not_break = (
-   <div>
--    texty text text text text text text text text text text text{" "}
--    {this.props.type}{" "}
-+    texty text text text text text text text text text text text {
-+      this.props.type
-+    }
-+    {" "}
-   </div>
- );
- 
-@@ -362,9 +378,8 @@
- br_triggers_expression_break = (
-   <div>
-     <br />
--    text text text text text text text text text text text {
--      this.props.type
--    }{" "}
-+    text text text text text text text text text text text {this.props.type}
-+    {" "}
-   </div>
- );
- 
-@@ -372,14 +387,14 @@
-   <div>
-     <span a="a" b="b">
-       {variable}
--    </span>{" "}
-+    </span>
-     ({variable})
-   </div>
- );
- 
- x = (
-   <div>
--    ENDS IN <div>text text text text text text text text text text text</div>{" "}
-+    ENDS IN <div>text text text text text text text text text text text</div>
-     HRS
-   </div>
- );
-@@ -404,8 +419,9 @@
-       <div>
-         <div>
-           <div>
--            Line {startRange.row + 1}:{startRange.column + 1} -{" "}
--            {endRange.row + 1}:{endRange.column + 1}
-+            Line {startRange.row + 1}:{startRange.column + 1} - {endRange.row +
-+              1}
-+            :{endRange.column + 1}
-             {caller}
-           </div>
-         </div>
-@@ -436,13 +452,16 @@
+@@ -436,13 +441,16 @@
  
  x = (
    <div>
@@ -724,7 +513,7 @@ let myDiv = ReactTestUtils.renderIntoDocument(
    </div>
  );
  
-@@ -496,19 +515,26 @@
+@@ -496,19 +504,26 @@
  
  x = (
    <div>
@@ -754,7 +543,7 @@ let myDiv = ReactTestUtils.renderIntoDocument(
    </div>
  );
  
-@@ -528,7 +554,8 @@
+@@ -528,7 +543,8 @@
      <span>
        <strong>{name}</strong>’s{" "}
      </span>
@@ -764,16 +553,6 @@ let myDiv = ReactTestUtils.renderIntoDocument(
      <Text>You {type}ed this shipment to</Text>
    </div>
  );
-@@ -564,7 +591,8 @@
- 
- let myDiv = ReactTestUtils.renderIntoDocument(
-   <div>
--    <div key="theDog" className="dog" />,
-+    <div key="theDog" className="dog" />
-+    ,
-     <div key="theBird" className="bird" />
-   </div>,
- );
 ```
 
 # Output
@@ -790,10 +569,8 @@ x = (
 // Wrapping tags
 x = (
   <div>
-    <first>f</first> <first>f</first> <first>f</first> <first>f</first> <first>
-      f
-    </first>
-    <first>f</first>
+    <first>f</first> <first>f</first> <first>f</first> <first>f</first>{" "}
+    <first>f</first> <first>f</first>
   </div>
 );
 
@@ -815,16 +592,15 @@ x = (
     <a />
     <b />
     <c />
-    <first>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</first> <first>
-      f
-    </first>
+    <first>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</first>{" "}
+    <first>f</first>
   </div>
 );
 
 // Wrapping tags
 x = (
   <div>
-    <sadashdkjahsdkjhaskjdhaksjdhkashdkashdkasjhdkajshdkashdkashd />
+    <sadashdkjahsdkjhaskjdhaksjdhkashdkashdkasjhdkajshdkashdkashd />{" "}
     <first>f</first>
   </div>
 );
@@ -850,19 +626,15 @@ x = (
 
 x = (
   <div>
-    before {stuff} after {stuff} after {stuff} after {stuff} after {stuff} after {
-      stuff
-    }
-    {stuff} {stuff} after {stuff} after
+    before {stuff} after {stuff} after {stuff} after {stuff} after {stuff} after{" "}
+    {stuff} {stuff} {stuff} after {stuff} after
   </div>
 );
 
 x = (
   <div>
-    Please state your <b>name</b> and <b>occupation</b> for the board of <b>
-      school
-    </b>
-    directors.
+    Please state your <b>name</b> and <b>occupation</b> for the board of{" "}
+    <b>school</b> directors.
   </div>
 );
 
@@ -889,10 +661,9 @@ function DiffOverview(props) {
 x = (
   <font size={-3}>
     <i>
-      Starting at minute {graphActivity.startTime}, running for {
-        graphActivity.length
-      }
-      to minute {graphActivity.startTime + graphActivity.length}
+      Starting at minute {graphActivity.startTime}, running for{" "}
+      {graphActivity.length} to minute{" "}
+      {graphActivity.startTime + graphActivity.length}
     </i>
   </font>
 );
@@ -965,17 +736,19 @@ this_really_should_split_across_lines = (
 
 unstable_before = (
   <div className="yourScore">
-    Your score: <span className="score">{`${
-      mini.crosstable.users[sessionUserId]
-    } - ${mini.crosstable.users[user.id]}`}</span>
+    Your score:{" "}
+    <span className="score">{`${mini.crosstable.users[sessionUserId]} - ${
+      mini.crosstable.users[user.id]
+    }`}</span>
   </div>
 );
 
 unstable_after_first_run = (
   <div className="yourScore">
-    Your score: <span className="score">{`${
-      mini.crosstable.users[sessionUserId]
-    } - ${mini.crosstable.users[user.id]}`}</span>
+    Your score:{" "}
+    <span className="score">{`${mini.crosstable.users[sessionUserId]} - ${
+      mini.crosstable.users[user.id]
+    }`}</span>
   </div>
 );
 
@@ -1000,22 +773,24 @@ jsx_whitespace_on_newline = (
 
 jsx_around_multiline_element = (
   <div>
-    Before <div>
+    Before{" "}
+    <div>
       {
         "Enough text to make this element wrap on to multiple lines when formatting"
       }
-    </div>
+    </div>{" "}
     After
   </div>
 );
 
 jsx_around_multiline_element_second_pass = (
   <div>
-    Before <div>
+    Before{" "}
+    <div>
       {
         "Enough text to make this element wrap on to multiple lines when formatting"
       }
-    </div>
+    </div>{" "}
     After
   </div>
 );
@@ -1036,11 +811,8 @@ x = (
 const Abc = () => {
   return (
     <div>
-      Please state your
-      {" "}<b>name</b>
-      and
-      {" "}<b>occupation</b>
-      for the board of directors.
+      Please state your <b>name</b> and <b>occupation</b> for the board of
+      directors.
     </div>
   );
 };
@@ -1116,8 +888,7 @@ line_after_br_2 = (
 
 br_followed_by_whitespace = (
   <div>
-    <br />
-    text
+    <br /> text
   </div>
 );
 
@@ -1140,18 +911,15 @@ multiple_expressions = (
 
 single_expression_child_tags = (
   <div>
-    You currently have <strong>{dashboardStr}</strong> and <strong>
-      {userStr}
-    </strong>
+    You currently have <strong>{dashboardStr}</strong> and{" "}
+    <strong>{userStr}</strong>
   </div>
 );
 
 expression_does_not_break = (
   <div>
-    texty text text text text text text text text text text text {
-      this.props.type
-    }
-    {" "}
+    texty text text text text text text text text text text text{" "}
+    {this.props.type}{" "}
   </div>
 );
 
@@ -1159,8 +927,9 @@ expression_does_not_break = (
 br_triggers_expression_break = (
   <div>
     <br />
-    text text text text text text text text text text text {this.props.type}
-    {" "}
+    text text text text text text text text text text text {
+      this.props.type
+    }{" "}
   </div>
 );
 
@@ -1168,14 +937,14 @@ jsx_whitespace_after_tag = (
   <div>
     <span a="a" b="b">
       {variable}
-    </span>
+    </span>{" "}
     ({variable})
   </div>
 );
 
 x = (
   <div>
-    ENDS IN <div>text text text text text text text text text text text</div>
+    ENDS IN <div>text text text text text text text text text text text</div>{" "}
     HRS
   </div>
 );
@@ -1200,9 +969,8 @@ x = (
       <div>
         <div>
           <div>
-            Line {startRange.row + 1}:{startRange.column + 1} - {endRange.row +
-              1}
-            :{endRange.column + 1}
+            Line {startRange.row + 1}:{startRange.column + 1} -{" "}
+            {endRange.row + 1}:{endRange.column + 1}
             {caller}
           </div>
         </div>
@@ -1372,8 +1140,7 @@ this_really_should_split_across_lines = (
 
 let myDiv = ReactTestUtils.renderIntoDocument(
   <div>
-    <div key="theDog" className="dog" />
-    ,
+    <div key="theDog" className="dog" />,
     <div key="theBird" className="bird" />
   </div>,
 );
@@ -1382,9 +1149,10 @@ let myDiv = ReactTestUtils.renderIntoDocument(
 
 # Lines exceeding max width of 80 characters
 ```
-   72:     before {stuff} after {stuff} after {stuff} after {stuff} after {stuff} after {
-  122:     <div attr="a very long string attribute that will overflow because it is very long">
-  224:         "Enough text to make this element wrap on to multiple lines when formatting"
-  235:         "Enough text to make this element wrap on to multiple lines when formatting"
+   69:     before {stuff} after {stuff} after {stuff} after {stuff} after {stuff} after{" "}
+  114:     <div attr="a very long string attribute that will overflow because it is very long">
+  219:         "Enough text to make this element wrap on to multiple lines when formatting"
+  231:         "Enough text to make this element wrap on to multiple lines when formatting"
+  387:     ENDS IN <div>text text text text text text text text text text text</div>{" "}
 ```