feat: ignore comment that isn't inside block

eslint · Oct 31, 2022 · c697d95 · c697d95
1 parent 5943523
commit c697d95
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/lib/rules/no-empty-static-block.js b/lib/rules/no-empty-static-block.js
@@ -4,12 +4,6 @@
  */
 "use strict";
 
-//------------------------------------------------------------------------------
-// Requirements
-//------------------------------------------------------------------------------
-
-const astUtils = require("./utils/ast-utils");
-
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -37,10 +31,11 @@ module.exports = {
 
         return {
             StaticBlock(node) {
-                const innerComments = sourceCode.getTokens(node, {
-                    includeComments: true,
-                    filter: astUtils.isCommentToken
+                const [blockOpenToken] = sourceCode.getFirstTokens(node, {
+                    filter: token => token.type === "Punctuator" && token.value === "{"
                 });
+                const innerComments =
+                    sourceCode.getCommentsInside(node).filter(commentToken => blockOpenToken.range[1] < commentToken.range[0]);
 
                 if (node.body.length === 0 && innerComments.length === 0) {
                     context.report({

diff --git a/tests/lib/rules/no-empty-static-block.js b/tests/lib/rules/no-empty-static-block.js
@@ -42,6 +42,10 @@ ruleTester.run("no-empty-static-block", rule, {
         {
             code: "class Foo { static { bar(); } static {} }",
             errors: [{ messageId: "unexpected" }]
+        },
+        {
+            code: "class Foo { static // comment\n {} }",
+            errors: [{ messageId: "unexpected" }]
         }
     ]
 });