Merge c65bfd7 into 82b3aa9

jsx-eslint · Jun 4, 2016 · 630cc87 · 630cc87
2 parents 82b3aa9 + c65bfd7
commit 630cc87
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 5 deletions.
diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
@@ -159,6 +159,18 @@ module.exports = function(context) {
       }
       var peerElementIndent = getNodeIndent(node.parent.openingElement);
       checkNodesIndent(node, peerElementIndent);
+    },
+    ReturnStatement: function(node) {
+      if (!node.parent) {
+        return;
+      }
+
+      var openingIndent = getNodeIndent(node);
+      var closingIndent = getNodeIndent(node, true);
+
+      if (closingIndent !== openingIndent) {
+        report(node, openingIndent, closingIndent);
+      }
     }
   };
 

diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
@@ -99,6 +99,26 @@ ruleTester.run('jsx-indent', rule, {
     ].join('\n'),
     options: [2],
     parserOptions: parserOptions
+  }, {
+    code: [
+      'function App() {',
+      '  return (',
+      '    <App />',
+      '  );',
+      '}'
+    ].join('\n'),
+    options: [2],
+    parserOptions: parserOptions
+  }, {
+    code: [
+      'function App() {',
+      '  return <App>',
+      '    <Foo />',
+      '  </App>;',
+      '}'
+    ].join('\n'),
+    options: [2],
+    parserOptions: parserOptions
   }],
 
   invalid: [{
@@ -137,18 +157,23 @@ ruleTester.run('jsx-indent', rule, {
     ].join('\n'),
     options: [2],
     parserOptions: parserOptions,
-    errors: [{message: 'Expected indentation of 2 space characters but found 9.'}]
+    errors: [
+      {message: 'Expected indentation of 2 space characters but found 9.'},
+      {message: 'Expected indentation of 2 space characters but found 9.'}
+    ]
   }, {
     code: [
       'function App() {',
-      '  return (<App>',
-      '    <Foo />',
-      '    </App>);',
+      '  return (',
+      '    <App>',
+      '      <Foo />',
+      '      </App>',
+      '  );',
       '}'
     ].join('\n'),
     options: [2],
     parserOptions: parserOptions,
-    errors: [{message: 'Expected indentation of 2 space characters but found 4.'}]
+    errors: [{message: 'Expected indentation of 4 space characters but found 6.'}]
   }, {
     code: [
       'function App() {',
@@ -162,5 +187,27 @@ ruleTester.run('jsx-indent', rule, {
     options: [2],
     parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 4 space characters but found 0.'}]
+  }, {
+    code: [
+      'function App() {',
+      '  return (',
+      '    <App />',
+      '    );',
+      '}'
+    ].join('\n'),
+    options: [2],
+    parserOptions: parserOptions,
+    errors: [{message: 'Expected indentation of 2 space characters but found 4.'}]
+  }, {
+    code: [
+      'function App() {',
+      '  return (',
+      '    <App />',
+      ');',
+      '}'
+    ].join('\n'),
+    options: [2],
+    parserOptions: parserOptions,
+    errors: [{message: 'Expected indentation of 2 space characters but found 0.'}]
   }]
 });