Skip to content

Commit 15f1a17

Browse files
XhmikosRXhmikosR
committed
Fix quotes.
1 parent e7e1fa9 commit 15f1a17

File tree

8 files changed

+68
-18
lines changed

8 files changed

+68
-18
lines changed

‎dist/csslint-node.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var CSSLint = (function(){
3838

3939
var rules = [],
4040
formatters = [],
41-
embeddedRuleset = /\/\*csslint([^\*]*)\*\//,
41+
embeddedRuleset = /\/\*\s*csslint([^\*]*)\*\//,
4242
api = new parserlib.util.EventTarget();
4343

4444
api.version = "0.10.0";
@@ -2963,7 +2963,11 @@ CSSLint.addFormatter({
29632963
if (message.rollup) {
29642964
output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
29652965
} else {
2966-
output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
2966+
var rule = "";
2967+
if (message.rule && message.rule.id) {
2968+
rule = "rule=\"" + escapeSpecialCharacters(message.rule.id) + "\" ";
2969+
}
2970+
output.push("<issue " + rule + "line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
29672971
" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
29682972
}
29692973
});

‎dist/csslint-rhino.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6731,7 +6731,7 @@ var CSSLint = (function(){
67316731

67326732
var rules = [],
67336733
formatters = [],
6734-
embeddedRuleset = /\/\*csslint([^\*]*)\*\//,
6734+
embeddedRuleset = /\/\*\s*csslint([^\*]*)\*\//,
67356735
api = new parserlib.util.EventTarget();
67366736

67376737
api.version = "0.10.0";
@@ -9656,7 +9656,11 @@ CSSLint.addFormatter({
96569656
if (message.rollup) {
96579657
output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
96589658
} else {
9659-
output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
9659+
var rule = "";
9660+
if (message.rule && message.rule.id) {
9661+
rule = "rule=\"" + escapeSpecialCharacters(message.rule.id) + "\" ";
9662+
}
9663+
output.push("<issue " + rule + "line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
96609664
" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
96619665
}
96629666
});

‎dist/csslint-tests.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,17 @@ function include(path, sandbox) {
234234
Assert.areEqual(undefined, ruleset["adjoining-classes"]);
235235
Assert.areEqual(1, ruleset["text-indent"]);
236236
Assert.areEqual(1, ruleset["box-sizing"]);
237+
},
238+
239+
"Embedded rulesets should accept whitespace between /* and 'csslint'": function () {
240+
var result = CSSLint.verify("/* csslint bogus, adjoining-classes:true, box-sizing:false */\n.foo.bar{}", {
241+
"text-indent": 1,
242+
"box-sizing": 1
243+
});
244+
245+
Assert.areEqual(2, result.ruleset["adjoining-classes"]);
246+
Assert.areEqual(1, result.ruleset["text-indent"]);
247+
Assert.areEqual(0, result.ruleset["box-sizing"]);
237248
}
238249

239250
}));
@@ -502,7 +513,26 @@ function include(path, sandbox) {
502513
expected = "<?xml version=\"1.0\" encoding=\"utf-8\"?><lint>" + file + error1 + error2 + "</file></lint>",
503514
actual = CSSLint.format(result, "FILE", "lint-xml");
504515
Assert.areEqual(expected, actual);
516+
},
517+
518+
"Messages should include rule IDs": function() {
519+
var result = { messages: [
520+
{ type: "error", line: 1, col: 1, message: "X", evidence: "Y", rule: { id: "Z" } }
521+
], stats: [] };
522+
523+
var expected =
524+
"<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
525+
"<lint>" +
526+
"<file name=\"FILE\">" +
527+
"<issue rule=\"Z\" line=\"1\" char=\"1\" severity=\"error\" reason=\"X\" evidence=\"Y\"/>" +
528+
"</file>" +
529+
"</lint>";
530+
531+
var actual = CSSLint.format(result, "FILE", "lint-xml");
532+
533+
Assert.areEqual(expected, actual);
505534
}
535+
506536
}));
507537
})();
508538

‎dist/csslint-worker.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6727,7 +6727,7 @@ var CSSLint = (function(){
67276727

67286728
var rules = [],
67296729
formatters = [],
6730-
embeddedRuleset = /\/\*csslint([^\*]*)\*\//,
6730+
embeddedRuleset = /\/\*\s*csslint([^\*]*)\*\//,
67316731
api = new parserlib.util.EventTarget();
67326732

67336733
api.version = "0.10.0";
@@ -9652,7 +9652,11 @@ CSSLint.addFormatter({
96529652
if (message.rollup) {
96539653
output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
96549654
} else {
9655-
output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
9655+
var rule = "";
9656+
if (message.rule && message.rule.id) {
9657+
rule = "rule=\"" + escapeSpecialCharacters(message.rule.id) + "\" ";
9658+
}
9659+
output.push("<issue " + rule + "line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
96569660
" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
96579661
}
96589662
});

‎dist/csslint-wsh.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6731,7 +6731,7 @@ var CSSLint = (function(){
67316731

67326732
var rules = [],
67336733
formatters = [],
6734-
embeddedRuleset = /\/\*csslint([^\*]*)\*\//,
6734+
embeddedRuleset = /\/\*\s*csslint([^\*]*)\*\//,
67356735
api = new parserlib.util.EventTarget();
67366736

67376737
api.version = "0.10.0";
@@ -9656,7 +9656,11 @@ CSSLint.addFormatter({
96569656
if (message.rollup) {
96579657
output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
96589658
} else {
9659-
output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
9659+
var rule = "";
9660+
if (message.rule && message.rule.id) {
9661+
rule = "rule=\"" + escapeSpecialCharacters(message.rule.id) + "\" ";
9662+
}
9663+
output.push("<issue " + rule + "line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
96609664
" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
96619665
}
96629666
});

‎dist/csslint.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6731,7 +6731,7 @@ var CSSLint = (function(){
67316731

67326732
var rules = [],
67336733
formatters = [],
6734-
embeddedRuleset = /\/\*csslint([^\*]*)\*\//,
6734+
embeddedRuleset = /\/\*\s*csslint([^\*]*)\*\//,
67356735
api = new parserlib.util.EventTarget();
67366736

67376737
api.version = "0.10.0";
@@ -9656,7 +9656,11 @@ CSSLint.addFormatter({
96569656
if (message.rollup) {
96579657
output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
96589658
} else {
9659-
output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
9659+
var rule = "";
9660+
if (message.rule && message.rule.id) {
9661+
rule = "rule=\"" + escapeSpecialCharacters(message.rule.id) + "\" ";
9662+
}
9663+
output.push("<issue " + rule + "line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
96609664
" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
96619665
}
96629666
});

‎src/formatters/lint-xml.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ CSSLint.addFormatter({
5959
if (message.rollup) {
6060
output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
6161
} else {
62-
var rule = '';
62+
var rule = "";
6363
if (message.rule && message.rule.id) {
64-
rule = 'rule=\"' + escapeSpecialCharacters(message.rule.id) + '\" ';
64+
rule = "rule=\"" + escapeSpecialCharacters(message.rule.id) + "\" ";
6565
}
6666
output.push("<issue " + rule + "line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
6767
" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");

‎tests/formatters/lint-xml.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
], stats: [] };
4646

4747
var expected =
48-
'<?xml version="1.0" encoding="utf-8"?>' +
49-
'<lint>' +
50-
'<file name="FILE">' +
51-
'<issue rule="Z" line="1" char="1" severity="error" reason="X" evidence="Y"/>' +
52-
'</file>' +
53-
'</lint>';
48+
"<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
49+
"<lint>" +
50+
"<file name=\"FILE\">" +
51+
"<issue rule=\"Z\" line=\"1\" char=\"1\" severity=\"error\" reason=\"X\" evidence=\"Y\"/>" +
52+
"</file>" +
53+
"</lint>";
5454

5555
var actual = CSSLint.format(result, "FILE", "lint-xml");
5656

0 commit comments

Comments
 (0)