strip spaces but leave line returns

Author: TSMMark

lib/rules/jsx-one-expression-per-line.js

@@ -87,14 +87,16 @@ module.exports = {
 
           childrenGroupedByLine[line].forEach((child, i) => {
             let prevChild;
+            let nextChild;
+
             if (i === firstIndex) {
               if (line === openingElementEndLine) {
                 prevChild = openingElement;
               }
             } else {
               prevChild = childrenGroupedByLine[line][i - 1];
             }
-            let nextChild;
+
             if (i === lastIndex) {
               if (line === closingElementStartLine) {
                 nextChild = closingElement;
@@ -109,6 +111,7 @@ module.exports = {
                 (child.type === 'Literal' && child.raw.match(/^ /)) ||
                 sourceCode.isSpaceBetweenTokens(prevChild, child);
             }
+
             function spaceBetweenNext () {
               return (nextChild.type === 'Literal' && nextChild.raw.match(/^ /)) ||
                 (child.type === 'Literal' && child.raw.match(/ $/)) ||
@@ -155,18 +158,20 @@ module.exports = {
 
           const nodeToReport = details.node;
           const descriptor = details.descriptor;
-          const source = details.source;
+          const source = details.source.replace(/(^ +| +(?=\n)*$)/g, '');
 
           const leadingSpaceString = details.leadingSpace ? '\n{\' \'}' : '';
           const trailingSpaceString = details.trailingSpace ? '{\' \'}\n' : '';
           const leadingNewLineString = details.leadingNewLine ? '\n' : '';
           const trailingNewLineString = details.trailingNewLine ? '\n' : '';
 
+          const replaceText = `${leadingSpaceString}${leadingNewLineString}${source}${trailingNewLineString}${trailingSpaceString}`;
+
           context.report({
             node: nodeToReport,
             message: `\`${descriptor}\` must be placed on a new line`,
             fix: function (fixer) {
-              return fixer.replaceText(nodeToReport, `${leadingSpaceString}${leadingNewLineString}${source}${trailingNewLineString}${trailingSpaceString}`);
+              return fixer.replaceText(nodeToReport, replaceText);
             }
           });
         });

tests/lib/rules/jsx-one-expression-per-line.js

@@ -132,7 +132,7 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
       '<div>',
       '  {"foo"}',
       '{\' \'}',
-      ' bar',
+      'bar',
       '</div>'
     ].join('\n'),
     errors: [
@@ -377,7 +377,7 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
       '<div>',
       '  <input />',
       '{\' \'}',
-      ' foo',
+      'foo',
       '</div>'
     ].join('\n'),
     errors: [{message: '` foo` must be placed on a new line'}],
@@ -444,7 +444,7 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
       '<div>',
       '  {"foo"}',
       '{\' \'}',
-      ' bar',
+      'bar',
       '</div>'
     ].join('\n'),
     errors: [{message: '` bar` must be placed on a new line'}],
@@ -678,7 +678,7 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
       '  <Foo>',
       '    <Bar>',
       '{\' \'}',
-      ' baz ',
+      'baz',
       '{\' \'}',
       '</Bar>',
       '  </Foo>',
@@ -707,6 +707,24 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
       {message: '` baz` must be placed on a new line'}
     ],
     parserOptions: parserOptions
+  }, {
+    // Would be nice to handle in one pass, but multipass works fine.
+    code: [
+      '<App>',
+      '  foo {"bar"}',
+      '</App>'
+    ].join('\n'),
+    output: [
+      '<App>',
+      '  foo ',
+      '{\' \'}',
+      '{"bar"}',
+      '</App>'
+    ].join('\n'),
+    errors: [
+      {message: '`{"bar"}` must be placed on a new line'}
+    ],
+    parserOptions: parserOptions
   }, {
     // Would be nice to handle in one pass, but multipass works fine.
     code: [
@@ -722,7 +740,7 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
       '{\' \'}',
       '{"bar"}',
       '{\' \'}',
-      ' baz',
+      'baz',
       '</App>'
     ].join('\n'),
     errors: [
@@ -770,7 +788,7 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
       '{\' \'}',
       '{"bar"}',
       '{\' \'}',
-      ' baz',
+      'baz',
       '',
       '</App>'
     ].join('\n'),