[eslint] enable and autofix operator-linebreak

ljharb · ljharb · commit 56e669fbd683 · 2019-05-19T10:00:33.000-07:00
diff --git a/.eslintrc b/.eslintrc
@@ -21,12 +21,12 @@
           "ignoreTemplateLiterals": true,
           "ignoreComments": true,
         }],
+        "operator-linebreak": [2, "after"],
 
         "prefer-destructuring": [2, { "array": false, "object": false }, { "enforceForRenamedProperties": false }],
 
         "import/order": 1,
         "no-useless-escape": 1,
-        "operator-linebreak": 1,
         "function-paren-newline": 0,
         "no-plusplus": 1,
         "no-param-reassign": 1,
diff --git a/lib/rules/button-has-type.js b/lib/rules/button-has-type.js
@@ -16,12 +16,12 @@ const pragmaUtil = require('../util/pragma');
 
 function isCreateElement(node, context) {
   const pragma = pragmaUtil.getFromContext(context);
-  return node.callee
-    && node.callee.type === 'MemberExpression'
-    && node.callee.property.name === 'createElement'
-    && node.callee.object
-    && node.callee.object.name === pragma
-    && node.arguments.length > 0;
+  return node.callee &&
+    node.callee.type === 'MemberExpression' &&
+    node.callee.property.name === 'createElement' &&
+    node.callee.object &&
+    node.callee.object.name === pragma &&
+    node.arguments.length > 0;
 }
 
 // ------------------------------------------------------------------------------
diff --git a/lib/rules/forbid-elements.js b/lib/rules/forbid-elements.js
@@ -73,11 +73,11 @@ module.exports = {
     }
 
     function isValidCreateElement(node) {
-      return node.callee
-        && node.callee.type === 'MemberExpression'
-        && node.callee.object.name === 'React'
-        && node.callee.property.name === 'createElement'
-        && node.arguments.length > 0;
+      return node.callee &&
+        node.callee.type === 'MemberExpression' &&
+        node.callee.object.name === 'React' &&
+        node.callee.property.name === 'createElement' &&
+        node.arguments.length > 0;
     }
 
     function reportIfForbidden(element, node) {
diff --git a/lib/rules/jsx-curly-brace-presence.js b/lib/rules/jsx-curly-brace-presence.js
@@ -213,9 +213,9 @@ module.exports = {
       }
 
       if (
-        parent.children
-        && parent.children.length === 1
-        && containsWhitespaceExpression(parent.children[0])
+        parent.children &&
+        parent.children.length === 1 &&
+        containsWhitespaceExpression(parent.children[0])
       ) {
         return false;
       }
@@ -225,9 +225,9 @@ module.exports = {
 
     function shouldCheckForMissingCurly(parent, config) {
       if (
-        parent.children
-        && parent.children.length === 1
-        && containsWhitespaceExpression(parent.children[0])
+        parent.children &&
+        parent.children.length === 1 &&
+        containsWhitespaceExpression(parent.children[0])
       ) {
         return false;
       }
diff --git a/lib/rules/jsx-fragments.js b/lib/rules/jsx-fragments.js
@@ -48,8 +48,8 @@ module.exports = {
       if (!versionUtil.testReactVersion(context, '16.2.0')) {
         context.report({
           node,
-          message: 'Fragments are only supported starting from React v16.2. '
-            + 'Please disable the `react/jsx-fragments` rule in ESLint settings or upgrade your version of React.'
+          message: 'Fragments are only supported starting from React v16.2. ' +
+            'Please disable the `react/jsx-fragments` rule in ESLint settings or upgrade your version of React.'
         });
         return true;
       }
@@ -62,8 +62,8 @@ module.exports = {
         let source = sourceCode.getText();
         source = replaceNode(source, jsxFragment.closingFragment, closeFragLong);
         source = replaceNode(source, jsxFragment.openingFragment, openFragLong);
-        const lengthDiff = openFragLong.length - sourceCode.getText(jsxFragment.openingFragment).length
-          + closeFragLong.length - sourceCode.getText(jsxFragment.closingFragment).length;
+        const lengthDiff = openFragLong.length - sourceCode.getText(jsxFragment.openingFragment).length +
+          closeFragLong.length - sourceCode.getText(jsxFragment.closingFragment).length;
         const range = jsxFragment.range;
         return fixer.replaceTextRange(range, source.slice(range[0], range[1] + lengthDiff));
       };
@@ -76,12 +76,12 @@ module.exports = {
         if (jsxElement.closingElement) {
           source = replaceNode(source, jsxElement.closingElement, closeFragShort);
           source = replaceNode(source, jsxElement.openingElement, openFragShort);
-          lengthDiff = sourceCode.getText(jsxElement.openingElement).length - openFragShort.length
-            + sourceCode.getText(jsxElement.closingElement).length - closeFragShort.length;
+          lengthDiff = sourceCode.getText(jsxElement.openingElement).length - openFragShort.length +
+            sourceCode.getText(jsxElement.closingElement).length - closeFragShort.length;
         } else {
           source = replaceNode(source, jsxElement.openingElement, `${openFragShort}${closeFragShort}`);
-          lengthDiff = sourceCode.getText(jsxElement.openingElement).length - openFragShort.length
-            - closeFragShort.length;
+          lengthDiff = sourceCode.getText(jsxElement.openingElement).length - openFragShort.length -
+            closeFragShort.length;
         }
 
         const range = jsxElement.range;
@@ -102,22 +102,22 @@ module.exports = {
 
       // const Fragment = React.Fragment;
       if (
-        variableInit.type === 'MemberExpression'
-        && variableInit.object.type === 'Identifier'
-        && variableInit.object.name === reactPragma
-        && variableInit.property.type === 'Identifier'
-        && variableInit.property.name === fragmentPragma
+        variableInit.type === 'MemberExpression' &&
+        variableInit.object.type === 'Identifier' &&
+        variableInit.object.name === reactPragma &&
+        variableInit.property.type === 'Identifier' &&
+        variableInit.property.name === fragmentPragma
       ) {
         return true;
       }
 
       // const { Fragment } = require('react');
       if (
-        variableInit.callee
-        && variableInit.callee.name === 'require'
-        && variableInit.arguments
-        && variableInit.arguments[0]
-        && variableInit.arguments[0].value === 'react'
+        variableInit.callee &&
+        variableInit.callee.name === 'require' &&
+        variableInit.arguments &&
+        variableInit.arguments[0] &&
+        variableInit.arguments[0].value === 'react'
       ) {
         return true;
       }
diff --git a/lib/rules/jsx-max-depth.js b/lib/rules/jsx-max-depth.js
@@ -88,10 +88,10 @@ module.exports = {
           if (has(refs[i], 'writeExpr')) {
             const writeExpr = refs[i].writeExpr;
 
-            return jsxUtil.isJSX(writeExpr)
-              && writeExpr
-              || (writeExpr && writeExpr.type === 'Identifier')
-              && findJSXElementOrFragment(variables, writeExpr.name);
+            return jsxUtil.isJSX(writeExpr) &&
+              writeExpr ||
+              (writeExpr && writeExpr.type === 'Identifier') &&
+              findJSXElementOrFragment(variables, writeExpr.name);
           }
         }
 
diff --git a/lib/rules/no-array-index-key.js b/lib/rules/no-array-index-key.js
@@ -45,16 +45,16 @@ module.exports = {
     const ERROR_MESSAGE = 'Do not use Array index in keys';
 
     function isArrayIndex(node) {
-      return node.type === 'Identifier'
-        && indexParamNames.indexOf(node.name) !== -1;
+      return node.type === 'Identifier' &&
+        indexParamNames.indexOf(node.name) !== -1;
     }
 
     function isUsingReactChildren(node) {
       const callee = node.callee;
       if (
-        !callee
-        || !callee.property
-        || !callee.object
+        !callee ||
+        !callee.property ||
+        !callee.object
       ) {
         return null;
       }
@@ -87,9 +87,9 @@ module.exports = {
         return null;
       }
 
-      const callbackArg = isUsingReactChildren(node)
-        ? node.arguments[1]
-        : node.arguments[0];
+      const callbackArg = isUsingReactChildren(node) ?
+        node.arguments[1] :
+        node.arguments[0];
 
       if (!callbackArg) {
         return null;
@@ -156,10 +156,10 @@ module.exports = {
     return {
       CallExpression(node) {
         if (
-          node.callee
-          && node.callee.type === 'MemberExpression'
-          && ['createElement', 'cloneElement'].indexOf(node.callee.property.name) !== -1
-          && node.arguments.length > 1
+          node.callee &&
+          node.callee.type === 'MemberExpression' &&
+          ['createElement', 'cloneElement'].indexOf(node.callee.property.name) !== -1 &&
+          node.arguments.length > 1
         ) {
           // React.createElement
           if (!indexParamNames.length) {
diff --git a/lib/rules/no-children-prop.js b/lib/rules/no-children-prop.js
@@ -18,11 +18,11 @@ const docsUrl = require('../util/docsUrl');
  * object literal, False if not.
 */
 function isCreateElementWithProps(node) {
-  return node.callee
-    && node.callee.type === 'MemberExpression'
-    && node.callee.property.name === 'createElement'
-    && node.arguments.length > 1
-    && node.arguments[1].type === 'ObjectExpression';
+  return node.callee &&
+    node.callee.type === 'MemberExpression' &&
+    node.callee.property.name === 'createElement' &&
+    node.arguments.length > 1 &&
+    node.arguments[1].type === 'ObjectExpression';
 }
 
 // ------------------------------------------------------------------------------
diff --git a/lib/rules/no-danger-with-children.js b/lib/rules/no-danger-with-children.js
@@ -95,19 +95,19 @@ module.exports = {
         }
 
         if (
-          node.openingElement.attributes
-          && hasChildren
-          && findJsxProp(node, 'dangerouslySetInnerHTML')
+          node.openingElement.attributes &&
+          hasChildren &&
+          findJsxProp(node, 'dangerouslySetInnerHTML')
         ) {
           context.report(node, 'Only set one of `children` or `props.dangerouslySetInnerHTML`');
         }
       },
       CallExpression(node) {
         if (
-          node.callee
-          && node.callee.type === 'MemberExpression'
-          && node.callee.property.name === 'createElement'
-          && node.arguments.length > 1
+          node.callee &&
+          node.callee.type === 'MemberExpression' &&
+          node.callee.property.name === 'createElement' &&
+          node.arguments.length > 1
         ) {
           let hasChildren = false;
 
diff --git a/lib/rules/no-deprecated.js b/lib/rules/no-deprecated.js
@@ -200,10 +200,10 @@ module.exports = {
       VariableDeclarator(node) {
         const reactModuleName = getReactModuleName(node);
         const isRequire = node.init && node.init.callee && node.init.callee.name === 'require';
-        const isReactRequire = node.init
-          && node.init.arguments
-          && node.init.arguments.length
-          && typeof MODULES[node.init.arguments[0].value] !== 'undefined';
+        const isReactRequire = node.init &&
+          node.init.arguments &&
+          node.init.arguments.length &&
+          typeof MODULES[node.init.arguments[0].value] !== 'undefined';
         const isDestructuring = node.id && node.id.type === 'ObjectPattern';
 
         if (
diff --git a/lib/rules/no-find-dom-node.js b/lib/rules/no-find-dom-node.js
@@ -32,8 +32,7 @@ module.exports = {
       CallExpression(node) {
         const callee = node.callee;
 
-        const isfindDOMNode =
-          (callee.name === 'findDOMNode') ||
+        const isfindDOMNode = (callee.name === 'findDOMNode') ||
           (callee.property && callee.property.name === 'findDOMNode');
         if (!isfindDOMNode) {
           return;
diff --git a/lib/rules/no-typos.js b/lib/rules/no-typos.js
@@ -131,9 +131,9 @@ module.exports = {
       }
       STATIC_CLASS_PROPERTIES.forEach((CLASS_PROP) => {
         if (propertyName && CLASS_PROP.toLowerCase() === propertyName.toLowerCase() && CLASS_PROP !== propertyName) {
-          const message = isClassProperty
-            ? 'Typo in static class property declaration'
-            : 'Typo in property declaration';
+          const message = isClassProperty ?
+            'Typo in static class property declaration' :
+            'Typo in property declaration';
           context.report({
             node,
             message
diff --git a/lib/rules/no-unused-state.js b/lib/rules/no-unused-state.js
@@ -122,13 +122,11 @@ module.exports = {
     function isStateReference(node) {
       node = uncast(node);
 
-      const isDirectStateReference =
-        node.type === 'MemberExpression' &&
+      const isDirectStateReference = node.type === 'MemberExpression' &&
         isThisExpression(node.object) &&
         node.property.name === 'state';
 
-      const isAliasedStateReference =
-        node.type === 'Identifier' &&
+      const isAliasedStateReference = node.type === 'Identifier' &&
         classInfo.aliases &&
         classInfo.aliases.has(node.name);
 
diff --git a/lib/rules/prefer-stateless-function.js b/lib/rules/prefer-stateless-function.js
@@ -187,8 +187,7 @@ module.exports = {
         const isPropTypes = name === 'propTypes' || name === 'props' && property.typeAnnotation;
         const contextTypes = name === 'contextTypes';
         const defaultProps = name === 'defaultProps';
-        const isUselessConstructor =
-          property.kind === 'constructor' &&
+        const isUselessConstructor = property.kind === 'constructor' &&
           isRedundantSuperCall(property.value.body.body, property.value.params);
         const isRender = name === 'render';
         return !isDisplayName && !isPropTypes && !contextTypes && !defaultProps && !isUselessConstructor && !isRender;
diff --git a/lib/rules/prop-types.js b/lib/rules/prop-types.js
@@ -147,8 +147,7 @@ module.exports = {
       while (node) {
         const component = components.get(node);
 
-        const isDeclared =
-          component && component.confidence === 2 &&
+        const isDeclared = component && component.confidence === 2 &&
           _isDeclaredInComponent(component.declaredPropTypes || {}, names);
         if (isDeclared) {
           return true;
diff --git a/lib/rules/style-prop-object.js b/lib/rules/style-prop-object.js
@@ -49,10 +49,10 @@ module.exports = {
     return {
       CallExpression(node) {
         if (
-          node.callee
-          && node.callee.type === 'MemberExpression'
-          && node.callee.property.name === 'createElement'
-          && node.arguments.length > 1
+          node.callee &&
+          node.callee.type === 'MemberExpression' &&
+          node.callee.property.name === 'createElement' &&
+          node.arguments.length > 1
         ) {
           if (node.arguments[1].type === 'ObjectExpression') {
             const style = node.arguments[1].properties.find(property => property.key && property.key.name === 'style' && !property.computed);
diff --git a/lib/util/Components.js b/lib/util/Components.js
@@ -365,21 +365,17 @@ function componentRule(rule, context) {
         return false;
       }
 
-      const returnsConditionalJSXConsequent =
-        node[property] &&
+      const returnsConditionalJSXConsequent = node[property] &&
         node[property].type === 'ConditionalExpression' &&
         jsxUtil.isJSX(node[property].consequent);
-      const returnsConditionalJSXAlternate =
-        node[property] &&
+      const returnsConditionalJSXAlternate = node[property] &&
         node[property].type === 'ConditionalExpression' &&
         jsxUtil.isJSX(node[property].alternate);
-      const returnsConditionalJSX =
-        strict ?
-          (returnsConditionalJSXConsequent && returnsConditionalJSXAlternate) :
-          (returnsConditionalJSXConsequent || returnsConditionalJSXAlternate);
+      const returnsConditionalJSX = strict ?
+        (returnsConditionalJSXConsequent && returnsConditionalJSXAlternate) :
+        (returnsConditionalJSXConsequent || returnsConditionalJSXAlternate);
 
-      const returnsJSX =
-        node[property] &&
+      const returnsJSX = node[property] &&
         jsxUtil.isJSX(node[property]);
       const returnsPragmaCreateElement = this.isCreateElement(node[property]);
 
@@ -592,10 +588,10 @@ function componentRule(rule, context) {
         if (refId.type === 'MemberExpression') {
           componentNode = refId.parent.right;
         } else if (
-          refId.parent
-          && refId.parent.type === 'VariableDeclarator'
-          && refId.parent.init
-          && refId.parent.init.type !== 'Identifier'
+          refId.parent &&
+          refId.parent.type === 'VariableDeclarator' &&
+          refId.parent.init &&
+          refId.parent.init.type !== 'Identifier'
         ) {
           componentNode = refId.parent.init;
         }
diff --git a/lib/util/ast.js b/lib/util/ast.js
diff --git a/lib/util/propTypes.js b/lib/util/propTypes.js
diff --git a/lib/util/usedPropTypes.js b/lib/util/usedPropTypes.js
diff --git a/lib/util/version.js b/lib/util/version.js
diff --git a/tests/lib/rules/jsx-fragments.js b/tests/lib/rules/jsx-fragments.js

Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,10 @@ module.exports = {`
`88`	`88`	`if (has(refs[i], 'writeExpr')) {`
`89`	`89`	`const writeExpr = refs[i].writeExpr;`
`90`	`90`
`91`		`- return jsxUtil.isJSX(writeExpr)`
`92`		`- && writeExpr`
`93`		`- \|\| (writeExpr && writeExpr.type === 'Identifier')`
`94`		`- && findJSXElementOrFragment(variables, writeExpr.name);`
	`91`	`+ return jsxUtil.isJSX(writeExpr) &&`
	`92`	`+ writeExpr \|\|`
	`93`	`+ (writeExpr && writeExpr.type === 'Identifier') &&`
	`94`	`+ findJSXElementOrFragment(variables, writeExpr.name);`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`