Fix jsx-indent in multi-line logical expressions (fixes #540)

Author: Yannick Croissant

lib/rules/jsx-indent.js

@@ -176,15 +176,39 @@ module.exports = {
       return startLine !== endLine;
     }
 
+  /**
+   * Check if the node is the right member of a logical expression
+   * @param {ASTNode} node The node to check
+   * @return {Boolean} true if its the case, false if not
+   */
+    function isRightInLogicalExp(node) {
+      return (
+        node.parent &&
+        node.parent.parent &&
+        node.parent.parent.type === 'LogicalExpression' &&
+        node.parent.parent.right === node.parent
+      );
+    }
+
+  /**
+   * Check if the node is the parenthesized right member of a logical expression
+   * @param {ASTNode} node The node to check
+   * @return {Boolean} true if its the case, false if not
+   */
+    function isParenthesizedInLogicalExp(node) {
+      var token = sourceCode.getTokenBefore(node);
+      return isRightInLogicalExp(node) && token.type === 'Punctuator' && token.value === '(';
+    }
+
     /**
      * Check indent for nodes list
-     * @param {ASTNode[]} nodes list of node objects
+     * @param {ASTNode} node The node to check
      * @param {Number} indent needed indent
      * @param {Boolean} excludeCommas skip comma on start of line
      */
     function checkNodesIndent(node, indent, excludeCommas) {
       var nodeIndent = getNodeIndent(node, false, excludeCommas);
-      if (nodeIndent !== indent && isNodeFirstInLine(node)) {
+      if (nodeIndent !== indent && isNodeFirstInLine(node) && !isParenthesizedInLogicalExp(node)) {
         report(node, indent, nodeIndent);
       }
     }
@@ -199,7 +223,7 @@ module.exports = {
           prevToken = sourceCode.getNodeByRangeIndex(prevToken.start).parent;
         }
         var parentElementIndent = getNodeIndent(prevToken);
-        var indent = prevToken.loc.start.line === node.loc.start.line ? 0 : indentSize;
+        var indent = prevToken.loc.start.line === node.loc.start.line || isRightInLogicalExp(node) ? 0 : indentSize;
         checkNodesIndent(node, parentElementIndent + indent);
       },
       JSXClosingElement: function(node) {

tests/lib/rules/jsx-indent.js

@@ -133,6 +133,40 @@ ruleTester.run('jsx-indent', rule, {
     ].join('\n'),
     parserOptions: parserOptions,
     options: [2]
+  }, {
+    code: [
+      '{',
+      '  head.title &&',
+      '  <h1>',
+      '    {head.title}',
+      '  </h1>',
+      '}'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: [2]
+  }, {
+    code: [
+      '{',
+      '  head.title && (',
+      '  <h1>',
+      '    {head.title}',
+      '  </h1>)',
+      '}'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: [2]
+  }, {
+    code: [
+      '{',
+      '  head.title && (',
+      '    <h1>',
+      '      {head.title}',
+      '    </h1>',
+      '  )',
+      '}'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: [2]
   }],
 
   invalid: [{