Rebase branch

Author: luissmg

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

@@ -99,8 +99,8 @@ module.exports = {
             return;
           }
 
-          countNewLinesBeforeContent = (child.raw.match(/^\s*\n/g) || []).length;
-          countNewLinesAfterContent = (child.raw.match(/\n\s*$/g) || []).length;
+          countNewLinesBeforeContent = (child.raw.match(/^\s*(\r?\n)/g) || []).length;
+          countNewLinesAfterContent = (child.raw.match(/(\r?\n)\s*$/g) || []).length;
         }
 
         const startLine = child.loc.start.line + countNewLinesBeforeContent;
@@ -201,7 +201,7 @@ module.exports = {
 
         const nodeToReport = details.node;
         const descriptor = details.descriptor;
-        const source = details.source.replace(/(^ +| +(?=\n)*$)/g, '');
+        const source = details.source.replace(/(^ +| +(?=(\r?\n))*$)/g, '');
 
         const leadingSpaceString = details.leadingSpace ? '\n{\' \'}' : '';
         const trailingSpaceString = details.trailingSpace ? '{\' \'}\n' : '';

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

@@ -76,6 +76,18 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
       '  <Foo />',
       '</App>'
     ].join('\n')
+  }, {
+    code: [
+      '<App>',
+      '  <Foo />',
+      '</App>'
+    ].join('\r\n')
+  }, {
+    code: [
+      '<App>',
+      '  <Foo />',
+      '</App>'
+    ].join('\r')
   }, {
     code: [
       '<App>',
@@ -110,6 +122,22 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
       '<Foo />',
       '</App>'
     ].join('\n')
+  }, {
+    code: [
+      '<App',
+      '  foo="bar"',
+      '>',
+      '<Foo />',
+      '</App>'
+    ].join('\r\n')
+  }, {
+    code: [
+      '<App',
+      '  foo="bar"',
+      '>',
+      '<Foo />',
+      '</App>'
+    ].join('\r')
   }, {
     code: [
       '<',
@@ -1250,5 +1278,25 @@ ruleTester.run('jsx-one-expression-per-line', rule, {
     ],
     parser: parsers.BABEL_ESLINT,
     parserOptions
+  }, {
+    code: [
+      '<div>',
+      '  foo {"bar"}',
+      '</div>'
+    ].join('\r\n'),
+    output: [
+      '<div>\r\n',
+      '  foo \n',
+      '{\' \'}\n',
+      '{"bar"}\r\n',
+      '</div>'
+    ].join(''),
+    errors: [
+      {
+        messageId: 'moveToNewLine',
+        data: {descriptor: '{"bar"}'}
+      }
+    ],
+    parserOptions
   }]
 });