@@ -11,6 +11,7 @@
 /** @type {import('../types').Rule.RuleModule} */
 module.exports = {
 	meta: {
+		hasSuggestions: true,
 		type: "suggestion",
 
 		docs: {
@@ -23,6 +24,7 @@ module.exports = {
 
 		messages: {
 			unexpected: "Unexpected empty static block.",
+			suggestComment: "Add comment inside empty static block.",
 		},
 	},
 
@@ -32,14 +34,36 @@ module.exports = {
 		return {
 			StaticBlock(node) {
 				if (node.body.length === 0) {
+					const openingBrace = sourceCode.getFirstToken(node, {
+						skip: 1,
+					});
 					const closingBrace = sourceCode.getLastToken(node);
 
 					if (
 						sourceCode.getCommentsBefore(closingBrace).length === 0
 					) {
 						context.report({
-							node,
+							loc: {
+								start: openingBrace.loc.start,
+								end: closingBrace.loc.end,
+							},
 							messageId: "unexpected",
+							suggest: [
+								{
+									messageId: "suggestComment",
+									fix(fixer) {
+										const range = [
+											openingBrace.range[1],
+											closingBrace.range[0],
+										];
+
+										return fixer.replaceTextRange(
+											range,
+											" /* empty */ ",
+										);
+									},
+								},
+							],
 						});
 					}
 				}
 
@@ -29,23 +29,111 @@ ruleTester.run("no-empty-static-block", rule, {
 	invalid: [
 		{
 			code: "class Foo { static {} }",
-			errors: [{ messageId: "unexpected" }],
+			errors: [
+				{
+					messageId: "unexpected",
+					line: 1,
+					column: 20,
+					endLine: 1,
+					endColumn: 22,
+					suggestions: [
+						{
+							messageId: "suggestComment",
+							output: "class Foo { static { /* empty */ } }",
+						},
+					],
+				},
+			],
 		},
 		{
 			code: "class Foo { static { } }",
-			errors: [{ messageId: "unexpected" }],
+			errors: [
+				{
+					messageId: "unexpected",
+					line: 1,
+					column: 20,
+					endLine: 1,
+					endColumn: 23,
+					suggestions: [
+						{
+							messageId: "suggestComment",
+							output: "class Foo { static { /* empty */ } }",
+						},
+					],
+				},
+			],
 		},
 		{
 			code: "class Foo { static { \n\n } }",
-			errors: [{ messageId: "unexpected" }],
+			errors: [
+				{
+					messageId: "unexpected",
+					line: 1,
+					column: 20,
+					endLine: 3,
+					endColumn: 3,
+					suggestions: [
+						{
+							messageId: "suggestComment",
+							output: "class Foo { static { /* empty */ } }",
+						},
+					],
+				},
+			],
 		},
 		{
 			code: "class Foo { static { bar(); } static {} }",
-			errors: [{ messageId: "unexpected" }],
+			errors: [
+				{
+					messageId: "unexpected",
+					line: 1,
+					column: 38,
+					endLine: 1,
+					endColumn: 40,
+					suggestions: [
+						{
+							messageId: "suggestComment",
+							output: "class Foo { static { bar(); } static { /* empty */ } }",
+						},
+					],
+				},
+			],
 		},
 		{
 			code: "class Foo { static // comment\n {} }",
-			errors: [{ messageId: "unexpected" }],
+			errors: [
+				{
+					messageId: "unexpected",
+					line: 2,
+					column: 2,
+					endLine: 2,
+					endColumn: 4,
+					suggestions: [
+						{
+							messageId: "suggestComment",
+							output: "class Foo { static // comment\n { /* empty */ } }",
+						},
+					],
+				},
+			],
+		},
+		{
+			code: "class Foo { static /* empty */ {} /* empty */ }",
+			errors: [
+				{
+					messageId: "unexpected",
+					line: 1,
+					column: 32,
+					endLine: 1,
+					endColumn: 34,
+					suggestions: [
+						{
+							messageId: "suggestComment",
+							output: "class Foo { static /* empty */ { /* empty */ } /* empty */ }",
+						},
+					],
+				},
+			],
 		},
 	],
 });