Chore: refactor fix of semi

eslint · Feb 24, 2017 · 6c64259 · 6c64259
1 parent d8d97ac
commit 6c64259
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/lib/rules/semi.js b/lib/rules/semi.js
@@ -71,6 +71,7 @@ module.exports = {
          */
         function report(node, missing) {
             const lastToken = sourceCode.getLastToken(node);
+            const nextToken = sourceCode.getTokenAfter(node);
             let message,
                 fix,
                 loc = lastToken.loc;
@@ -84,8 +85,11 @@ module.exports = {
             } else {
                 message = "Extra semicolon.";
                 loc = loc.start;
-                fix = function(fixer) {
-                    return fixer.remove(lastToken);
+                fix = function *(fixer) {
+                    yield fixer.remove(lastToken);
+                    if (nextToken) {
+                        yield fixer.keep(nextToken);
+                    }
                 };
             }
 

diff --git a/lib/testers/rule-tester.js b/lib/testers/rule-tester.js
@@ -450,9 +450,11 @@ RuleTester.prototype = {
                     util.format("Should have %d error%s but had %d: %s",
                     item.errors.length, item.errors.length === 1 ? "" : "s", messages.length, util.inspect(messages)));
 
+                const hasMessageOfThisRule = messages.some(m => m.ruleId === ruleName);
+
                 for (let i = 0, l = item.errors.length; i < l; i++) {
-                    assert.ok(!("fatal" in messages[i]), `A fatal parsing error occurred: ${messages[i].message}`);
-                    assert.equal(messages[i].ruleId, ruleName, "Error rule name should be the same as the name of the rule being tested");
+                    assert(!messages[i].fatal, `A fatal parsing error occurred: ${messages[i].message}`);
+                    assert(hasMessageOfThisRule, "Error rule name should be the same as the name of the rule being tested");
 
                     if (typeof item.errors[i] === "string") {
 

diff --git a/tests/lib/rules/semi.js b/tests/lib/rules/semi.js
@@ -169,6 +169,25 @@ ruleTester.run("semi", rule, {
         { code: "export default (foo) => foo.bar();", output: "export default (foo) => foo.bar()", options: ["never"], parserOptions: { sourceType: "module" }, errors: [{ message: "Extra semicolon.", type: "ExportDefaultDeclaration" }] },
         { code: "export default foo = 42;", output: "export default foo = 42", options: ["never"], parserOptions: { sourceType: "module" }, errors: [{ message: "Extra semicolon.", type: "ExportDefaultDeclaration" }] },
         { code: "export default foo += 42;", output: "export default foo += 42", options: ["never"], parserOptions: { sourceType: "module" }, errors: [{ message: "Extra semicolon.", type: "ExportDefaultDeclaration" }] },
-        { code: "a;\n++b", output: "a\n++b", options: ["never"], errors: [{ message: "Extra semicolon." }] }
+        { code: "a;\n++b", output: "a\n++b", options: ["never"], errors: [{ message: "Extra semicolon." }] },
+
+        // https://github.com/eslint/eslint/issues/7928
+        {
+            options: ["never"],
+            code: [
+                "/*eslint no-extra-semi: error */",
+                "foo();",
+                ";[0,1,2].forEach(bar)"
+            ].join("\n"),
+            errors: [
+                "Extra semicolon.",
+                "Unnecessary semicolon."
+            ],
+            output: [
+                "/*eslint no-extra-semi: error */",
+                "foo()",
+                ";[0,1,2].forEach(bar)"
+            ].join("\n")
+        }
     ]
 });