Merge pull request CSSLint#698 from CSSLint/ignore_now_ignores_rollup

Rollups now support ignore. Fixes CSSLint#685

Author: frvge

src/core/Reporter.js

@@ -7,7 +7,7 @@
  * @param {Object} ruleset The set of rules to work with, including if
  *      they are errors or warnings.
  * @param {Object} explicitly allowed lines
- * @param {[][]} ingore list of line ranges to be ignored
+ * @param {[][]} ignore list of line ranges to be ignored
  */
 function Reporter(lines, ruleset, allow, ignore) {
     "use strict";
@@ -118,13 +118,7 @@ Reporter.prototype = {
             return;
         }
 
-        var ignore = false;
-        CSSLint.Util.forEach(this.ignore, function (range) {
-            if (range[0] <= line && line <= range[1]) {
-                ignore = true;
-            }
-        });
-        if (ignore) {
+        if (this.isIgnored(line)) {
             return;
         }
 
@@ -199,6 +193,23 @@ Reporter.prototype = {
     stat: function(name, value) {
         "use strict";
         this.stats[name] = value;
+    },
+
+    /**
+     * Helper function to check if a line is ignored
+     * @param {int} line Line to check for ignore-status
+     * @method isIgnored
+     * @return {Boolean} True if the line is ignored, else false
+    */
+    isIgnored: function(line) {
+        "use strict";
+        var ignore = false;
+        CSSLint.Util.forEach(this.ignore, function (range) {
+            if (range[0] <= line && line <= range[1]) {
+                ignore = true;
+            }
+        });
+        return ignore;
     }
 };
 

src/rules/empty-rules.js

@@ -27,6 +27,7 @@ CSSLint.addRule({
 
         parser.addListener("endrule", function(event) {
             var selectors = event.selectors;
+
             if (count === 0) {
                 reporter.report("Rule is empty.", selectors[0].line, selectors[0].col, rule);
             }

src/rules/floats.js

@@ -20,9 +20,11 @@ CSSLint.addRule({
 
         // count how many times "float" is used
         parser.addListener("property", function(event) {
-            if (event.property.text.toLowerCase() === "float" &&
-                    event.value.text.toLowerCase() !== "none") {
-                count++;
+            if (!reporter.isIgnored(event.property.line)) {
+              if (event.property.text.toLowerCase() === "float" &&
+                      event.value.text.toLowerCase() !== "none") {
+                  count++;
+              }
             }
         });
 

src/rules/font-faces.js

@@ -18,8 +18,10 @@ CSSLint.addRule({
             count = 0;
 
 
-        parser.addListener("startfontface", function() {
-            count++;
+        parser.addListener("startfontface", function(event) {
+            if (!reporter.isIgnored(event.line)) {
+                count++;
+            }
         });
 
         parser.addListener("endstylesheet", function() {

src/rules/font-sizes.js

@@ -19,8 +19,10 @@ CSSLint.addRule({
 
         // check for use of "font-size"
         parser.addListener("property", function(event) {
-            if (event.property.toString() === "font-size") {
-                count++;
+            if (!reporter.isIgnored(event.property.line)) {
+                if (event.property.toString() === "font-size") {
+                    count++;
+                }
             }
         });
 

src/rules/important.js

@@ -21,9 +21,11 @@ CSSLint.addRule({
 
         // warn that important is used and increment the declaration counter
         parser.addListener("property", function(event) {
-            if (event.important === true) {
-                count++;
-                reporter.report("Use of !important", event.line, event.col, rule);
+            if (!reporter.isIgnored(event.line)) {
+                if (event.important === true) {
+                    count++;
+                    reporter.report("Use of !important", event.line, event.col, rule);
+                }
             }
         });
 

src/rules/unique-headings.js

@@ -36,6 +36,10 @@ CSSLint.addRule({
                 selector = selectors[i];
                 part = selector.parts[selector.parts.length-1];
 
+                if (reporter.isIgnored(part.line)) {
+                    continue;
+                }
+
                 if (part.elementName && /(h[1-6])/i.test(part.elementName.toString())) {
 
                     for (j=0; j < part.modifiers.length; j++) {

tests/rules/floats.js

@@ -28,6 +28,11 @@
         "float: none should not count and therefore should not result in a warning": function() {
             var result = CSSLint.verify(".foo { float: none; } .foo { float: left; } .foo { float: left; } .foo { float: left; } .foo { float: left; } .foo { float: left; } .foo { float: left; } .foo { float: left; } .foo { float: left; } .foo { float: left; }", { "floats": 1 });
             Assert.areEqual(0, result.messages.length);
+        },
+
+        "Ignore should remove rollup warning message for floats": function() {
+            var report = CSSLint.verify("/* csslint ignore:start */\n.test1 {float:left}\n.test2 {float:left}\n.test3 {float:left}\n.test4 {float:left}\n.test5 {float:left}\n.test6 {float:left}\n.test7 {float:left}\n.test8 {float:left}\n.test9 {float:left}\n.test10 {float:left}\n.test11 {float:left}\n/* csslint ignore:end */h2 {color: #fff}\n");
+            Assert.areEqual(0, report.messages.length);
         }
     }));
 

tests/rules/font-faces.js

@@ -21,6 +21,11 @@
             Assert.areEqual(1, result.messages.length);
             Assert.areEqual("warning", result.messages[0].type);
             Assert.areEqual("Too many @font-face declarations (6).", result.messages[0].message);
+        },
+
+        "Ignore should remove rollup warning message for font-face": function() {
+            var report = CSSLint.verify("/* csslint ignore:start */\n@font-face{} @font-face{} @font-face{} @font-face{} @font-face{} @font-face{}\n/* csslint ignore:end */@font-face{}\n");
+            Assert.areEqual(0, report.messages.length);
         }
     }));
 

tests/rules/font-sizes.js

@@ -23,6 +23,11 @@
             Assert.areEqual(1, result.messages.length);
             Assert.areEqual("warning", result.messages[0].type);
             Assert.areEqual("Too many font-size declarations (11), abstraction needed.", result.messages[0].message);
+        },
+
+        "Ignore should remove rollup warning message for font-sizes": function() {
+            var report = CSSLint.verify("/* csslint ignore:start */\n.test1 {font-size: 10px;}\n.test2 {font-size: 10px;}\n.test3 {font-size: 10px;}\n.test4 {font-size: 10px;}\n.test5 {font-size: 10px;}\n.test6 {font-size: 10px;}\n.test7 {font-size: 10px;}\n.test8 {font-size: 10px;}\n.test9 {font-size: 10px;}\n.test10 {font-size: 10px;}\n.test11 {font-size: 10px;}\n/* csslint ignore:end */h2 {color: #fff}\n");
+            Assert.areEqual(0, report.messages.length);
         }
     }));