eslint 3.13.1 → 3.16.0

package/lib/config/config-rule.js

@@ -176,22 +176,21 @@ function combinePropertyObjects(objArr1, objArr2) {
   *
   * ruleConfigSet.ruleConfigs // -> [[2], [2, "always"], [2, "never"]]
   *
-  * @param {ruleConfig[]} configs Valid rule configurations
-  * @constructor
+  * Rule configuration set class
   */
-function RuleConfigSet(configs) {
+class RuleConfigSet {
 
     /**
-    * Stored valid rule configurations for this instance
-    * @type {array}
-    */
-    this.ruleConfigs = configs || [];
-
-}
-
-RuleConfigSet.prototype = {
-
-    constructor: RuleConfigSet,
+     * @param {ruleConfig[]} configs Valid rule configurations
+     */
+    constructor(configs) {
+
+        /**
+        * Stored valid rule configurations for this instance
+        * @type {array}
+        */
+        this.ruleConfigs = configs || [];
+    }
 
     /**
     * Add a severity level to the front of all configs in the instance.
@@ -210,7 +209,7 @@ RuleConfigSet.prototype = {
 
         // Add a single config at the beginning consisting of only the severity
         this.ruleConfigs.unshift(severity);
-    },
+    }
 
     /**
     * Add rule configs from an array of strings (schema enums)
@@ -219,7 +218,7 @@ RuleConfigSet.prototype = {
     */
     addEnums(enums) {
         this.ruleConfigs = this.ruleConfigs.concat(combineArrays(this.ruleConfigs, enums));
-    },
+    }
 
     /**
     * Add rule configurations from a schema object
@@ -261,7 +260,7 @@ RuleConfigSet.prototype = {
             this.ruleConfigs = this.ruleConfigs.concat(combineArrays(this.ruleConfigs, objectConfigSet.objectConfigs));
         }
     }
-};
+}
 
 /**
 * Generate valid rule configurations based on a schema object

package/lib/config/config-validator.js

@@ -40,13 +40,13 @@ function getRuleOptionsSchema(id) {
                 minItems: 0,
                 maxItems: schema.length
             };
-        } else {
-            return {
-                type: "array",
-                minItems: 0,
-                maxItems: 0
-            };
         }
+        return {
+            type: "array",
+            minItems: 0,
+            maxItems: 0
+        };
+
     }
 
     // Given a full schema, leave it alone

package/lib/config.js

@@ -234,8 +234,9 @@ class Config {
     }
 
     /**
-     * Build a config object merging the base config (conf/eslint.json), the
-     * environments config (conf/environments.js) and eventually the user config.
+     * Build a config object merging the base config (conf/eslint-recommended),
+     * the environments config (conf/environments.js) and eventually the user
+     * config.
      * @param {string} filePath a file in whose directory we start looking for a local config
      * @returns {Object} config object
      */

package/lib/eslint.js

@@ -14,7 +14,7 @@ const assert = require("assert"),
     escope = require("escope"),
     levn = require("levn"),
     blankScriptAST = require("../conf/blank-script.json"),
-    DEFAULT_PARSER = require("../conf/eslint.json").parser,
+    DEFAULT_PARSER = require("../conf/eslint-recommended").parser,
     replacements = require("../conf/replacements.json"),
     CodePathAnalyzer = require("./code-path-analysis/code-path-analyzer"),
     ConfigOps = require("./config/config-ops"),
@@ -528,9 +528,9 @@ function createStubRule(message) {
 
     if (message) {
         return createRuleModule;
-    } else {
-        throw new Error("No message passed to stub rule");
     }
+    throw new Error("No message passed to stub rule");
+
 }
 
 /**
@@ -660,9 +660,9 @@ module.exports = (function() {
         try {
             if (typeof parser.parseForESLint === "function") {
                 return parser.parseForESLint(text, parserOptions);
-            } else {
-                return parser.parse(text, parserOptions);
             }
+            return parser.parse(text, parserOptions);
+
         } catch (ex) {
 
             // If the message includes a leading line number, strip it:
@@ -695,9 +695,9 @@ module.exports = (function() {
             return ruleConfig;
         } else if (Array.isArray(ruleConfig)) {
             return ruleConfig[0];
-        } else {
-            return 0;
         }
+        return 0;
+
     }
 
     /**
@@ -708,9 +708,9 @@ module.exports = (function() {
     function getRuleOptions(ruleConfig) {
         if (Array.isArray(ruleConfig)) {
             return ruleConfig.slice(1);
-        } else {
-            return [];
         }
+        return [];
+
     }
 
     // set unlimited listeners (see https://github.com/eslint/eslint/issues/524)
@@ -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 => {
@@ -939,9 +939,9 @@ module.exports = (function() {
 
             if (lineDiff === 0) {
                 return a.column - b.column;
-            } else {
-                return lineDiff;
             }
+            return lineDiff;
+
         });
 
         return messages;
@@ -1109,9 +1109,9 @@ module.exports = (function() {
                 if (scope) {
                     if (scope.type === "function-expression-name") {
                         return scope.childScopes[0];
-                    } else {
-                        return scope;
                     }
+                    return scope;
+
                 }
 
             }
@@ -1161,9 +1161,9 @@ module.exports = (function() {
     api.getFilename = function() {
         if (typeof currentFilename === "string") {
             return currentFilename;
-        } else {
-            return "<input>";
         }
+        return "<input>";
+
     };
 
     /**
@@ -1192,7 +1192,7 @@ module.exports = (function() {
      * @returns {Object} Object mapping rule IDs to their default configurations
      */
     api.defaults = function() {
-        return require("../conf/eslint.json");
+        return require("../conf/eslint-recommended");
     };
 
     /**

package/lib/formatters/checkstyle.js

@@ -19,9 +19,9 @@ const xmlEscape = require("../util/xml-escape");
 function getMessageType(message) {
     if (message.fatal || message.severity === 2) {
         return "error";
-    } else {
-        return "warning";
     }
+    return "warning";
+
 }
 
 //------------------------------------------------------------------------------

package/lib/formatters/codeframe.js

@@ -56,7 +56,7 @@ function formatMessage(message, parentResult) {
         `${type}:`,
         `${msg}`,
         ruleId ? `${ruleId}` : "",
-        sourceCode ? `at ${filePath}:` : `at ${filePath}`,
+        sourceCode ? `at ${filePath}:` : `at ${filePath}`
     ].filter(String).join(" ");
 
     const result = [firstLine];

package/lib/formatters/compact.js

@@ -17,9 +17,9 @@
 function getMessageType(message) {
     if (message.fatal || message.severity === 2) {
         return "Error";
-    } else {
-        return "Warning";
     }
+    return "Warning";
+
 }
 
 

package/lib/formatters/junit.js

@@ -19,9 +19,9 @@ const xmlEscape = require("../util/xml-escape");
 function getMessageType(message) {
     if (message.fatal || message.severity === 2) {
         return "Error";
-    } else {
-        return "Warning";
     }
+    return "Warning";
+
 }
 
 //------------------------------------------------------------------------------

package/lib/formatters/tap.js

@@ -18,9 +18,9 @@ const yaml = require("js-yaml");
 function getMessageType(message) {
     if (message.fatal || message.severity === 2) {
         return "error";
-    } else {
-        return "warning";
     }
+    return "warning";
+
 }
 
 /**

package/lib/formatters/unix.js

@@ -16,9 +16,9 @@
 function getMessageType(message) {
     if (message.fatal || message.severity === 2) {
         return "Error";
-    } else {
-        return "Warning";
     }
+    return "Warning";
+
 }
 
 

package/lib/formatters/visualstudio.js

@@ -18,9 +18,9 @@
 function getMessageType(message) {
     if (message.fatal || message.severity === 2) {
         return "error";
-    } else {
-        return "warning";
     }
+    return "warning";
+
 }
 
 

package/lib/internal-rules/internal-consistent-docs-description.js

@@ -71,7 +71,7 @@ function checkMetaDocsDescription(context, exportsNode) {
     if (description === "") {
         context.report({
             node: metaDocsDescription.value,
-            message: "`meta.docs.description` should not be empty.",
+            message: "`meta.docs.description` should not be empty."
         });
         return;
     }

package/lib/rule-context.js

@@ -8,7 +8,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const RuleFixer = require("./util/rule-fixer");
+const ruleFixer = require("./util/rule-fixer");
 
 //------------------------------------------------------------------------------
 // Constants
@@ -124,7 +124,7 @@ class RuleContext {
 
             // if there's a fix specified, get it
             if (typeof descriptor.fix === "function") {
-                fix = descriptor.fix(new RuleFixer());
+                fix = descriptor.fix(ruleFixer);
             }
 
             this.eslint.report(

package/lib/rules/arrow-body-style.js

@@ -4,6 +4,12 @@
  */
 "use strict";
 
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+const astUtils = require("../ast-utils");
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -136,10 +142,7 @@ module.exports = {
                         loc: arrowBody.loc.start,
                         message: "Expected block statement surrounding arrow body.",
                         fix(fixer) {
-                            const lastTokenBeforeBody = sourceCode.getTokensBetween(sourceCode.getFirstToken(node), arrowBody)
-                                .reverse()
-                                .find(token => token.value !== "(");
-
+                            const lastTokenBeforeBody = sourceCode.getLastTokenBetween(sourceCode.getFirstToken(node), arrowBody, astUtils.isNotOpeningParenToken);
                             const firstBodyToken = sourceCode.getTokenAfter(lastTokenBeforeBody);
 
                             return fixer.replaceTextRange(

package/lib/rules/arrow-spacing.js

@@ -4,6 +4,12 @@
  */
 "use strict";
 
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+const astUtils = require("../ast-utils");
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -51,12 +57,7 @@ module.exports = {
          * @returns {Object} Tokens of arrow and before/after arrow.
          */
         function getTokens(node) {
-            let arrow = sourceCode.getTokenBefore(node.body);
-
-            // skip '(' tokens.
-            while (arrow.value !== "=>") {
-                arrow = sourceCode.getTokenBefore(arrow);
-            }
+            const arrow = sourceCode.getTokenBefore(node.body, astUtils.isArrowToken);
 
             return {
                 before: sourceCode.getTokenBefore(arrow),

package/lib/rules/block-spacing.js

@@ -74,8 +74,8 @@ module.exports = {
             // Gets braces and the first/last token of content.
             const openBrace = getOpenBrace(node);
             const closeBrace = sourceCode.getLastToken(node);
-            const firstToken = sourceCode.getTokenOrCommentAfter(openBrace);
-            const lastToken = sourceCode.getTokenOrCommentBefore(closeBrace);
+            const firstToken = sourceCode.getTokenAfter(openBrace, { includeComments: true });
+            const lastToken = sourceCode.getTokenBefore(closeBrace, { includeComments: true });
 
             // Skip if the node is invalid or empty.
             if (openBrace.type !== "Punctuator" ||