refactor: remove classic switch label rule

Author: clementdessoude

packages/java-parser/api.d.ts

@@ -219,7 +219,6 @@ export abstract class JavaCstVisitor<IN, OUT> implements ICstVisitor<IN, OUT> {
   switchBlock(ctx: SwitchBlockCtx, param?: IN): OUT;
   switchBlockStatementGroup(ctx: SwitchBlockStatementGroupCtx, param?: IN): OUT;
   switchLabel(ctx: SwitchLabelCtx, param?: IN): OUT;
-  classicSwitchLabel(ctx: ClassicSwitchLabelCtx, param?: IN): OUT;
   switchRule(ctx: SwitchRuleCtx, param?: IN): OUT;
   caseConstant(ctx: CaseConstantCtx, param?: IN): OUT;
   whileStatement(ctx: WhileStatementCtx, param?: IN): OUT;
@@ -253,6 +252,7 @@ export abstract class JavaCstVisitor<IN, OUT> implements ICstVisitor<IN, OUT> {
     ctx: IsLocalVariableDeclarationCtx,
     param?: IN
   ): OUT;
+  isClassicSwitchLabel(ctx: IsClassicSwitchLabelCtx, param?: IN): OUT;
   expression(ctx: ExpressionCtx, param?: IN): OUT;
   lambdaExpression(ctx: LambdaExpressionCtx, param?: IN): OUT;
   lambdaParameters(ctx: LambdaParametersCtx, param?: IN): OUT;
@@ -548,7 +548,6 @@ export abstract class JavaCstVisitorWithDefaults<IN, OUT>
   switchBlock(ctx: SwitchBlockCtx, param?: IN): OUT;
   switchBlockStatementGroup(ctx: SwitchBlockStatementGroupCtx, param?: IN): OUT;
   switchLabel(ctx: SwitchLabelCtx, param?: IN): OUT;
-  classicSwitchLabel(ctx: ClassicSwitchLabelCtx, param?: IN): OUT;
   switchRule(ctx: SwitchRuleCtx, param?: IN): OUT;
   caseConstant(ctx: CaseConstantCtx, param?: IN): OUT;
   whileStatement(ctx: WhileStatementCtx, param?: IN): OUT;
@@ -582,6 +581,7 @@ export abstract class JavaCstVisitorWithDefaults<IN, OUT>
     ctx: IsLocalVariableDeclarationCtx,
     param?: IN
   ): OUT;
+  isClassicSwitchLabel(ctx: IsClassicSwitchLabelCtx, param?: IN): OUT;
   expression(ctx: ExpressionCtx, param?: IN): OUT;
   lambdaExpression(ctx: LambdaExpressionCtx, param?: IN): OUT;
   lambdaParameters(ctx: LambdaParametersCtx, param?: IN): OUT;
@@ -2367,7 +2367,8 @@ export interface SwitchBlockStatementGroupCstNode extends CstNode {
 }
 
 export type SwitchBlockStatementGroupCtx = {
-  classicSwitchLabel: ClassicSwitchLabelCstNode[];
+  switchLabel: SwitchLabelCstNode[];
+  Colon: IToken[];
   blockStatements?: BlockStatementsCstNode[];
 };
 
@@ -2381,16 +2382,6 @@ export type SwitchLabelCtx = {
   Default?: IToken[];
 };
 
-export interface ClassicSwitchLabelCstNode extends CstNode {
-  name: "classicSwitchLabel";
-  children: ClassicSwitchLabelCtx;
-}
-
-export type ClassicSwitchLabelCtx = {
-  switchLabel: SwitchLabelCstNode[];
-  Colon: IToken[];
-};
-
 export interface SwitchRuleCstNode extends CstNode {
   name: "switchRule";
   children: SwitchRuleCtx;
@@ -2735,6 +2726,16 @@ export type IsLocalVariableDeclarationCtx = {
   variableDeclaratorId: VariableDeclaratorIdCstNode[];
 };
 
+export interface IsClassicSwitchLabelCstNode extends CstNode {
+  name: "isClassicSwitchLabel";
+  children: IsClassicSwitchLabelCtx;
+}
+
+export type IsClassicSwitchLabelCtx = {
+  switchLabel: SwitchLabelCstNode[];
+  Colon: IToken[];
+};
+
 export interface ExpressionCstNode extends CstNode {
   name: "expression";
   children: ExpressionCtx;

packages/java-parser/src/productions/blocks-and-statements.js

@@ -180,7 +180,7 @@ function defineRules($, t) {
     $.CONSUME(t.LCurly);
     $.OR([
       {
-        GATE: () => this.BACKTRACK_LOOKAHEAD($.classicSwitchLabel),
+        GATE: () => this.BACKTRACK_LOOKAHEAD($.isClassicSwitchLabel),
         ALT: () => $.MANY(() => $.SUBRULE($.switchBlockStatementGroup))
       },
       {
@@ -191,7 +191,10 @@ function defineRules($, t) {
   });
 
   $.RULE("switchBlockStatementGroup", () => {
-    $.AT_LEAST_ONE(() => $.SUBRULE($.classicSwitchLabel));
+    $.AT_LEAST_ONE(() => {
+      $.SUBRULE($.switchLabel);
+      $.CONSUME(t.Colon);
+    });
     $.OPTION(() => {
       $.SUBRULE($.blockStatements);
     });
@@ -219,12 +222,6 @@ function defineRules($, t) {
     ]);
   });
 
-  // https://docs.oracle.com/javase/specs/jls/se11/html/jls-14.html#jls-SwitchLabel
-  $.RULE("classicSwitchLabel", () => {
-    $.SUBRULE($.switchLabel);
-    $.CONSUME(t.Colon);
-  });
-
   // https://docs.oracle.com/javase/specs/jls/se15/html/jls-14.html#jls-SwitchRule
   $.RULE("switchRule", () => {
     $.SUBRULE($.switchLabel);
@@ -555,6 +552,11 @@ function defineRules($, t) {
         return false;
     }
   });
+
+  $.RULE("isClassicSwitchLabel", () => {
+    $.SUBRULE($.switchLabel);
+    $.CONSUME(t.Colon);
+  });
 }
 
 module.exports = {

packages/prettier-plugin-java/src/options.js

@@ -29,7 +29,6 @@ module.exports = {
       { value: "switchLabel" },
       { value: "switchRule" },
       { value: "switchRuleLabel" },
-      { value: "classicSwitchLabel" },
       { value: "caseConstant" },
       { value: "whileStatement" },
       { value: "doStatement" },
@@ -59,6 +58,7 @@ module.exports = {
       { value: "variableAccess" },
       { value: "isBasicForStatement" },
       { value: "isLocalVariableDeclaration" },
+      { value: "isClassicSwitchLabel" },
       { value: "classDeclaration" },
       { value: "normalClassDeclaration" },
       { value: "classModifier" },

packages/prettier-plugin-java/src/printers/blocks-and-statements.js

@@ -209,12 +209,18 @@ class BlocksAndStatementPrettierVisitor {
   }
 
   switchBlockStatementGroup(ctx) {
-    const switchLabels = this.mapVisit(ctx.classicSwitchLabel);
+    const switchLabels = this.mapVisit(ctx.switchLabel);
+
+    const labels = [];
+    for (let i = 0; i < switchLabels.length; i++) {
+      labels.push(concat([switchLabels[i], ctx.Colon[i]]));
+    }
+
     const blockStatements = this.visit(ctx.blockStatements);
 
     return indent(
       rejectAndJoin(hardline, [
-        rejectAndJoin(hardline, switchLabels),
+        rejectAndJoin(hardline, labels),
         blockStatements
       ])
     );
@@ -232,10 +238,6 @@ class BlocksAndStatementPrettierVisitor {
     return ctx.Default[0];
   }
 
-  classicSwitchLabel(ctx) {
-    return concat([this.visit(ctx.switchLabel), ctx.Colon[0]]);
-  }
-
   switchRule(ctx) {
     const switchLabel = this.visit(ctx.switchLabel);
 
@@ -564,6 +566,10 @@ class BlocksAndStatementPrettierVisitor {
   isLocalVariableDeclaration() {
     return "isLocalVariableDeclaration";
   }
+
+  isClassicSwitchLabel() {
+    return "isClassicSwitchLabel";
+  }
 }
 
 module.exports = {