From 9236e56ddcedf7d8d998fa263da164da284dc69a Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Thu, 15 Apr 2021 10:43:35 -0700 Subject: [PATCH] build: provide line numbers of bad patch lines when linting (#28666) --- script/lint.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/lint.js b/script/lint.js index a194aacb7b..94cf85ac44 100755 --- a/script/lint.js +++ b/script/lint.js @@ -207,9 +207,9 @@ const LINTERS = [{ console.warn(`Patch file '${f}' has no description. Every patch must contain a justification for why the patch exists and the plan for its removal.`); return false; } - const trailingWhitespace = patchText.split(/\r?\n/).some(line => line.startsWith('+') && /\s+$/.test(line)); - if (trailingWhitespace) { - console.warn(`Patch file '${f}' has trailing whitespace on some lines.`); + const trailingWhitespaceLines = patchText.split(/\r?\n/).map((line, index) => [line, index]).filter(([line]) => line.startsWith('+') && /\s+$/.test(line)).map(([, lineNumber]) => lineNumber + 1); + if (trailingWhitespaceLines.length > 0) { + console.warn(`Patch file '${f}' has trailing whitespace on some lines (${trailingWhitespaceLines.join(',')}).`); return false; } return true;