diff --git a/src/doc-builders.js b/src/doc-builders.js
index 0f1526be8175..629d17a5a804 100644
--- a/src/doc-builders.js
+++ b/src/doc-builders.js
@@ -57,6 +57,16 @@ function conditionalGroup(states, opts) {
   );
 }
 
+function fill(parts) {
+  if (parts.length === 0) {
+    return '';
+  }
+
+  parts.forEach(assertDoc);
+
+  return { type: "fill", parts };
+}
+
 function ifBreak(breakContents, flatContents) {
   if (breakContents) {
     assertDoc(breakContents);
@@ -106,6 +116,7 @@ module.exports = {
   literalline,
   group,
   conditionalGroup,
+  fill,
   lineSuffix,
   lineSuffixBoundary,
   breakParent,
diff --git a/src/doc-debug.js b/src/doc-debug.js
index df3dd2794d8a..e0732d2a54d1 100644
--- a/src/doc-debug.js
+++ b/src/doc-debug.js
@@ -101,6 +101,13 @@ function printDoc(doc) {
     );
   }
 
+  if (doc.type === "fill") {
+    return ("fill") +
+      "(" +
+      doc.parts.map(printDoc).join(", ") +
+      ")";
+  }
+
   if (doc.type === "line-suffix") {
     return "lineSuffix(" + printDoc(doc.contents) + ")";
   }
diff --git a/src/doc-printer.js b/src/doc-printer.js
index 7e5acad251c7..a9ab98410d0b 100644
--- a/src/doc-printer.js
+++ b/src/doc-printer.js
@@ -1,5 +1,12 @@
 "use strict";
 
+var docBuilders = require("./doc-builders");
+var concat = docBuilders.concat;
+var line = docBuilders.line;
+var softline = docBuilders.softline;
+var fill = docBuilders.fill;
+var ifBreak = docBuilders.ifBreak;
+
 const MODE_BREAK = 1;
 const MODE_FLAT = 2;
 
@@ -30,7 +37,7 @@ function makeAlign(ind, n) {
   };
 }
 
-function fits(next, restCommands, width) {
+function fits(next, restCommands, width, mustBeFlat = false) {
   let restIdx = restCommands.length;
   const cmds = [next];
   while (width >= 0) {
@@ -70,8 +77,19 @@ function fits(next, restCommands, width) {
 
           break;
         case "group":
+          if (mustBeFlat && doc.break) {
+            return false;
+          }
           cmds.push([ind, doc.break ? MODE_BREAK : mode, doc.contents]);
 
+          break;
+        case "fill":
+          // include number of spaces
+          cmds.push([ind, mode, " ".repeat(doc.parts.length - 1)]);
+          for (var i = doc.parts.length - 1; i >= 0; i--) {
+            cmds.push([ind, mode, doc.parts[i]]);
+          }
+
           break;
         case "if-break":
           if (mode === MODE_BREAK) {
@@ -210,6 +228,51 @@ function printDocToString(doc, options) {
               break;
           }
           break;
+        case "fill":
+          // shouldRemeasure = false;
+          let rem = width - pos;
+
+          const parts = doc.parts;
+          if (parts.length === 1) {
+            cmds.push([ind, MODE_BREAK, parts[0]]);
+            break;
+          }
+
+          const first = parts[0];
+          const second = parts[1];
+          const remaining = parts.slice(1);
+          const firstCmd = [ind, MODE_FLAT, first];
+          const remainingCmd = [ind, MODE_BREAK, fill(remaining)];
+
+          const firstAndSecondCmd = [ind, MODE_FLAT, concat([first, second])];
+
+          if (fits(firstAndSecondCmd, cmds, rem, true)) {
+            // console.log('first and second fit', [first, second]);
+            cmds.push(remainingCmd)
+            cmds.push([ind, MODE_FLAT, line]);
+            cmds.push(firstCmd);
+          } else if (fits(firstCmd, cmds, width - rem, true)) {
+            // console.log('only first fits', [first, second]);
+            cmds.push(remainingCmd)
+            if (typeof second !== 'string' || typeof first !== 'string') {
+              cmds.push([ind, MODE_BREAK, "{' '}"]);
+            }
+            cmds.push([ind, MODE_BREAK, line]);
+            cmds.push(firstCmd);
+          } else {
+            // console.log('neither fit', [first, second]);
+            out.push(newLine + " ".repeat(ind));
+            pos = ind;
+
+            cmds.push(remainingCmd);
+            if (typeof first !== 'string') {
+              cmds.push([ind, MODE_BREAK, line]);
+              cmds.push([ind, MODE_BREAK, "{' '}"]);
+            }
+            cmds.push([ind, MODE_BREAK, line]);
+            cmds.push([ind, MODE_BREAK, first]);
+          }
+          break;
         case "if-break":
           if (mode === MODE_BREAK) {
             if (doc.breakContents) {
diff --git a/src/printer.js b/src/printer.js
index bc31fab36bdd..6543c09e531c 100644
--- a/src/printer.js
+++ b/src/printer.js
@@ -17,6 +17,7 @@ var group = docBuilders.group;
 var indent = docBuilders.indent;
 var align = docBuilders.align;
 var conditionalGroup = docBuilders.conditionalGroup;
+var fill = docBuilders.fill;
 var ifBreak = docBuilders.ifBreak;
 var breakParent = docBuilders.breakParent;
 var lineSuffixBoundary = docBuilders.lineSuffixBoundary;
@@ -2873,62 +2874,88 @@ function printJSXChildren(path, options, print, jsxWhitespace) {
         : util.htmlEscapeInsideAngleBracket(child.value);
       const value = partiallyEscapedValue.replace(/\u00a0/g, " ");
 
-      if (/\S/.test(value)) {
-        // treat each line of text as its own entity
-        value.split(/(\r?\n\s*)/).forEach(line => {
-          const newlines = line.match(/\n/g);
-          if (newlines) {
-            children.push(hardline);
-
-            // allow one extra newline
-            if (newlines.length > 1) {
-              children.push(hardline);
-            }
-            return;
-          }
-
-          const beginSpace = /^\s+/.test(line);
-          if (beginSpace) {
-            children.push(jsxWhitespace);
-            children.push(softline);
-          }
+      // if (/\S/.test(value)) {
+      //   // treat each line of text as its own entity
+      //   value.split(/(\r?\n\s*)/).forEach(line => {
+      //     const newlines = line.match(/\n/g);
+      //     if (newlines) {
+      //       children.push(hardline);
+      //
+      //       // allow one extra newline
+      //       if (newlines.length > 1) {
+      //         children.push(hardline);
+      //       }
+      //       return;
+      //     }
+      //
+      //     const beginSpace = /^\s+/.test(line);
+      //     if (beginSpace) {
+      //       children.push(jsxWhitespace);
+      //       children.push(softline);
+      //     }
+      //
+      //     const stripped = line.replace(/^\s+|\s+$/g, "");
+      //     if (stripped) {
+      //       children.push(stripped);
+      //     }
+      //
+      //     const endSpace = /\s+$/.test(line);
+      //     if (endSpace) {
+      //       children.push(softline);
+      //       children.push(jsxWhitespace);
+      //     }
+      //   });
+      //
+      //   if (!isLineNext(util.getLast(children))) {
+      //     children.push(softline);
+      //   }
+      // } else if (/\n/.test(value)) {
+      //   children.push(hardline);
+      //
+      //   // allow one extra newline
+      //   if (value.match(/\n/g).length > 1) {
+      //     children.push(hardline);
+      //   }
+      // } else if (/\s/.test(value)) {
+      //   // whitespace-only without newlines,
+      //   // eg; a single space separating two elements
+      //   children.push(jsxWhitespace);
+      //   children.push(softline);
+      // }
+
+      value.replace(/^\s+|\s+$/g, "").split(/(\s+)/).forEach(word => {
+        if (word.length === 0) {
+           return;
+        }
 
-          const stripped = line.replace(/^\s+|\s+$/g, "");
-          if (stripped) {
-            children.push(stripped);
-          }
+        const newlines = word.match(/\n/g);
+        if (newlines) {
+          children.push(hardline);
 
-          const endSpace = /\s+$/.test(line);
-          if (endSpace) {
-            children.push(softline);
-            children.push(jsxWhitespace);
+          // allow one extra newline
+          if (newlines.length > 1) {
+            children.push(hardline);
           }
-        });
-
-        if (!isLineNext(util.getLast(children))) {
-          children.push(softline);
+          return;
         }
-      } else if (/\n/.test(value)) {
-        children.push(hardline);
 
-        // allow one extra newline
-        if (value.match(/\n/g).length > 1) {
-          children.push(hardline);
+        const space = /^\s+$/.test(word);
+        if (space) {
+          // children.push(line);
+          return;
         }
-      } else if (/\s/.test(value)) {
-        // whitespace-only without newlines,
-        // eg; a single space separating two elements
-        children.push(jsxWhitespace);
-        children.push(softline);
-      }
+
+        children.push(word);
+      });
+
     } else {
       children.push(print(childPath));
 
-      // add a line unless it's followed by a JSX newline
-      let next = n.children[i + 1];
-      if (!(next && /^\s*\n/.test(next.value))) {
-        children.push(softline);
-      }
+      // // add a line unless it's followed by a JSX newline
+      // let next = n.children[i + 1];
+      // if (!(next && /^\s*\n/.test(next.value))) {
+      //   children.push(softline);
+      // }
     }
   }, "children");
 
@@ -3055,9 +3082,9 @@ function printJSXElement(path, options, print) {
     concat(
       groups.map(
         contents =>
-          (Array.isArray(contents)
-            ? conditionalGroup([concat(contents)])
-            : contents)
+          Array.isArray(contents)
+            ? fill(contents)
+            : contents
       )
     )
   ];
@@ -3076,7 +3103,7 @@ function printJSXElement(path, options, print) {
   }
 
   return conditionalGroup([
-    group(concat([openingLines, concat(children), closingLines])),
+    group(concat([openingLines, fill(children), closingLines])),
     multiLineElem
   ]);
 }
diff --git a/tests/arrows/__snapshots__/jsfmt.spec.js.snap b/tests/arrows/__snapshots__/jsfmt.spec.js.snap
index 823e4548d9ee..d61eaa3946a3 100644
--- a/tests/arrows/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/arrows/__snapshots__/jsfmt.spec.js.snap
@@ -200,14 +200,11 @@ function render() {
 function render() {
   return (
     <View>
-      <Image
-        onProgress={e =>
-          this.setState({
+      <Image onProgress={e => this.setState({
             progress: Math.round(
               100 * e.nativeEvent.loaded / e.nativeEvent.total
             )
-          })}
-      />
+          })} />
     </View>
   );
 }
@@ -215,14 +212,11 @@ function render() {
 function render() {
   return (
     <View>
-      <Image
-        onProgress={e =>
-          this.setState({
+      <Image onProgress={e => this.setState({
             progress: Math.round(
               100 * e.nativeEvent.loaded / e.nativeEvent.total
             )
-          })}
-      />
+          })} />
     </View>
   );
 }
diff --git a/tests/comments/__snapshots__/jsfmt.spec.js.snap b/tests/comments/__snapshots__/jsfmt.spec.js.snap
index 377bb50d83b3..38f6dcd99929 100644
--- a/tests/comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/comments/__snapshots__/jsfmt.spec.js.snap
@@ -489,9 +489,7 @@ Observable.of(process)
   .takeUntil(exit);
 
 // Comments disappear inside of JSX
-<div>
-  {/* Some comment */}
-</div>;
+<div>{/* Some comment */}</div>;
 
 // Comments in JSX tag are placed in a non optimal way
 <div
@@ -590,39 +588,25 @@ exports[`jsx.js 1`] = `
 
 <div>{/*<div>  Some very v  ery very very long line to break line width limit </div>*/}</div>;
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<div>
-  {/* comment */}
-</div>;
+<div>{/* comment */}</div>;
 
-<div>
-  {/* comment */}
-</div>;
+<div>{/* comment */}</div>;
 
-<div>
-  {/* comment
-*/}
-</div>;
+<div>{/* comment
+*/}</div>;
 
-<div>
-  {a /* comment
-*/}
-</div>;
+<div>{a /* comment
+*/}</div>;
 
 <div>
-  {
-    /* comment
+  {/* comment
 */
-    a
-  }
+    a}
 </div>;
 
-<div>
-  {/* comment */}
-</div>;
+<div>{/* comment */}</div>;
 
-<div>
-  {/* comment */}
-</div>;
+<div>{/* comment */}</div>;
 
 <div>
   {
diff --git a/tests/flow/more_react/App.react.js b/tests/flow/more_react/App.react.js
index 9121b661cd2b..a583a3f2b319 100644
--- a/tests/flow/more_react/App.react.js
+++ b/tests/flow/more_react/App.react.js
@@ -33,7 +33,7 @@ var App = React.createClass({
     return (
       <div>
         {foo(x,y)}
-        {foo(z,x)} // error, since z: number
+        {foo(z,x) /* error, since z: number */}
       </div>
     );
   }
diff --git a/tests/flow/more_react/JSX.js b/tests/flow/more_react/JSX.js
index 68a256f9c3e7..0f95738ccb43 100644
--- a/tests/flow/more_react/JSX.js
+++ b/tests/flow/more_react/JSX.js
@@ -5,7 +5,7 @@ var React = require('react');
 var App = require('App.react');
 
 var app =
-  <App y={42}> // error, y: number but foo expects string in App.react
+  <App y={42}> {/* error, y: number but foo expects string in App.react */}
     Some text.
   </App>;
 
diff --git a/tests/flow/more_react/__snapshots__/jsfmt.spec.js.snap b/tests/flow/more_react/__snapshots__/jsfmt.spec.js.snap
index 6afb885f1877..48bb6c5a4dfc 100644
--- a/tests/flow/more_react/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/more_react/__snapshots__/jsfmt.spec.js.snap
@@ -56,7 +56,7 @@ var App = React.createClass({
     return (
       <div>
         {foo(x,y)}
-        {foo(z,x)} // error, since z: number
+        {foo(z,x) /* error, since z: number */}
       </div>
     );
   }
@@ -97,12 +97,7 @@ var App = React.createClass({
 
     //this.state;
 
-    return (
-      <div>
-        {foo(x, y)}
-        {foo(z, x)} // error, since z: number
-      </div>
-    );
+    return <div>{foo(x, y)} {foo(z, x) /* error, since z: number */}</div>;
   }
 });
 
@@ -151,7 +146,7 @@ var React = require('react');
 var App = require('App.react');
 
 var app =
-  <App y={42}> // error, y: number but foo expects string in App.react
+  <App y={42}> {/* error, y: number but foo expects string in App.react */}
     Some text.
   </App>;
 
@@ -164,8 +159,7 @@ var App = require("App.react");
 
 var app = (
   <App y={42}>
-    {" "}// error, y: number but foo expects string in App.react
-    Some text.
+    {/* error, y: number but foo expects string in App.react */} Some text.
   </App>
 );
 
diff --git a/tests/flow/new_react/__snapshots__/jsfmt.spec.js.snap b/tests/flow/new_react/__snapshots__/jsfmt.spec.js.snap
index f7c656269ac1..8b8826f1779f 100644
--- a/tests/flow/new_react/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/new_react/__snapshots__/jsfmt.spec.js.snap
@@ -864,11 +864,7 @@ var ReactClass = React.createClass({
   render: function(): any {
     // Any state access here seems to make state any
     this.state;
-    return (
-      <div>
-        {this.state.bar.qux}
-      </div>
-    );
+    return <div>{this.state.bar.qux}</div>;
   }
 });
 
diff --git a/tests/flow/react/__snapshots__/jsfmt.spec.js.snap b/tests/flow/react/__snapshots__/jsfmt.spec.js.snap
index 702c5b1cc110..b29f9de5f6bd 100644
--- a/tests/flow/react/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/react/__snapshots__/jsfmt.spec.js.snap
@@ -741,11 +741,7 @@ class Bar extends React.Component {
     test: number
   };
   render() {
-    return (
-      <div>
-        {this.props.test}
-      </div>
-    );
+    return <div>{this.props.test}</div>;
   }
 }
 
diff --git a/tests/flow/react_modules/__snapshots__/jsfmt.spec.js.snap b/tests/flow/react_modules/__snapshots__/jsfmt.spec.js.snap
index 8e0c7500940d..b7adaa6f5a4c 100644
--- a/tests/flow/react_modules/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/react_modules/__snapshots__/jsfmt.spec.js.snap
@@ -44,12 +44,7 @@ var HelloLocal = React.createClass({
 
 var Callsite = React.createClass({
   render: function(): React.Element<*> {
-    return (
-      <div>
-        <Hello />
-        <HelloLocal />
-      </div>
-    );
+    return <div><Hello /> <HelloLocal /></div>;
   }
 });
 
@@ -134,12 +129,7 @@ class HelloLocal extends React.Component<void, { name: string }, void> {
 
 class Callsite extends React.Component<void, {}, void> {
   render(): React.Element<*> {
-    return (
-      <div>
-        <Hello />
-        <HelloLocal />
-      </div>
-    );
+    return <div><Hello /> <HelloLocal /></div>;
   }
 }
 
@@ -226,12 +216,7 @@ class HelloLocal extends React.Component<void, Props, void> {
 
 class Callsite extends React.Component<void, Props, void> {
   render(): React.Element<*> {
-    return (
-      <div>
-        <Hello />
-        <HelloLocal />
-      </div>
-    );
+    return <div><Hello /> <HelloLocal /></div>;
   }
 }
 
diff --git a/tests/jsx-multiline-assign/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-multiline-assign/__snapshots__/jsfmt.spec.js.snap
index be5efadce82e..228b7614c3b6 100644
--- a/tests/jsx-multiline-assign/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx-multiline-assign/__snapshots__/jsfmt.spec.js.snap
@@ -22,22 +22,12 @@ const comp4 = <div style={styles} key="something">Create wrapping parens and ind
 const comp5 = <div>Keep it on one line.</div>;
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 const comp1 = (
-  <div style={styles} key="something">
-    Keep the wrapping parens.
-  </div>
+  <div style={styles} key="something">Keep the wrapping parens.</div>
 );
 
-const comp2 = (
-  <div style={styles} key="something">
-    Create wrapping parens.
-  </div>
-);
+const comp2 = <div style={styles} key="something">Create wrapping parens.</div>;
 
-comp2A = (
-  <div style={styles} key="something">
-    Create wrapping parens.
-  </div>
-);
+comp2A = <div style={styles} key="something">Create wrapping parens.</div>;
 
 const comp3 = (
   <div style={styles} key="something">Bump to next line without parens</div>
@@ -45,7 +35,7 @@ const comp3 = (
 
 const comp4 = (
   <div style={styles} key="something">
-    Create wrapping parens and indent <strong>all the things</strong>.
+    Create wrapping parens and indent <strong>all the things</strong> .
   </div>
 );
 
diff --git a/tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap
index 49d995e1c490..71741536c45e 100644
--- a/tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap
@@ -98,8 +98,17 @@ regression_extra_newline_2 = (
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 keep = (
   <p>
-    Welcome to the <strong>Universal React Starter-kyt</strong>.
-    This starter kyt should serve as the base for an advanced,
+    Welcome to 
+the
+    
+<strong
+    >
+      Universal React Starter-kyt
+    </strong>
+    {' '}
+    .
+    This starter kyt should serve as the base for an
+    advanced,
     server-rendered React app.
   </p>
 );
@@ -118,59 +127,31 @@ newlines_text = (
 
 newlines_text_spaced = (
   <div>
-
     space above
 
     space below
-
   </div>
 );
 
 newlines_elems_spaced = (
-  <div>
-
-    <span>space above</span>
-
-    <span>space below</span>
-
-  </div>
+  <div><span>space above</span> <span>space below</span></div>
 );
 
 newlines_mixed = (
   <div>
-    hi
-    <span>there</span>
-
-    how
+    hi <span>there</span> how
 
-    are <strong>you</strong>
-
-    are you fine today?
+    are <strong>you</strong> are you fine today?
   </div>
 );
 
-newlines_elems = (
-  <div>
-    <div>
-
-      <div />
-
-    </div>
-
-    hi
-
-    <div />
-
-    <span />
-
-    <Big />
-
-  </div>
-);
+newlines_elems = <div><div><div /></div> hi <div /> <span /> <Big /></div>;
 
 regression_extra_newline = (
   <div>
-    <span className="nuclide-console-new-messages-notification-icon icon icon-nuclicon-arrow-down" />
+    
+<span className="nuclide-console-new-messages-notification-icon icon icon-nuclicon-arrow-down" />
+    {' '}
     New Messages
   </div>
 );
@@ -178,10 +159,12 @@ regression_extra_newline = (
 regression_extra_newline_2 = (
   <div>
     (
-    <FormattedMessage
+    {' '}
+<FormattedMessage
       id="some-id"
       defaultMessage="some loooooooooooooooooooooooooooong default"
     />
+    {' '}
     )
   </div>
 );
@@ -193,8 +176,6 @@ exports[`windows.js 1`] = `
 Text
 </div>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<div>
-  Text
-</div>;
+<div>Text</div>;
 
 `;
diff --git a/tests/jsx-significant-space/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-significant-space/__snapshots__/jsfmt.spec.js.snap
index e1bb3b167212..2709abe67762 100644
--- a/tests/jsx-significant-space/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx-significant-space/__snapshots__/jsfmt.spec.js.snap
@@ -76,32 +76,28 @@ not_broken_begin =
     <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>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-after = (
-  <span>
-    foo <span>bar</span>
-  </span>
-);
+after = <span>foo <span>bar</span></span>;
 
-before = (
-  <span>
-    <span>bar</span> foo
-  </span>
-);
+before = <span><span>bar</span> foo</span>;
 
 before_break1 = (
   <span>
-    <span barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar />
-    {" "}
+    
+<span
+      barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar
+    />
+    {' '}
     foo
   </span>
 );
 
 before_break2 = (
   <span>
-    <span
+    
+<span
       barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar
     />
-    {" "}
+    {' '}
     foo
   </span>
 );
@@ -109,56 +105,48 @@ before_break2 = (
 after_break = (
   <span>
     foo
-    {" "}
-    <span barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar />
+    {' '}<span
+      barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar
+    />
   </span>
 );
 
-within = (
-  <span>
-    foo <span> bar </span>
-  </span>
-);
+within = <span>foo <span>bar</span></span>;
 
 break_components = (
   <div>
-    <Foo />
-    <Bar>
-      <p>foo<span>bar bar bar</span></p><h1><span><em>yep</em></span></h1>
+    
+<Foo
+    />
+    {' '}
+    
+<Bar
+    >
+      <p>foo <span>bar bar bar</span></p> <h1><span><em>yep</em></span></h1>
     </Bar>
+    {' '}
     <h2>nope</h2>
   </div>
 );
 
-var x = (
-  <div>
-    hello <strong>hi</strong> <foo>sdkflsdfjk</foo>
-  </div>
-);
+var x = <div>hello <strong>hi</strong> <foo>sdkflsdfjk</foo></div>;
 
-nest_plz = (
-  <div>
-    <div>
-      <div />
-    </div>
-  </div>
-);
+nest_plz = <div><div><div /></div></div>;
 
 regression_not_transformed_1 = (
   <span>
-    {" "}<Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
+    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
   </span>
 );
 
 regression_not_transformed_2 = (
   <span>
-    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />{" "}
+    <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
   </span>
 );
 
 similar_1 = (
   <span>
-    {" "}
     <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
   </span>
 );
@@ -166,7 +154,6 @@ similar_1 = (
 similar_2 = (
   <span>
     <Icon icon="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" />
-    {" "}
   </span>
 );
 
@@ -178,22 +165,15 @@ similar_3 = (
 
 not_broken_end = (
   <div>
-    long text long text long text long text long text long text long text long text
-    {" "}
-    <link>url</link>
-    {" "}
-    long text long text
+    long text long text long text long text long text long text long text long
+    text <link>url</link> long text long text
   </div>
 );
 
 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>
 );
 
diff --git a/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap
index b672ecc84e8a..137b0b08fb03 100644
--- a/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap
@@ -80,7 +80,8 @@ long_open_long_children = (
     size="large"
     submitLabel="Sign in with Google"
   >
-    <BaseForm
+    
+<BaseForm
       url="/auth/google"
       method="GET"
       colour="blue"
@@ -89,15 +90,24 @@ long_open_long_children = (
     >
       Hello world
     </BaseForm>
-    <div>
+    {' '}
+    
+<div
+    >
       <div><div><div><div><div>hey hiya how are ya</div></div></div></div></div>
     </div>
-    <div>
+    {' '}
+    
+<div
+    >
       <div>
         <div><div attr="long" attr2="also long" attr3="gonna break" /></div>
       </div>
     </div>
-    <div>
+    {' '}
+    
+<div
+    >
       <div>
         <div>
           <div
@@ -109,22 +119,27 @@ long_open_long_children = (
         </div>
       </div>
     </div>
-    <BaseForm
+    {' '}
+    
+<BaseForm
       url="/auth/google"
       method="GET"
       colour="blue"
       size="large"
       submitLabel="Sign in with Google"
     >
-      <BaseForm
+      
+<BaseForm
         url="/auth/google"
         method="GET"
         colour="blue"
         size="large"
         submitLabel="Sign in with Google"
       />
+      {' '}
       d
     </BaseForm>
+    {' '}
     <BaseForm
       url="/auth/google"
       method="GET"
@@ -145,21 +160,19 @@ long_open_long_children = (
 
 short_closed = <BaseForm url="/auth/google" method="GET" />;
 
-short_open = (
-  <BaseForm url="/auth/google" method="GET">
-    hello
-  </BaseForm>
-);
+short_open = <BaseForm url="/auth/google" method="GET">hello</BaseForm>;
 
 make_self_closing = (
   <div>
-    <BaseForm
+    
+<BaseForm
       url="/auth/google"
       method="GET"
       colour="blue"
       size="large"
       submitLabel="Sign in with Google"
     />
+    {' '}
     <BaseForm
       url="/auth/google"
       method="GET"
@@ -178,7 +191,7 @@ leave_opening = (
     size="large"
     submitLabel="Sign in with Google"
   >
-    {" "}
+
   </BaseForm>
 );
 
diff --git a/tests/jsx-stateless-arrow-fn/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-stateless-arrow-fn/__snapshots__/jsfmt.spec.js.snap
index dd9d578781af..c49afff2e421 100644
--- a/tests/jsx-stateless-arrow-fn/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx-stateless-arrow-fn/__snapshots__/jsfmt.spec.js.snap
@@ -82,9 +82,7 @@ const render1 = ({ styles }) => (
 );
 
 const render2 = ({ styles }) => (
-  <div style={styles} key="something">
-    Create wrapping parens.
-  </div>
+  <div style={styles} key="something">Create wrapping parens.</div>
 );
 
 const render3 = ({ styles }) => (
@@ -93,7 +91,7 @@ const render3 = ({ styles }) => (
 
 const render4 = ({ styles }) => (
   <div style={styles} key="something">
-    Create wrapping parens and indent <strong>all the things</strong>.
+    Create wrapping parens and indent <strong>all the things</strong> .
   </div>
 );
 
@@ -101,7 +99,8 @@ const render5 = ({ styles }) => <div>Keep it on one line.</div>;
 
 const render6 = ({ styles }) => (
   <div attr1="aaaaaaaaaaaaaaaaa" attr2="bbbbbbbbbbb" attr3="cccccccccccc">
-    <div
+    
+<div
       attr1="aaaaaaaaaaaaaaaaa"
       attr2="bbbbbbbbbbb"
       attr3="cccccccccccc"
@@ -109,7 +108,9 @@ const render6 = ({ styles }) => (
     >
       ddd d dd d d dddd dddd <strong>hello</strong>
     </div>
-    <div
+    {' '}
+    
+<div
       attr1="aaaaaaaaaaaaaaaaa"
       attr2="bbbbbbbbbbb"
       attr3="cccccccccccc"
@@ -117,13 +118,15 @@ const render6 = ({ styles }) => (
     >
       ddd d dd d d dddd dddd <strong>hello</strong>
     </div>
+    {' '}
     <div
       attr1="aaaaaaaaaaaaaaaaa"
       attr2="bbbbbbbbbbb"
       attr3="cccccccccccc"
       attr4
     >
-      <div
+      
+<div
         attr1="aaaaaaaaaaaaaaaaa"
         attr2="bbbbbbbbbbb"
         attr3="cccccccccccc"
@@ -131,7 +134,7 @@ const render6 = ({ styles }) => (
       >
         ddd d dd d d dddd dddd <strong>hello</strong>
       </div>
-      {" "}
+      {' '}
       <strong>hello</strong>
     </div>
   </div>
@@ -139,22 +142,17 @@ const render6 = ({ styles }) => (
 
 const render7 = () => (
   <div>
-    <span /><span>Dont break each elem onto its own line.</span> <span />
-    <div /> <div />
+    <span /> <span>Dont break each elem onto its own line.</span> <span />
+    {' '}<div /> <div />
   </div>
 );
 
-const render7A = () => (
-  <div>
-    <div /><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>
+    <span><span /> Dont break plz</span> <span><span /> Dont break plz</span>
+    {' '}<span>Dont break plz <span /></span>
   </div>
 );
 
@@ -193,7 +191,8 @@ const renderTernary = props => (
     size="large"
     submitLabel="Sign in with Google"
   >
-    {props.showTheThing
+    
+{props.showTheThing
       ? <BaseForm
           url="/auth/google"
           method="GET"
@@ -204,7 +203,9 @@ const renderTernary = props => (
           Hello world
         </BaseForm>
       : "hello " + "howdy! "}
-    {props.showTheThing
+    {' '}
+    
+{props.showTheThing
       ? <BaseForm
           url="/auth/google"
           method="GET"
@@ -215,7 +216,9 @@ const renderTernary = props => (
           Hello world
         </BaseForm>
       : null}
-    {props.showTheThing
+    {' '}
+    
+{props.showTheThing
       ? null
       : <BaseForm
           url="/auth/google"
@@ -226,7 +229,12 @@ const renderTernary = props => (
         >
           Hello world
         </BaseForm>}
-    {props.showTheOtherThing ? <div>I am here</div> : <div attr="blah" />}
+    {' '}
+    
+{props.showTheOtherThing
+      ? <div>I am here</div>
+      : <div attr="blah" />}
+    {' '}
     {props.showTheOtherThing ? <div>I am here!!</div> : null}
   </BaseForm>
 );
diff --git a/tests/jsx-text-wrap/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-text-wrap/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000000..818f11bccc6b
--- /dev/null
+++ b/tests/jsx-text-wrap/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,32 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`test.js 1`] = `
+x =
+  <div>
+    A <Monkey foo={bar} baz={qux}>
+      <Title>great and powerful monkey lord</Title>
+    </Monkey> attacked me!
+
+    Please <b>state</b> your first <b>name</b> <i>part</i> address and occupation for the board of directors and let us know if you would very much <i>like</i> them to contact you in future?
+  </div>
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+x = (
+  <div>
+    A
+    {' '}
+<Monkey
+      foo={bar}
+      baz={qux}
+    >
+      <Title>great and powerful monkey lord</Title>
+    </Monkey>
+    {' '}
+    attacked me!
+
+    Please <b>state</b> your first <b>name</b> <i>part</i> address and occupation
+    for the board of directors and let us know if you would very much <i>like</i>
+    {' '}them to contact you in future?
+  </div>
+);
+
+`;
diff --git a/tests/jsx-text-wrap/jsfmt.spec.js b/tests/jsx-text-wrap/jsfmt.spec.js
new file mode 100644
index 000000000000..7580dfab0b75
--- /dev/null
+++ b/tests/jsx-text-wrap/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, null, ["typescript"]);
diff --git a/tests/jsx-text-wrap/test.js b/tests/jsx-text-wrap/test.js
new file mode 100644
index 000000000000..f74f78d831a1
--- /dev/null
+++ b/tests/jsx-text-wrap/test.js
@@ -0,0 +1,8 @@
+x =
+  <div>
+    A <Monkey foo={bar} baz={qux}>
+      <Title>great and powerful monkey lord</Title>
+    </Monkey> attacked me!
+
+    Please <b>state</b> your first <b>name</b> <i>part</i> address and occupation for the board of directors and let us know if you would very much <i>like</i> them to contact you in future?
+  </div>
diff --git a/tests/jsx/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/__snapshots__/jsfmt.spec.js.snap
index 42b9326b0c28..4fe26b3dc5fd 100644
--- a/tests/jsx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx/__snapshots__/jsfmt.spec.js.snap
@@ -88,29 +88,15 @@ exports[`expression.js 1`] = `
   ]}
 />;
 
-<Something>
-  {() => (
-    <SomethingElse>
-      <span />
-    </SomethingElse>
-  )}
-</Something>;
+<Something>{() => <SomethingElse><span /></SomethingElse>}</Something>;
 
 <Something>
-  {items.map(item => (
-    <SomethingElse>
-      <span />
-    </SomethingElse>
-  ))}
+  {items.map(item => <SomethingElse><span /></SomethingElse>)}
 </Something>;
 
 <Something>
   {function() {
-    return (
-      <SomethingElse>
-        <span />
-      </SomethingElse>
-    );
+    return <SomethingElse><span /></SomethingElse>;
   }}
 </Something>;
 
@@ -129,13 +115,7 @@ exports[`expression.js 1`] = `
   value={option}
 />;
 
-<ParentComponent
-  prop={
-    <Child>
-      test
-    </Child>
-  }
-/>;
+<ParentComponent prop={<Child>test</Child>} />;
 
 `;
 
@@ -267,7 +247,7 @@ onClick={() => {
     a;
   }}
 >
-  {header}{showSort}
+  {header} {showSort}
 </td>;
 
 <td
@@ -275,7 +255,11 @@ onClick={() => {
     a;
   }}
 >
-  {header}
+  
+{
+    header
+  }
+  {' '}
   <showSort attr="long long long long long long long long long long long" />
 </td>;
 
diff --git a/tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap b/tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap
index 7764da949082..84f61c33a97c 100644
--- a/tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap
@@ -23,7 +23,7 @@ many_raw_nbsp = <div>   </div>
 amp = <span>foo &amp; bar</span>
 raw_amp = <span>foo & bar</span>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-many_nbsp = <div>&nbsp; &nbsp; </div>;
+many_nbsp = <div>&nbsp; &nbsp;</div>;
 single_nbsp = <div>&nbsp;</div>;
 many_raw_nbsp = <div>&nbsp;&nbsp;&nbsp;</div>;
 amp = <span>foo &amp; bar</span>;
@@ -40,7 +40,7 @@ many_raw_nbsp = <div>   </div>
 amp = <span>foo &amp; bar</span>
 raw_amp = <span>foo & bar</span>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-many_nbsp = <div>&nbsp; &nbsp; </div>;
+many_nbsp = <div>&nbsp; &nbsp;</div>;
 single_nbsp = <div>&nbsp;</div>;
 many_raw_nbsp = <div>&nbsp;&nbsp;&nbsp;</div>;
 
diff --git a/tests/jsx_last_line/__snapshots__/jsfmt.spec.js.snap b/tests/jsx_last_line/__snapshots__/jsfmt.spec.js.snap
index 0ac630489e8f..e7230f07c5a4 100644
--- a/tests/jsx_last_line/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx_last_line/__snapshots__/jsfmt.spec.js.snap
@@ -18,8 +18,7 @@ exports[`last_line.js 1`] = `
   onChange={this.onChange}
   initialValue={this.state.initialValue}
   ignoreStuff={true}>
-  <div>and the children go here</div>
-  <div>and here too</div>
+  <div>and the children go here</div> <div>and here too</div>
 </SomeHighlyConfiguredComponent>;
 
 `;
@@ -43,8 +42,7 @@ exports[`last_line.js 2`] = `
   initialValue={this.state.initialValue}
   ignoreStuff={true}
 >
-  <div>and the children go here</div>
-  <div>and here too</div>
+  <div>and the children go here</div> <div>and here too</div>
 </SomeHighlyConfiguredComponent>;
 
 `;
diff --git a/tests/last_argument_expansion/__snapshots__/jsfmt.spec.js.snap b/tests/last_argument_expansion/__snapshots__/jsfmt.spec.js.snap
index d56fb1305d91..063d3518f650 100644
--- a/tests/last_argument_expansion/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/last_argument_expansion/__snapshots__/jsfmt.spec.js.snap
@@ -283,9 +283,7 @@ const els = items.map(item => (
 ));
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 const els = items.map(item => (
-  <div className="whatever">
-    <span>{children}</span>
-  </div>
+  <div className="whatever"><span>{children}</span></div>
 ));
 
 `;
diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js
index 751a4b313b87..67126e366b97 100644
--- a/tests_config/run_spec.js
+++ b/tests_config/run_spec.js
@@ -53,6 +53,9 @@ function run_spec(dirname, options, additionalParsers) {
             expect(output).toEqual(verifyOutput);
           });
         });
+        //
+        // const doc = prettier.__debug.printToDoc(source, options);
+        // console.log(prettier.__debug.formatDoc(doc));
       }
 
       if (RUN_AST_TESTS) {