Chore: enable object-curly-newline & object-property-newline.(fixes #…

…9042) (#9068) * Chore: enable object-curly-newline & object-property-newline. * Fix: linting errors.
eslint · Aug 5, 2017 · de75f9b · de75f9b
1 parent 5ae8458
commit de75f9b
Show file tree

Hide file tree

Showing 28 changed files with 593 additions and 352 deletions.
diff --git a/lib/rules/id-blacklist.js b/lib/rules/id-blacklist.js
@@ -67,9 +67,13 @@ module.exports = {
          * @private
          */
         function report(node) {
-            context.report({ node, message: "Identifier '{{name}}' is blacklisted.", data: {
-                name: node.name
-            } });
+            context.report({
+                node,
+                message: "Identifier '{{name}}' is blacklisted.",
+                data: {
+                    name: node.name
+                }
+            });
         }
 
         return {

diff --git a/lib/rules/id-match.js b/lib/rules/id-match.js
@@ -75,10 +75,14 @@ module.exports = {
          * @private
          */
         function report(node) {
-            context.report({ node, message: "Identifier '{{name}}' does not match the pattern '{{pattern}}'.", data: {
-                name: node.name,
-                pattern
-            } });
+            context.report({
+                node,
+                message: "Identifier '{{name}}' does not match the pattern '{{pattern}}'.",
+                data: {
+                    name: node.name,
+                    pattern
+                }
+            });
         }
 
         return {

diff --git a/lib/rules/no-cond-assign.js b/lib/rules/no-cond-assign.js
@@ -112,9 +112,13 @@ module.exports = {
             const ancestor = findConditionalAncestor(node);
 
             if (ancestor) {
-                context.report({ node: ancestor, message: "Unexpected assignment within {{type}}.", data: {
-                    type: NODE_DESCRIPTIONS[ancestor.type] || ancestor.type
-                } });
+                context.report({
+                    node: ancestor,
+                    message: "Unexpected assignment within {{type}}.",
+                    data: {
+                        type: NODE_DESCRIPTIONS[ancestor.type] || ancestor.type
+                    }
+                });
             }
         }
 

diff --git a/lib/rules/no-inner-declarations.js b/lib/rules/no-inner-declarations.js
@@ -63,10 +63,14 @@ module.exports = {
                     body.distance === 2);
 
             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")
-                } });
+                context.report({
+                    node,
+                    message: "Move {{type}} declaration to {{body}} root.",
+                    data: {
+                        type: (node.type === "FunctionDeclaration" ? "function" : "variable"),
+                        body: (body.type === "Program" ? "program" : "function body")
+                    }
+                });
             }
         }
 

diff --git a/lib/rules/no-restricted-properties.js b/lib/rules/no-restricted-properties.js
@@ -109,20 +109,28 @@ module.exports = {
             if (matchedObjectProperty) {
                 const message = matchedObjectProperty.message ? ` ${matchedObjectProperty.message}` : "";
 
-                // eslint-disable-next-line eslint-plugin/report-message-format
-                context.report({ node, message: "'{{objectName}}.{{propertyName}}' is restricted from being used.{{message}}", data: {
-                    objectName,
-                    propertyName,
-                    message
-                } });
+                context.report({
+                    node,
+                    // eslint-disable-next-line eslint-plugin/report-message-format
+                    message: "'{{objectName}}.{{propertyName}}' is restricted from being used.{{message}}",
+                    data: {
+                        objectName,
+                        propertyName,
+                        message
+                    }
+                });
             } else if (globalMatchedProperty) {
                 const message = globalMatchedProperty.message ? ` ${globalMatchedProperty.message}` : "";
 
-                // eslint-disable-next-line eslint-plugin/report-message-format
-                context.report({ node, message: "'{{propertyName}}' is restricted from being used.{{message}}", data: {
-                    propertyName,
-                    message
-                } });
+                context.report({
+                    node,
+                    // eslint-disable-next-line eslint-plugin/report-message-format
+                    message: "'{{propertyName}}' is restricted from being used.{{message}}",
+                    data: {
+                        propertyName,
+                        message
+                    }
+                });
             }
         }
 

diff --git a/lib/rules/no-tabs.js b/lib/rules/no-tabs.js
@@ -31,10 +31,14 @@ module.exports = {
                     const match = regex.exec(line);
 
                     if (match) {
-                        context.report({ node, loc: {
-                            line: index + 1,
-                            column: match.index + 1
-                        }, message: "Unexpected tab character." });
+                        context.report({
+                            node,
+                            loc: {
+                                line: index + 1,
+                                column: match.index + 1
+                            },
+                            message: "Unexpected tab character."
+                        });
                     }
                 });
             }

diff --git a/lib/rules/prefer-reflect.js b/lib/rules/prefer-reflect.js
@@ -83,10 +83,14 @@ module.exports = {
          * @returns {void}
          */
         function report(node, existing, substitute) {
-            context.report({ node, message: "Avoid using {{existing}}, instead use {{substitute}}.", data: {
-                existing,
-                substitute
-            } });
+            context.report({
+                node,
+                message: "Avoid using {{existing}}, instead use {{substitute}}.",
+                data: {
+                    existing,
+                    substitute
+                }
+            });
         }
 
         return {

diff --git a/lib/rules/valid-jsdoc.js b/lib/rules/valid-jsdoc.js
@@ -362,14 +362,22 @@ module.exports = {
                         // TODO(nzakas): Figure out logical things to do with destructured, default, rest params
                         if (param.type === "Identifier") {
                             if (jsdocParams[i] && (name !== jsdocParams[i])) {
-                                context.report({ node: jsdocNode, message: "Expected JSDoc for '{{name}}' but found '{{jsdocName}}'.", data: {
-                                    name,
-                                    jsdocName: jsdocParams[i]
-                                } });
+                                context.report({
+                                    node: jsdocNode,
+                                    message: "Expected JSDoc for '{{name}}' but found '{{jsdocName}}'.",
+                                    data: {
+                                        name,
+                                        jsdocName: jsdocParams[i]
+                                    }
+                                });
                             } else if (!params[name] && !isOverride) {
-                                context.report({ node: jsdocNode, message: "Missing JSDoc for parameter '{{name}}'.", data: {
-                                    name
-                                } });
+                                context.report({
+                                    node: jsdocNode,
+                                    message: "Missing JSDoc for parameter '{{name}}'.",
+                                    data: {
+                                        name
+                                    }
+                                });
                             }
                         }
                     });

diff --git a/packages/eslint-config-eslint/default.yml b/packages/eslint-config-eslint/default.yml
@@ -115,7 +115,9 @@ rules:
     no-whitespace-before-property: "error"
     no-with: "error"
     no-var: "error"
+    object-curly-newline: ["error", { "consistent": true, "multiline": true }]
     object-curly-spacing: ["error", "always"]
+    object-property-newline: ["error", { "allowMultiplePropertiesPerLine": true }]
     object-shorthand: "error"
     one-var-declaration-per-line: "error"
     operator-assignment: "error"

diff --git a/tests/lib/cli-engine.js b/tests/lib/cli-engine.js
@@ -34,10 +34,12 @@ describe("CLIEngine", () => {
     const examplePluginName = "eslint-plugin-example",
         examplePluginNameWithNamespace = "@eslint/eslint-plugin-example",
         requireStubs = {},
-        examplePlugin = { rules: {
-            "example-rule": require("../fixtures/rules/custom-rule"),
-            "make-syntax-error": require("../fixtures/rules/make-syntax-error-rule")
-        } },
+        examplePlugin = {
+            rules: {
+                "example-rule": require("../fixtures/rules/custom-rule"),
+                "make-syntax-error": require("../fixtures/rules/make-syntax-error-rule")
+            }
+        },
         examplePreprocessorName = "eslint-plugin-processor",
         originalDir = process.cwd();
     let CLIEngine,