Combine selectors

babel · Jun 27, 2020 · 7c96021 · 7c96021
1 parent f4ced99
commit 7c96021
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
 node_modules
-package-lock.json
diff --git a/rules/semi.js b/rules/semi.js
@@ -67,38 +67,31 @@ 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) {
-            checkForSemicolon(node, context);
-        },
-        ClassPrivateProperty(node) {
-            checkForSemicolon(node, context);
+        "ClassProperty, ClassPrivateProperty"(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);
+                    }
+                }
+            }
         },
     }),
 ]);