Fix jsx-indent in multi-line function calls (fixes #895)

jsx-eslint · Oct 9, 2016 · b70cc33 · b70cc33
1 parent e2f72f1
commit b70cc33
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
@@ -191,11 +191,15 @@ module.exports = {
 
     return {
       JSXOpeningElement: function(node) {
-        if (!node.parent || !node.parent.parent) {
+        var prevToken = sourceCode.getTokenBefore(node);
+        if (!prevToken) {
           return;
         }
-        var parentElementIndent = getNodeIndent(node.parent.parent);
-        var indent = node.parent.parent.loc.start.line === node.loc.start.line ? 0 : indentSize;
+        if (prevToken.type === 'JSXText') {
+          prevToken = sourceCode.getNodeByRangeIndex(prevToken.start).parent;
+        }
+        var parentElementIndent = getNodeIndent(prevToken);
+        var indent = prevToken.loc.start.line === node.loc.start.line ? 0 : indentSize;
         checkNodesIndent(node, parentElementIndent + indent);
       },
       JSXClosingElement: function(node) {

diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
@@ -99,6 +99,41 @@ ruleTester.run('jsx-indent', rule, {
     ].join('\n'),
     options: [2],
     parserOptions: parserOptions
+  }, {
+    code: [
+      'it(\n',
+      '  (\n',
+      '    <div>\n',
+      '      <span />\n',
+      '    </div>\n',
+      '  )\n',
+      ')'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: [2]
+  }, {
+    code: [
+      '(\n',
+      '  <div>\n',
+      '    <span />\n',
+      '  </div>\n',
+      ')'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: [2]
+  }, {
+    code: `
+    it('passes', () => assertPasses(
+      foo('bar'),
+      (<div>
+        <span />
+        <span />
+        <span />
+      </div>),
+      'baz'
+    ));`,
+    parserOptions: parserOptions,
+    options: [2]
   }],
 
   invalid: [{
@@ -289,4 +324,3 @@ ruleTester.run('jsx-indent', rule, {
     ]
   }*/]
 });
-