Chore: enable operator-linebreak on ESLint codebase (#8064)

This enables operator-linebreak on the ESLint codebase, with the default configuration. All of the changes were made with ESLint's autofixer.
eslint · Feb 12, 2017 · 591b74a · 591b74a
1 parent 6445d2a
commit 591b74a
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 51 deletions.
diff --git a/lib/code-path-analysis/code-path-state.js b/lib/code-path-analysis/code-path-state.js
@@ -467,8 +467,8 @@ class CodePathState {
              * Creates the next path from own true/false fork context.
              */
             const prevForkContext =
-                context.kind === "&&" ? context.trueForkContext :
-                /* kind === "||" */ context.falseForkContext;
+                context.kind === "&&" ? context.trueForkContext
+                /* kind === "||" */ : context.falseForkContext;
 
             forkContext.replaceHead(prevForkContext.makeNext(0, -1));
             prevForkContext.clear();

diff --git a/lib/config/autoconfig.js b/lib/config/autoconfig.js
@@ -300,8 +300,8 @@ class Registry {
                     // (https://github.com/eslint/eslint/issues/5992)
                     // (https://github.com/eslint/eslint/issues/7860)
                     if (
-                        lintedRegistry.rules[result.ruleId]
-                        && lintedRegistry.rules[result.ruleId][ruleSetIdx]
+                        lintedRegistry.rules[result.ruleId] &&
+                        lintedRegistry.rules[result.ruleId][ruleSetIdx]
                     ) {
                         lintedRegistry.rules[result.ruleId][ruleSetIdx].errorCount += 1;
                     }

diff --git a/lib/config/config-file.js b/lib/config/config-file.js
@@ -380,9 +380,9 @@ function applyExtends(config, filePath, relativeTo) {
              * If the `extends` path is relative, use the directory of the current configuration
              * file as the reference point. Otherwise, use as-is.
              */
-            parentPath = (!path.isAbsolute(parentPath) ?
-                path.join(relativeTo || path.dirname(filePath), parentPath) :
-                parentPath
+            parentPath = (!path.isAbsolute(parentPath)
+                ? path.join(relativeTo || path.dirname(filePath), parentPath)
+                : parentPath
             );
         }
 

diff --git a/lib/eslint.js b/lib/eslint.js
@@ -864,8 +864,8 @@ module.exports = (function() {
                         (parseResult && parseResult.services ? parseResult.services : {})
                     );
 
-                    const rule = ruleCreator.create ? ruleCreator.create(ruleContext) :
-                        ruleCreator(ruleContext);
+                    const rule = ruleCreator.create ? ruleCreator.create(ruleContext)
+                        : ruleCreator(ruleContext);
 
                     // add all the node types as listeners
                     Object.keys(rule).forEach(nodeType => {

diff --git a/lib/rules/capitalized-comments.js b/lib/rules/capitalized-comments.js
@@ -264,9 +264,9 @@ module.exports = {
                 commentValid = isCommentValid(comment, options);
 
             if (!commentValid) {
-                const message = capitalize === "always" ?
-                    ALWAYS_MESSAGE :
-                    NEVER_MESSAGE;
+                const message = capitalize === "always"
+                    ? ALWAYS_MESSAGE
+                    : NEVER_MESSAGE;
 
                 context.report({
                     node: null,         // Intentionally using loc instead

diff --git a/lib/rules/comma-spacing.js b/lib/rules/comma-spacing.js
@@ -96,9 +96,9 @@ module.exports = {
                     return fixer.replaceTextRange([start, end], newText);
 
                 },
-                message: options[dir] ?
-                  "A space is required {{dir}} ','." :
-                  "There should be no space {{dir}} ','.",
+                message: options[dir]
+                  ? "A space is required {{dir}} ','."
+                  : "There should be no space {{dir}} ','.",
                 data: {
                     dir
                 }

diff --git a/lib/rules/constructor-super.js b/lib/rules/constructor-super.js
@@ -209,9 +209,9 @@ module.exports = {
 
                 if (!calledInEveryPaths) {
                     context.report({
-                        message: calledInSomePaths ?
-                            "Lacked a call of 'super()' in some code paths." :
-                            "Expected to call 'super()'.",
+                        message: calledInSomePaths
+                            ? "Lacked a call of 'super()' in some code paths."
+                            : "Expected to call 'super()'.",
                         node: node.parent
                     });
                 }

diff --git a/lib/rules/default-case.js b/lib/rules/default-case.js
@@ -31,9 +31,9 @@ module.exports = {
 
     create(context) {
         const options = context.options[0] || {};
-        const commentPattern = options.commentPattern ?
-            new RegExp(options.commentPattern) :
-            DEFAULT_COMMENT_PATTERN;
+        const commentPattern = options.commentPattern
+            ? new RegExp(options.commentPattern)
+            : DEFAULT_COMMENT_PATTERN;
 
         const sourceCode = context.getSourceCode();
 

diff --git a/lib/rules/eqeqeq.js b/lib/rules/eqeqeq.js
@@ -63,9 +63,9 @@ module.exports = {
         const options = context.options[1] || {};
         const sourceCode = context.getSourceCode();
 
-        const nullOption = (config === "always") ?
-            options.null || "always" :
-            "ignore";
+        const nullOption = (config === "always")
+            ? options.null || "always"
+            : "ignore";
         const enforceRuleForNull = (nullOption === "always");
         const enforceInverseRuleForNull = (nullOption === "never");
 

diff --git a/lib/rules/id-blacklist.js b/lib/rules/id-blacklist.js
@@ -55,8 +55,8 @@ module.exports = {
          * @returns {boolean} whether an error should be reported or not
          */
         function shouldReport(effectiveParent, name) {
-            return effectiveParent.type !== "CallExpression"
-                && effectiveParent.type !== "NewExpression" &&
+            return effectiveParent.type !== "CallExpression" &&
+                effectiveParent.type !== "NewExpression" &&
                 isInvalid(name);
         }
 

diff --git a/lib/rules/id-length.js b/lib/rules/id-length.js
@@ -104,9 +104,9 @@ module.exports = {
                 if (isValidExpression && (isValidExpression === true || isValidExpression(parent, node))) {
                     context.report({
                         node,
-                        message: isShort ?
-                            "Identifier name '{{name}}' is too short (< {{min}})." :
-                            "Identifier name '{{name}}' is too long (> {{max}}).",
+                        message: isShort
+                            ? "Identifier name '{{name}}' is too short (< {{min}})."
+                            : "Identifier name '{{name}}' is too long (> {{max}}).",
                         data: { name, min: minLength, max: maxLength }
                     });
                 }

diff --git a/lib/rules/id-match.js b/lib/rules/id-match.js
@@ -63,8 +63,8 @@ module.exports = {
          * @returns {boolean} whether an error should be reported or not
          */
         function shouldReport(effectiveParent, name) {
-            return effectiveParent.type !== "CallExpression"
-                && effectiveParent.type !== "NewExpression" &&
+            return effectiveParent.type !== "CallExpression" &&
+                effectiveParent.type !== "NewExpression" &&
                 isInvalid(name);
         }
 

diff --git a/lib/rules/no-cond-assign.js b/lib/rules/no-cond-assign.js
@@ -101,9 +101,9 @@ module.exports = {
         function testForAssign(node) {
             if (node.test &&
                 (node.test.type === "AssignmentExpression") &&
-                (node.type === "ForStatement" ?
-                    !isParenthesised(node.test) :
-                    !isParenthesisedTwice(node.test)
+                (node.type === "ForStatement"
+                    ? !isParenthesised(node.test)
+                    : !isParenthesisedTwice(node.test)
                 )
             ) {
 

diff --git a/lib/rules/no-extend-native.js b/lib/rules/no-extend-native.js
@@ -60,9 +60,9 @@ module.exports = {
                     return;
                 }
 
-                const affectsProto = lhs.object.computed ?
-                    lhs.object.property.type === "Literal" && lhs.object.property.value === "prototype" :
-                    lhs.object.property.name === "prototype";
+                const affectsProto = lhs.object.computed
+                    ? lhs.object.property.type === "Literal" && lhs.object.property.value === "prototype"
+                    : lhs.object.property.name === "prototype";
 
                 if (!affectsProto) {
                     return;

diff --git a/lib/rules/no-extra-parens.js b/lib/rules/no-extra-parens.js
@@ -557,8 +557,7 @@ module.exports = {
                         !(
                             (node.object.type === "Literal" &&
                             typeof node.object.value === "number" &&
-                            astUtils.isDecimalInteger(node.object))
-                            ||
+                            astUtils.isDecimalInteger(node.object)) ||
 
                             // RegExp literal is allowed to have parens (#1589)
                             (node.object.type === "Literal" && node.object.regex)

diff --git a/lib/rules/no-inner-declarations.js b/lib/rules/no-inner-declarations.js
@@ -64,10 +64,10 @@ module.exports = {
 
             if (!valid) {
                 context.report({ node, message: "Move {{type}} declaration to {{body}} root.", data: {
-                    type: (node.type === "FunctionDeclaration" ?
-                            "function" : "variable"),
-                    body: (body.type === "Program" ?
-                            "program" : "function body")
+                    type: (node.type === "FunctionDeclaration"
+                            ? "function" : "variable"),
+                    body: (body.type === "Program"
+                            ? "program" : "function body")
                 } });
             }
         }

diff --git a/lib/rules/no-lone-blocks.js b/lib/rules/no-lone-blocks.js
@@ -34,9 +34,9 @@ module.exports = {
         function report(node) {
             const parent = context.getAncestors().pop();
 
-            context.report({ node, message: parent.type === "Program" ?
-                "Block is redundant." :
-                "Nested block is redundant."
+            context.report({ node, message: parent.type === "Program"
+                ? "Block is redundant."
+                : "Nested block is redundant."
             });
         }
 

diff --git a/lib/rules/object-property-newline.js b/lib/rules/object-property-newline.js
@@ -34,9 +34,9 @@ module.exports = {
 
     create(context) {
         const allowSameLine = context.options[0] && Boolean(context.options[0].allowMultiplePropertiesPerLine);
-        const errorMessage = allowSameLine ?
-            "Object properties must go on a new line if they aren't all on the same line." :
-            "Object properties must go on a new line.";
+        const errorMessage = allowSameLine
+            ? "Object properties must go on a new line if they aren't all on the same line."
+            : "Object properties must go on a new line.";
 
         const sourceCode = context.getSourceCode();
 

diff --git a/lib/rules/strict.js b/lib/rules/strict.js
@@ -212,8 +212,8 @@ module.exports = {
          */
         function enterFunction(node) {
             const isBlock = node.body.type === "BlockStatement",
-                useStrictDirectives = isBlock ?
-                    getUseStrictDirectives(node.body.body) : [];
+                useStrictDirectives = isBlock
+                    ? getUseStrictDirectives(node.body.body) : [];
 
             if (mode === "function") {
                 enterFunctionInFunctionMode(node, useStrictDirectives);

diff --git a/packages/eslint-config-eslint/default.yml b/packages/eslint-config-eslint/default.yml
@@ -98,6 +98,7 @@ rules:
     object-curly-spacing: ["error", "always"]
     object-shorthand: "error"
     one-var-declaration-per-line: "error"
+    operator-linebreak: "error"
     prefer-arrow-callback: "error"
     prefer-const: "error"
     prefer-promise-reject-errors: "error"