eslint 2.11.0 → 2.13.1

package/lib/rules/object-shorthand.js

@@ -23,6 +23,8 @@ module.exports = {
             recommended: false
         },
 
+        fixable: "code",
+
         schema: {
             anyOf: [
                 {
@@ -132,12 +134,36 @@ module.exports = {
                 // if we're "never" and concise we should warn now
                 if (APPLY_NEVER && isConciseProperty) {
                     type = node.method ? "method" : "property";
-                    context.report(node, "Expected longform " + type + " syntax.");
+                    context.report({
+                        node: node,
+                        message: "Expected longform " + type + " syntax.",
+                        fix: function(fixer) {
+                            if (node.method) {
+                                if (node.value.generator) {
+                                    return fixer.replaceTextRange([node.range[0], node.key.range[1]], node.key.name + ": function*");
+                                }
+
+                                return fixer.insertTextAfter(node.key, ": function");
+                            }
+
+                            return fixer.insertTextAfter(node.key, ": " + node.key.name);
+                        }
+                    });
                 }
 
                 // {'xyz'() {}} should be written as {'xyz': function() {}}
                 if (AVOID_QUOTES && isStringLiteral(node.key) && isConciseProperty) {
-                    context.report(node, "Expected longform method syntax for string literal keys.");
+                    context.report({
+                        node: node,
+                        message: "Expected longform method syntax for string literal keys.",
+                        fix: function(fixer) {
+                            if (node.computed) {
+                                return fixer.insertTextAfterRange([node.key.range[0], node.key.range[1] + 1], ": function");
+                            }
+
+                            return fixer.insertTextAfter(node.key, ": function");
+                        }
+                    });
                 }
 
                 // at this point if we're concise or if we're "never" we can leave
@@ -160,16 +186,60 @@ module.exports = {
                         return;
                     }
 
+                    // {[x]: function(){}} should be written as {[x]() {}}
+                    if (node.computed) {
+                        context.report({
+                            node: node,
+                            message: "Expected method shorthand.",
+                            fix: function(fixer) {
+                                if (node.value.generator) {
+                                    return fixer.replaceTextRange(
+                                        [node.key.range[0], node.value.range[0] + "function*".length],
+                                        "*[" + node.key.name + "]"
+                                    );
+                                }
+
+                                return fixer.removeRange([node.key.range[1] + 1, node.value.range[0] + "function".length]);
+                            }
+                        });
+                        return;
+                    }
+
                     // {x: function(){}} should be written as {x() {}}
-                    context.report(node, "Expected method shorthand.");
+                    context.report({
+                        node: node,
+                        message: "Expected method shorthand.",
+                        fix: function(fixer) {
+                            if (node.value.generator) {
+                                return fixer.replaceTextRange(
+                                    [node.key.range[0], node.value.range[0] + "function*".length],
+                                    "*" + node.key.name
+                                );
+                            }
+
+                            return fixer.removeRange([node.key.range[1], node.value.range[0] + "function".length]);
+                        }
+                    });
                 } else if (node.value.type === "Identifier" && node.key.name === node.value.name && APPLY_TO_PROPS) {
 
                     // {x: x} should be written as {x}
-                    context.report(node, "Expected property shorthand.");
+                    context.report({
+                        node: node,
+                        message: "Expected property shorthand.",
+                        fix: function(fixer) {
+                            return fixer.replaceText(node, node.value.name);
+                        }
+                    });
                 } else if (node.value.type === "Identifier" && node.key.type === "Literal" && node.key.value === node.value.name && APPLY_TO_PROPS) {
 
                     // {"x": x} should be written as {x}
-                    context.report(node, "Expected property shorthand.");
+                    context.report({
+                        node: node,
+                        message: "Expected property shorthand.",
+                        fix: function(fixer) {
+                            return fixer.replaceText(node, node.value.name);
+                        }
+                    });
                 }
             }
         };

package/lib/rules/one-var.js

@@ -286,6 +286,9 @@ module.exports = {
                             context.report(node, "Combine this with the previous '" + type + "' statement with initialized variables.");
                         }
                         if (options[type].uninitialized === MODE_ALWAYS) {
+                            if (node.parent.left === node && (node.parent.type === "ForInStatement" || node.parent.type === "ForOfStatement")) {
+                                return;
+                            }
                             context.report(node, "Combine this with the previous '" + type + "' statement with uninitialized variables.");
                         }
                     }

package/lib/rules/padded-blocks.js

@@ -17,6 +17,8 @@ module.exports = {
             recommended: false
         },
 
+        fixable: "whitespace",
+
         schema: [
             {
                 oneOf: [
@@ -164,6 +166,9 @@ module.exports = {
                     context.report({
                         node: node,
                         loc: { line: openBrace.loc.start.line, column: openBrace.loc.start.column },
+                        fix: function(fixer) {
+                            return fixer.insertTextAfter(openBrace, "\n");
+                        },
                         message: ALWAYS_MESSAGE
                     });
                 }
@@ -171,23 +176,36 @@ module.exports = {
                     context.report({
                         node: node,
                         loc: {line: closeBrace.loc.end.line, column: closeBrace.loc.end.column - 1 },
+                        fix: function(fixer) {
+                            return fixer.insertTextBefore(closeBrace, "\n");
+                        },
                         message: ALWAYS_MESSAGE
                     });
                 }
             } else {
                 if (blockHasTopPadding) {
+                    var nextToken = sourceCode.getTokenOrCommentAfter(openBrace);
+
                     context.report({
                         node: node,
                         loc: { line: openBrace.loc.start.line, column: openBrace.loc.start.column },
+                        fix: function(fixer) {
+                            return fixer.replaceTextRange([openBrace.end, nextToken.start - nextToken.loc.start.column], "\n");
+                        },
                         message: NEVER_MESSAGE
                     });
                 }
 
                 if (blockHasBottomPadding) {
+                    var previousToken = sourceCode.getTokenOrCommentBefore(closeBrace);
+
                     context.report({
                         node: node,
                         loc: {line: closeBrace.loc.end.line, column: closeBrace.loc.end.column - 1 },
-                        message: NEVER_MESSAGE
+                        message: NEVER_MESSAGE,
+                        fix: function(fixer) {
+                            return fixer.replaceTextRange([previousToken.end, closeBrace.start - closeBrace.loc.start.column], "\n");
+                        }
                     });
                 }
             }

package/lib/rules/rest-spread-spacing.js

@@ -0,0 +1,107 @@
+/**
+ * @fileoverview Enforce spacing between rest and spread operators and their expressions.
+ * @author Kai Cataldo
+ */
+
+"use strict";
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+module.exports = {
+    meta: {
+        docs: {
+            description: "enforce spacing between rest and spread operators and their expressions",
+            category: "ECMAScript 6",
+            recommended: false
+        },
+        fixable: "whitespace",
+        schema: [
+            {
+                enum: ["always", "never"]
+            }
+        ]
+    },
+
+    create: function(context) {
+        var sourceCode = context.getSourceCode(),
+            alwaysSpace = context.options[0] === "always";
+
+        //--------------------------------------------------------------------------
+        // Helpers
+        //--------------------------------------------------------------------------
+
+        /**
+         * Checks whitespace between rest/spread operators and their expressions
+         * @param {ASTNode} node - The node to check
+         * @returns {void}
+         */
+        function checkWhiteSpace(node) {
+            var operator = sourceCode.getFirstToken(node),
+                nextToken = sourceCode.getTokenAfter(operator),
+                hasWhitespace = sourceCode.isSpaceBetweenTokens(operator, nextToken),
+                type;
+
+            switch (node.type) {
+                case "SpreadElement":
+                    type = "spread";
+                    break;
+                case "RestElement":
+                    type = "rest";
+                    break;
+                case "ExperimentalSpreadProperty":
+                    type = "spread property";
+                    break;
+                case "ExperimentalRestProperty":
+                    type = "rest property";
+                    break;
+                default:
+                    return;
+            }
+
+            if (alwaysSpace && !hasWhitespace) {
+                context.report({
+                    node: node,
+                    loc: {
+                        line: operator.loc.end.line,
+                        column: operator.loc.end.column
+                    },
+                    message: "Expected whitespace after {{type}} operator",
+                    data: {
+                        type: type
+                    },
+                    fix: function(fixer) {
+                        return fixer.replaceTextRange([operator.range[1], nextToken.range[0]], " ");
+                    }
+                });
+            } else if (!alwaysSpace && hasWhitespace) {
+                context.report({
+                    node: node,
+                    loc: {
+                        line: operator.loc.end.line,
+                        column: operator.loc.end.column
+                    },
+                    message: "Unexpected whitespace after {{type}} operator",
+                    data: {
+                        type: type
+                    },
+                    fix: function(fixer) {
+                        return fixer.removeRange([operator.range[1], nextToken.range[0]]);
+                    }
+                });
+            }
+        }
+
+        //--------------------------------------------------------------------------
+        // Public
+        //--------------------------------------------------------------------------
+
+        return {
+            SpreadElement: checkWhiteSpace,
+            RestElement: checkWhiteSpace,
+            ExperimentalSpreadProperty: checkWhiteSpace,
+            ExperimentalRestProperty: checkWhiteSpace
+        };
+    }
+};

package/lib/rules/unicode-bom.js

@@ -11,7 +11,7 @@
 module.exports = {
     meta: {
         docs: {
-            description: "require or disallow Unicode BOM",
+            description: "require or disallow Unicode byte order mark (BOM)",
             category: "Stylistic Issues",
             recommended: false
         },

package/lib/util/glob-util.js

@@ -154,7 +154,8 @@ function listFilesToProcess(globPatterns, options) {
     ignoredPaths = new IgnoredPaths(options);
     globOptions = {
         nodir: true,
-        cwd: cwd
+        cwd: cwd,
+        ignore: ignoredPaths.getIgnoredFoldersGlobPatterns()
     };
 
     debug("Creating list of files to process.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "2.11.0",
+  "version": "2.13.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {
@@ -42,7 +42,7 @@
     "doctrine": "^1.2.2",
     "es6-map": "^0.1.3",
     "escope": "^3.6.0",
-    "espree": "3.1.4",
+    "espree": "^3.1.6",
     "estraverse": "^4.2.0",
     "esutils": "^2.0.2",
     "file-entry-cache": "^1.1.1",
@@ -55,6 +55,7 @@
     "is-resolvable": "^1.0.0",
     "js-yaml": "^3.5.1",
     "json-stable-stringify": "^1.0.0",
+    "levn": "^0.3.0",
     "lodash": "^4.0.0",
     "mkdirp": "^0.5.0",
     "optionator": "^0.8.1",
@@ -93,6 +94,7 @@
     "load-perf": "^0.2.0",
     "markdownlint": "^0.1.0",
     "mocha": "^2.4.5",
+    "mock-fs": "^3.9.0",
     "npm-license": "^0.3.2",
     "phantomjs-prebuilt": "^2.1.7",
     "proxyquire": ">=1.0.0 <1.7.5",