eslint 4.7.0 → 4.7.1

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+v4.7.1 - September 18, 2017
+
+* 08656db Fix: Handle nested disable directive correctly (fixes #9318) (#9322) (Gyandeep Singh)
+* 9226495 Revert "Chore: rewrite parseListConfig for a small perf gain." (#9325) (薛定谔的猫)
+
 v4.7.0 - September 15, 2017
 
 * 787b78b Upgrade: Espree v3.5.1 (fixes #9153) (#9314) (Brandon Mills)

package/lib/linter.js

@@ -146,15 +146,17 @@ function parseJsonConfig(string, location) {
  */
 function parseListConfig(string) {
     const items = {};
-    const reg = /[\w\-/]+/g;
-    const elementMatches = string.match(reg);
 
-    if (elementMatches) {
-        elementMatches.forEach(name => {
-            items[name] = true;
-        });
-    }
+    // Collapse whitespace around ,
+    string = string.replace(/\s*,\s*/g, ",");
 
+    string.split(/,+/).forEach(name => {
+        name = name.trim();
+        if (!name) {
+            return;
+        }
+        items[name] = true;
+    });
     return items;
 }
 

package/lib/util/apply-disable-directives.js

@@ -19,46 +19,11 @@ function compareLocations(itemA, itemB) {
 }
 
 /**
- * Given a list of directive comments (i.e. metadata about eslint-disable and eslint-enable comments) and a list
- * of reported problems, determines which problems should be reported.
- * @param {Object} options Information about directives and problems
- * @param {{
- *      type: ("disable"|"enable"|"disable-line"|"disable-next-line"),
- *      ruleId: (string|null),
- *      line: number,
- *      column: number
- * }} options.directives Directive comments found in the file, with one-based columns.
- * Two directive comments can only have the same location if they also have the same type (e.g. a single eslint-disable
- * comment for two different rules is represented as two directives).
- * @param {{ruleId: (string|null), line: number, column: number}[]} options.problems
- * A list of problems reported by rules, sorted by increasing location in the file, with one-based columns.
- * @returns {{ruleId: (string|null), line: number, column: number}[]}
- * A list of reported problems that were not disabled by the directive comments.
+ * This is the same as the exported function, except that it doesn't handle disable-line and disable-next-line directives.
+ * @param {Object} options options (see the exported function)
+ * @returns {Problem[]} Filtered problems (see the exported function)
  */
-module.exports = options => {
-    const processedDirectives = lodash.flatMap(options.directives, directive => {
-        switch (directive.type) {
-            case "disable":
-            case "enable":
-                return [directive];
-
-            case "disable-line":
-                return [
-                    { type: "disable", line: directive.line, column: 1, ruleId: directive.ruleId },
-                    { type: "enable", line: directive.line + 1, column: 1, ruleId: directive.ruleId }
-                ];
-
-            case "disable-next-line":
-                return [
-                    { type: "disable", line: directive.line + 1, column: 1, ruleId: directive.ruleId },
-                    { type: "enable", line: directive.line + 2, column: 1, ruleId: directive.ruleId }
-                ];
-
-            default:
-                throw new TypeError(`Unrecognized directive type '${directive.type}'`);
-        }
-    }).sort(compareLocations);
-
+function applyDirectives(options) {
     const problems = [];
     let nextDirectiveIndex = 0;
     let globalDisableActive = false;
@@ -71,10 +36,10 @@ module.exports = options => {
 
     for (const problem of options.problems) {
         while (
-            nextDirectiveIndex < processedDirectives.length &&
-            compareLocations(processedDirectives[nextDirectiveIndex], problem) <= 0
+            nextDirectiveIndex < options.directives.length &&
+            compareLocations(options.directives[nextDirectiveIndex], problem) <= 0
         ) {
-            const directive = processedDirectives[nextDirectiveIndex++];
+            const directive = options.directives[nextDirectiveIndex++];
 
             switch (directive.type) {
                 case "disable":
@@ -112,4 +77,55 @@ module.exports = options => {
     }
 
     return problems;
+}
+
+/**
+ * Given a list of directive comments (i.e. metadata about eslint-disable and eslint-enable comments) and a list
+ * of reported problems, determines which problems should be reported.
+ * @param {Object} options Information about directives and problems
+ * @param {{
+ *      type: ("disable"|"enable"|"disable-line"|"disable-next-line"),
+ *      ruleId: (string|null),
+ *      line: number,
+ *      column: number
+ * }} options.directives Directive comments found in the file, with one-based columns.
+ * Two directive comments can only have the same location if they also have the same type (e.g. a single eslint-disable
+ * comment for two different rules is represented as two directives).
+ * @param {{ruleId: (string|null), line: number, column: number}[]} options.problems
+ * A list of problems reported by rules, sorted by increasing location in the file, with one-based columns.
+ * @returns {{ruleId: (string|null), line: number, column: number}[]}
+ * A list of reported problems that were not disabled by the directive comments.
+ */
+module.exports = options => {
+    const blockDirectives = options.directives
+        .filter(directive => directive.type === "disable" || directive.type === "enable")
+        .sort(compareLocations);
+
+    const lineDirectives = lodash.flatMap(options.directives, directive => {
+        switch (directive.type) {
+            case "disable":
+            case "enable":
+                return [];
+
+            case "disable-line":
+                return [
+                    { type: "disable", line: directive.line, column: 1, ruleId: directive.ruleId },
+                    { type: "enable", line: directive.line + 1, column: 0, ruleId: directive.ruleId }
+                ];
+
+            case "disable-next-line":
+                return [
+                    { type: "disable", line: directive.line + 1, column: 1, ruleId: directive.ruleId },
+                    { type: "enable", line: directive.line + 2, column: 0, ruleId: directive.ruleId }
+                ];
+
+            default:
+                throw new TypeError(`Unrecognized directive type '${directive.type}'`);
+        }
+    }).sort(compareLocations);
+
+    const problemsAfterBlockDirectives = applyDirectives({ problems: options.problems, directives: blockDirectives });
+    const problemsAfterLineDirectives = applyDirectives({ problems: problemsAfterBlockDirectives, directives: lineDirectives });
+
+    return problemsAfterLineDirectives.sort(compareLocations);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {