Skip to content

Commit

Permalink
Update: make max-lines report the actual number of lines (fixes #6766
Browse files Browse the repository at this point in the history
…) (#6764)

Instead of reporting only that `max` value has been exceeded
it now also reports how many lines there is in the file.
  • Loading branch information
jrencz authored and vitorbal committed Aug 10, 2016
1 parent b256c50 commit d610d6c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
6 changes: 5 additions & 1 deletion lib/rules/max-lines.js
Expand Up @@ -139,7 +139,11 @@ module.exports = {
if (lines.length > max) {
context.report({
loc: { line: 1, column: 0 },
message: "File must be at most " + max + " lines long."
message: "File must be at most {{max}} lines long. It's {{actual}} lines long.",
data: {
max,
actual: lines.length,
}
});
}
}
Expand Down
26 changes: 14 additions & 12 deletions tests/lib/rules/max-lines.js
Expand Up @@ -21,11 +21,13 @@ const ruleTester = new RuleTester();

/**
* Returns the error message with the specified max number of lines
* @param {number} lines Maximum number of lines
* @param {number} limitLines Maximum number of lines
* @param {number} actualLines Actual number of lines
* @returns {string} error message
*/
function errorMessage(lines) {
return "File must be at most " + lines + " lines long.";
function errorMessage(limitLines, actualLines) {
return "File must be at most " + limitLines + " lines long. It's "
+ actualLines + " lines long.";
}

ruleTester.run("max-lines", rule, {
Expand Down Expand Up @@ -88,17 +90,17 @@ ruleTester.run("max-lines", rule, {
{
code: "var xyz;\nvar xyz;\nvar xyz;",
options: [2],
errors: [{message: errorMessage(2)}]
errors: [{message: errorMessage(2, 3)}]
},
{
code: "/* a multiline comment\n that goes to many lines*/\nvar xy;\nvar xy;",
options: [2],
errors: [{message: errorMessage(2)}]
errors: [{message: errorMessage(2, 4)}]
},
{
code: "//a single line comment\nvar xy;\nvar xy;",
options: [2],
errors: [{message: errorMessage(2)}]
errors: [{message: errorMessage(2, 3)}]
},
{
code: [
Expand All @@ -109,7 +111,7 @@ ruleTester.run("max-lines", rule, {
"var y;"
].join("\n"),
options: [{max: 2} ],
errors: [{message: errorMessage(2)}]
errors: [{message: errorMessage(2, 5)}]
},
{
code: [
Expand All @@ -123,7 +125,7 @@ ruleTester.run("max-lines", rule, {
" long comment*/"
].join("\n"),
options: [{max: 2, skipComments: true } ],
errors: [{message: errorMessage(2)}]
errors: [{message: errorMessage(2, 4)}]
},
{
code: [
Expand All @@ -132,7 +134,7 @@ ruleTester.run("max-lines", rule, {
"var z;"
].join("\n"),
options: [{max: 2, skipComments: true} ],
errors: [{message: errorMessage(2)}]
errors: [{message: errorMessage(2, 3)}]
},
{
code: [
Expand All @@ -142,7 +144,7 @@ ruleTester.run("max-lines", rule, {
"var z;"
].join("\n"),
options: [{max: 2, skipComments: true} ],
errors: [{message: errorMessage(2)}]
errors: [{message: errorMessage(2, 3)}]
},
{
code: [
Expand All @@ -156,7 +158,7 @@ ruleTester.run("max-lines", rule, {
" long comment*/"
].join("\n"),
options: [{max: 2, skipBlankLines: true } ],
errors: [{message: errorMessage(2)}]
errors: [{message: errorMessage(2, 6)}]
},
{
code: [
Expand All @@ -170,7 +172,7 @@ ruleTester.run("max-lines", rule, {
" long comment*/"
].join("\n"),
options: [{max: 2, skipComments: true } ],
errors: [{message: errorMessage(2)}]
errors: [{message: errorMessage(2, 4)}]
}
]
});

0 comments on commit d610d6c

Please sign in to comment.