add more test and identifier for all rules

eslint · Sep 17, 2017 · 22bf943 · 22bf943
1 parent 8093c02
commit 22bf943
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/lib/util/apply-disable-directives.js b/lib/util/apply-disable-directives.js
@@ -7,6 +7,8 @@
 
 const lodash = require("lodash");
 
+const ALL_RULE_IDENTIFIER = Symbol("all");
+
 /**
  * Compares the locations of two objects in a source file
  * @param {{line: number, column: number}} itemA The first object
@@ -87,11 +89,11 @@ module.exports = options => {
 
             switch (directive.type) {
                 case "disable-line":
-                    tempDisabledByLine.add(directive.ruleId === null ? "all" : directive.ruleId);
+                    tempDisabledByLine.add(directive.ruleId === null ? ALL_RULE_IDENTIFIER : directive.ruleId);
                     break;
 
                 case "enable-line":
-                    tempDisabledByLine.delete(directive.ruleId === null ? "all" : directive.ruleId);
+                    tempDisabledByLine.delete(directive.ruleId === null ? ALL_RULE_IDENTIFIER : directive.ruleId);
                     break;
 
                 case "disable":
@@ -122,7 +124,7 @@ module.exports = options => {
 
         if (
             enabledRules.has(problem.ruleId) ||
-            (!tempDisabledByLine.has("all") && !tempDisabledByLine.has(problem.ruleId) &&
+            (!tempDisabledByLine.has(ALL_RULE_IDENTIFIER) && !tempDisabledByLine.has(problem.ruleId) &&
             !globalDisableActive && !disabledRules.has(problem.ruleId))
         ) {
             problems.push(problem);

diff --git a/tests/lib/linter.js b/tests/lib/linter.js
@@ -2072,6 +2072,19 @@ describe("Linter", () => {
             assert.equal(messages.length, 0);
         });
 
+        it("should report no violation", () => {
+            const code = [
+                "/* eslint-disable quotes */",
+                "console.log(\"foo\");",
+                "/* eslint-enable quotes */"
+            ].join("\n");
+            const config = { rules: { quotes: 2 } };
+
+            const messages = linter.verify(code, config, filename);
+
+            assert.equal(messages.length, 0);
+        });
+
         it("should report a violation", () => {
             const code = [
                 "/*eslint-disable no-alert, no-console */",