fix: ignore empty switch statements with comments in no-empty rule (#20045)

jaymarvelz · web-flow · commit bfa46013e7ea · 2025-08-28T09:52:33.000+02:00
* fix: ignore empty switch statements with comments in no-empty rule

* simplify range
diff --git a/docs/src/rules/no-empty.md b/docs/src/rules/no-empty.md
@@ -55,6 +55,10 @@ while (foo) {
     /* empty */
 }
 
+switch(foo) {
+    /* empty */
+}
+
 try {
     doSomething();
 } catch (ex) {
diff --git a/lib/rules/no-empty.js b/lib/rules/no-empty.js
@@ -104,10 +104,47 @@ module.exports = {
 					typeof node.cases === "undefined" ||
 					node.cases.length === 0
 				) {
+					const openingBrace = sourceCode.getTokenAfter(
+						node.discriminant,
+						astUtils.isOpeningBraceToken,
+					);
+
+					const closingBrace = sourceCode.getLastToken(node);
+
+					if (
+						sourceCode.commentsExistBetween(
+							openingBrace,
+							closingBrace,
+						)
+					) {
+						return;
+					}
+
 					context.report({
 						node,
+						loc: {
+							start: openingBrace.loc.start,
+							end: closingBrace.loc.end,
+						},
 						messageId: "unexpected",
 						data: { type: "switch" },
+						suggest: [
+							{
+								messageId: "suggestComment",
+								data: { type: "switch" },
+								fix(fixer) {
+									const range = [
+										openingBrace.range[1],
+										closingBrace.range[0],
+									];
+
+									return fixer.replaceTextRange(
+										range,
+										" /* empty */ ",
+									);
+								},
+							},
+						],
 					});
 				}
 			},
diff --git a/tests/lib/rules/no-empty.js b/tests/lib/rules/no-empty.js
@@ -30,6 +30,7 @@ ruleTester.run("no-empty", rule, {
 		"function foo() { }",
 		"if (foo) {/* empty */}",
 		"while (foo) {/* empty */}",
+		"switch (foo) {/* empty */}",
 		"for (;foo;) {/* empty */}",
 		"try { foo() } catch (ex) {/* empty */}",
 		"try { foo() } catch (ex) {// empty\n}",
@@ -159,18 +160,38 @@ ruleTester.run("no-empty", rule, {
 					messageId: "unexpected",
 					data: { type: "switch" },
 					type: "SwitchStatement",
-					suggestions: null,
+					line: 1,
+					column: 13,
+					endLine: 1,
+					endColumn: 15,
+					suggestions: [
+						{
+							messageId: "suggestComment",
+							data: { type: "switch" },
+							output: "switch(foo) { /* empty */ }",
+						},
+					],
 				},
 			],
 		},
 		{
-			code: "switch (foo) { /* empty */ }",
+			code: "switch /* empty */ (/* empty */ foo /* empty */) /* empty */ {} /* empty */",
 			errors: [
 				{
 					messageId: "unexpected",
 					data: { type: "switch" },
 					type: "SwitchStatement",
-					suggestions: null,
+					line: 1,
+					column: 62,
+					endLine: 1,
+					endColumn: 64,
+					suggestions: [
+						{
+							messageId: "suggestComment",
+							data: { type: "switch" },
+							output: "switch /* empty */ (/* empty */ foo /* empty */) /* empty */ { /* empty */ } /* empty */",
+						},
+					],
 				},
 			],
 		},
