Fix babel/semi for private properties

babel · Jun 25, 2020 · f4ced99 · f4ced99
1 parent 0f558b3
commit f4ced99
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules
+package-lock.json
diff --git a/rules/semi.js b/rules/semi.js
@@ -67,31 +67,38 @@ const report = (context, node, missing) => {
     });
 };
 
+const checkForSemicolon = (node, context) => {
+    const options = context.options[1];
+    const exceptOneLine = options && options.omitLastInOneLineBlock === true;
+
+    const sourceCode = context.getSourceCode();
+    const lastToken = sourceCode.getLastToken(node);
+
+    if (context.options[0] === "never") {
+        if (isUnnecessarySemicolon(context, lastToken)) {
+            report(context, node, true);
+        }
+    } else {
+        if (!isSemicolon(lastToken)) {
+            if (!exceptOneLine || !isOneLinerBlock(context, node)) {
+                report(context, node);
+            }
+        } else {
+            if (exceptOneLine && isOneLinerBlock(context, node)) {
+                report(context, node, true);
+            }
+        }
+    }   
+}
+
 const semiRuleWithClassProperty = ruleComposer.joinReports([
     semiRule,
     context => ({
         ClassProperty(node) {
-            const options = context.options[1];
-            const exceptOneLine = options && options.omitLastInOneLineBlock === true;
-
-            const sourceCode = context.getSourceCode();
-            const lastToken = sourceCode.getLastToken(node);
-
-            if (context.options[0] === "never") {
-                if (isUnnecessarySemicolon(context, lastToken)) {
-                    report(context, node, true);
-                }
-            } else {
-                if (!isSemicolon(lastToken)) {
-                    if (!exceptOneLine || !isOneLinerBlock(context, node)) {
-                        report(context, node);
-                    }
-                } else {
-                    if (exceptOneLine && isOneLinerBlock(context, node)) {
-                        report(context, node, true);
-                    }
-                }
-            }
+            checkForSemicolon(node, context);
+        },
+        ClassPrivateProperty(node) {
+            checkForSemicolon(node, context);
         },
     }),
 ]);

diff --git a/tests/rules/semi.js b/tests/rules/semi.js
@@ -101,12 +101,14 @@ ruleTester.run("semi", rule, {
 
         // babel
         "class Foo { bar = 'example'; }",
+        "class Foo { #bar = 'example'; }",
         "class Foo { static bar = 'example'; }",
         { code: "async function foo() { for await (let thing of {}) { console.log(thing); } }", parserOptions: { ecmaVersion: 6 } },
         { code: "class Foo { bar = () => {}; }", options: ["always", { omitLastInOneLineBlock: true }] },
 
         // babel, "never"
         { code: "class Foo { bar = 'example' }", options: ["never"] },
+        { code: "class Foo { #bar = 'example' }", options: ["never"] },
         { code: "class Foo { static bar = 'example' }", options: ["never"] },
         { code: "class Foo { bar = () => {} }", options: ["never"] },
     ],
@@ -185,6 +187,7 @@ ruleTester.run("semi", rule, {
 
         // babel
         { code: "class Foo { bar = 'example' }", errors: [{ message: "Missing semicolon." }] },
+        { code: "class Foo { #bar = 'example' }", errors: [{ message: "Missing semicolon." }] },
         { code: "class Foo { static bar = 'example' }", errors: [{ message: "Missing semicolon." }] },
         {
             code: "class Foo { bar = () => {} }",
@@ -194,6 +197,7 @@ ruleTester.run("semi", rule, {
 
         // babel, "never"
         { code: "class Foo { bar = 'example'; }", options: ["never"], errors: [{ message: "Extra semicolon." }] },
+        { code: "class Foo { #bar = 'example'; }", options: ["never"], errors: [{ message: "Extra semicolon." }] },
         { code: "class Foo { static bar = 'example'; }", options: ["never"], errors: [{ message: "Extra semicolon." }] },
         {
             code: "class Foo { bar = () => {}; }",