Fix: no-trailing-spaces wrong fixing (fixes #6933) (#6937)

If `skipBlankLines` option is enabled, counting total length for blank lines was lacking.
eslint · Aug 21, 2016 · 8561389 · 8561389
1 parent 6a92be5
commit 8561389
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/lib/rules/no-trailing-spaces.js b/lib/rules/no-trailing-spaces.js
@@ -114,6 +114,7 @@ module.exports = {
                         // If the line has only whitespace, and skipBlankLines
                         // is true, don't report it
                         if (skipBlankLines && skipMatch.test(lines[i])) {
+                            totalLength += lineLength;
                             continue;
                         }
 

diff --git a/tests/lib/rules/no-trailing-spaces.js b/tests/lib/rules/no-trailing-spaces.js
@@ -383,6 +383,39 @@ ruleTester.run("no-trailing-spaces", rule, {
                     column: 7
                 }
             ]
+        },
+
+        // https://github.com/eslint/eslint/issues/6933
+        {
+            code: "    \nabcdefg ",
+            output: "    \nabcdefg",
+            options: [{skipBlankLines: true}],
+            errors: [
+                {
+                    message: "Trailing spaces not allowed.",
+                    type: "Program",
+                    line: 2,
+                    column: 8
+                }
+            ]
+        },
+        {
+            code: "    \nabcdefg ",
+            output: "\nabcdefg",
+            errors: [
+                {
+                    message: "Trailing spaces not allowed.",
+                    type: "Program",
+                    line: 1,
+                    column: 1
+                },
+                {
+                    message: "Trailing spaces not allowed.",
+                    type: "Program",
+                    line: 2,
+                    column: 8
+                }
+            ]
         }
     ]
 });