[jsx-wrap-multilines] Add new nodes for wrap

docs/rules/jsx-wrap-multilines.md

@@ -6,14 +6,17 @@ Wrapping multiline JSX in parentheses can improve readability and/or convenience
 
 ## Rule Details
 
-This rule optionally takes a second parameter in the form of an object, containing places to apply the rule. By default, all the syntax listed below will be checked, but these can be explicitly disabled. Any syntax type missing in the object will follow the default behavior (become enabled).
+This rule optionally takes a second parameter in the form of an object, containing places to apply the rule. By default, all the syntax listed below will be checked except the logical expressions and JSX attributes, but these can be explicitly disabled. Any syntax type missing in the object will follow the default behavior (become enabled).
 
 There are the possible syntax available:
 
 * `declaration`
 * `assignment`
 * `return`
 * `arrow`
+* `condition`
+* `logical` (not enabled by default)
+* `attr` (not enabled by default)
 
 The following patterns are considered warnings:
 
@@ -118,3 +121,68 @@ var hello = () => (
   </div>
 );
 ```
+
+The following patterns are considered warnings when configured `{condition: true}`.
+
+```jsx
+<div>
+  {foo ? <div>
+      <p>Hello</p>
+    </div> : null}
+</div>
+```
+
+The following patterns are not considered warnings when configured `{condition: true}`.
+
+```jsx
+<div>
+  {foo ? (<div>
+      <p>Hello</p>
+  </div>) : null}
+</div>
+```
+
+
+The following patterns are considered warnings when configured `{logical: true}`.
+
+```jsx
+<div>
+  {foo &&
+    <div>
+      <p>Hello World</p>
+    </div>
+  }
+</div>
+```
+
+The following patterns are not considered warnings when configured `{logical: true}`.
+
+```jsx
+<div>
+  {foo &&
+    (<div>
+      <p>Hello World</p>
+    </div>)
+  }
+</div>
+```
+
+The following patterns are considered warnings when configured `{attr: true}`.
+
+```jsx
+<div attr={<div>
+    <p>Hello</p>
+  </div>}>
+  <p>Hello</p>
+</div>;
+```
+
+The following patterns are not considered warnings when configured `{attr: true}`.
+
+```jsx
+<div attr={(<div>
+    <p>Hello</p>
+  </div>)}>
+  <p>Hello</p>
+</div>;
+```

lib/rules/jsx-wrap-multilines.js

@@ -14,7 +14,10 @@ const DEFAULTS = {
   declaration: true,
   assignment: true,
   return: true,
-  arrow: true
+  arrow: true,
+  condition: true,
+  logical: false,
+  attr: false
 };
 
 // ------------------------------------------------------------------------------
@@ -44,6 +47,15 @@ module.exports = {
         },
         arrow: {
           type: 'boolean'
+        },
+        condition: {
+          type: 'boolean'
+        },
+        logical: {
+          type: 'boolean'
+        },
+        attr: {
+          type: 'boolean'
         }
       },
       additionalProperties: false
@@ -100,23 +112,13 @@ module.exports = {
         if (!isEnabled('declaration')) {
           return;
         }
-        if (node.init && node.init.type === 'ConditionalExpression') {
-          check(node.init.consequent);
-          check(node.init.alternate);
-          return;
-        }
         check(node.init);
       },
 
       AssignmentExpression: function(node) {
         if (!isEnabled('assignment')) {
           return;
         }
-        if (node.right.type === 'ConditionalExpression') {
-          check(node.right.consequent);
-          check(node.right.alternate);
-          return;
-        }
         check(node.right);
       },
 
@@ -132,6 +134,25 @@ module.exports = {
         if (isEnabled('arrow') && arrowBody.type !== 'BlockStatement') {
           check(arrowBody);
         }
+      },
+
+      ConditionalExpression: function(node) {
+        if (isEnabled('condition')) {
+          check(node.consequent);
+          check(node.alternate);
+        }
+      },
+
+      LogicalExpression: function(node) {
+        if (isEnabled('logical')) {
+          check(node.right);
+        }
+      },
+
+      JSXAttribute: function (node) {
+        if (isEnabled('attr') && node.value && node.value.type === 'JSXExpressionContainer') {
+          check(node.value.expression);
+        }
       }
     };
   }

tests/lib/rules/jsx-wrap-multilines.js

@@ -134,6 +134,68 @@ const ARROW_NO_PAREN = `
   </div>;
 `;
 
+const CONDITION_SINGLE_LINE = 'foo ? <p>Hello</p> : null;';
+
+const CONDITION_PAREN = `
+  <div>
+    {foo ? (<div>
+        <p>Hello</p>
+      </div>) : null}
+  </div>
+`;
+
+const CONDITION_NO_PAREN = `
+  <div>
+    {foo ? <div>
+        <p>Hello</p>
+      </div> : null}
+  </div>
+`;
+
+const LOGICAL_SINGLE_LINE = 'foo && <p>Hello</p>;';
+
+const LOGICAL_PAREN = `
+  <div>
+    {foo &&
+      (<div>
+        <p>Hello World</p>
+      </div>)
+    }
+  </div>
+`;
+
+const LOGICAL_NO_PAREN = `
+  <div>
+    {foo &&
+      <div>
+        <p>Hello World</p>
+      </div>
+    }
+  </div>
+`;
+
+const ATTR_SINGLE_LINE = '<div attr={<p>Hello</p>}></div>';
+
+const ATTR_PAREN = `
+  <div attr={
+    (<div>
+      <p>Hello</p>
+    </div>)
+  }>
+    <p>Hello</p>
+  </div>
+`;
+
+const ATTR_NO_PAREN = `
+  <div attr={
+    <div>
+      <p>Hello</p>
+    </div>
+  }>
+    <p>Hello</p>
+  </div>
+`;
+
 // ------------------------------------------------------------------------------
 // Tests
 // ------------------------------------------------------------------------------
@@ -155,14 +217,14 @@ ruleTester.run('jsx-wrap-multilines', rule, {
       code: DECLARATION_TERNARY_PAREN
     }, {
       code: DECLARATION_TERNARY_NO_PAREN,
-      options: [{declaration: false}]
+      options: [{condition: false}]
     }, {
       code: ASSIGNMENT_TERNARY_SINGLE_LINE
     }, {
       code: ASSIGNMENT_TERNARY_PAREN
     }, {
       code: ASSIGNMENT_TERNARY_NO_PAREN,
-      options: [{assignment: false}]
+      options: [{condition: false}]
     }, {
       code: DECLARATION_SINGLE_LINE
     }, {
@@ -187,6 +249,27 @@ ruleTester.run('jsx-wrap-multilines', rule, {
     }, {
       code: ARROW_NO_PAREN,
       options: [{arrow: false}]
+    }, {
+      code: CONDITION_SINGLE_LINE
+    }, {
+      code: CONDITION_NO_PAREN,
+      options: [{condition: false}]
+    }, {
+      code: CONDITION_PAREN
+    }, {
+      code: LOGICAL_SINGLE_LINE
+    }, {
+      code: LOGICAL_NO_PAREN
+    }, {
+      code: LOGICAL_PAREN,
+      options: [{logical: true}]
+    }, {
+      code: ATTR_SINGLE_LINE
+    }, {
+      code: ATTR_NO_PAREN
+    }, {
+      code: ATTR_PAREN,
+      options: [{attr: true}]
     }
   ],
 
@@ -237,6 +320,20 @@ ruleTester.run('jsx-wrap-multilines', rule, {
       output: ARROW_PAREN,
       options: [{arrow: true}],
       errors: [{message: 'Missing parentheses around multilines JSX'}]
+    }, {
+      code: CONDITION_NO_PAREN,
+      output: CONDITION_PAREN,
+      errors: [{message: 'Missing parentheses around multilines JSX'}]
+    }, {
+      code: LOGICAL_NO_PAREN,
+      output: LOGICAL_PAREN,
+      options: [{logical: true}],
+      errors: [{message: 'Missing parentheses around multilines JSX'}]
+    }, {
+      code: ATTR_NO_PAREN,
+      output: ATTR_PAREN,
+      options: [{attr: true}],
+      errors: [{message: 'Missing parentheses around multilines JSX'}]
     }
   ]
 });