Fix default case not always being last

Vineflower · May 5, 2024 · bdd2941 · bdd2941
1 parent fa6317a
commit bdd2941
Show file tree

Hide file tree

Showing 6 changed files with 261 additions and 163 deletions.
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchPatternMatchProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchPatternMatchProcessor.java
@@ -186,6 +186,26 @@ private static boolean processStatement(SwitchStatement stat, Statement root) {
       }
     }
 
+    for (int i = 0; i < stat.getCaseValues().size(); i++) {
+      if (stat.getCaseValues().get(i).contains(null)) {
+        // Default case statements are required to be last
+        stat.getCaseValues().add(stat.getCaseValues().remove(i));
+        stat.getCaseStatements().add(stat.getCaseStatements().remove(i));
+        stat.getCaseEdges().add(stat.getCaseEdges().remove(i));
+        if (i < stat.getCaseGuards().size()) {
+          if (stat.getCaseGuards().get(i) != null) {
+            while (stat.getCaseGuards().size() < stat.getCaseStatements().size()) {
+              stat.getCaseGuards().add(null);
+            }
+            stat.getCaseGuards().add(stat.getCaseGuards().remove(i));
+          } else {
+            stat.getCaseGuards().remove(i);
+          }
+        }
+        break;
+      }
+    }
+
     // go through bootstrap arguments to ensure types are correct & add enum/integer/string constants
     for (int i = 0; i < value.getBootstrapArguments().size(); i++) {
       PooledConstant bsa = value.getBootstrapArguments().get(i);

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -704,6 +704,7 @@ private void registerDefault() {
     register(JAVA_21, "TestInnerClasses3J21");
     register(JAVA_8, "TestInnerClassesJ8");
     register(JAVA_8, "TestSwitchInTry");
+    register(JAVA_21, "TestSwitchPatternMatchingJ21");
   }
 
   private void registerEntireClassPath() {

diff --git a/testData/results/pkg/TestSwitchPatternMatching19.dec b/testData/results/pkg/TestSwitchPatternMatching19.dec
@@ -5,10 +5,6 @@ public class TestSwitchPatternMatching19 {
    static void test(TestSwitchPatternMatching19.XXX s) {
       <unknown> var1;
       switch (s) {// 5
-         case null:
-         default:
-            System.out.println("f");// 11
-            break;
          case X1:
             System.out.println("x1");// 6
             break;
@@ -22,6 +18,10 @@ public class TestSwitchPatternMatching19 {
             System.out.println("d");
             break;
          case TestSwitchPatternMatching19.XXX var11 when false:
+            break;
+         case null:
+         default:
+            System.out.println("f");// 11
       }
    }// 13
 
@@ -114,73 +114,72 @@ class 'pkg/TestSwitchPatternMatching19' {
       2d      6
       2e      6
       2f      6
-      30      12
-      31      12
-      32      12
-      33      12
-      34      12
-      35      12
-      36      12
-      37      12
-      38      13
-      3b      14
-      3d      14
-      3e      14
-      3f      14
-      40      14
-      41      14
-      42      14
-      43      14
-      49      15
-      4a      15
-      4b      15
-      4c      15
-      4d      15
-      4e      15
-      4f      15
-      50      15
-      51      16
-      54      17
-      57      17
-      58      17
-      59      17
-      5a      17
-      5b      17
-      64      18
-      65      18
-      66      18
-      67      18
-      68      18
-      69      18
-      6a      18
-      6b      18
-      6c      19
-      6f      20
-      72      20
-      73      20
-      74      20
-      75      20
-      76      20
-      77      20
-      78      20
-      7e      21
-      7f      21
-      80      21
-      81      21
-      82      21
-      83      21
-      84      21
-      85      21
-      86      22
-      94      9
-      95      9
-      96      9
-      97      9
-      98      9
-      99      9
-      9a      9
-      9b      9
-      9c      10
+      30      8
+      31      8
+      32      8
+      33      8
+      34      8
+      35      8
+      36      8
+      37      8
+      38      9
+      3b      10
+      3d      10
+      3e      10
+      3f      10
+      40      10
+      41      10
+      42      10
+      43      10
+      49      11
+      4a      11
+      4b      11
+      4c      11
+      4d      11
+      4e      11
+      4f      11
+      50      11
+      51      12
+      54      13
+      57      13
+      58      13
+      59      13
+      5a      13
+      5b      13
+      64      14
+      65      14
+      66      14
+      67      14
+      68      14
+      69      14
+      6a      14
+      6b      14
+      6c      15
+      6f      16
+      72      16
+      73      16
+      74      16
+      75      16
+      76      16
+      77      16
+      78      16
+      7e      17
+      7f      17
+      80      17
+      81      17
+      82      17
+      83      17
+      84      17
+      85      17
+      86      18
+      94      23
+      95      23
+      96      23
+      97      23
+      98      23
+      99      23
+      9a      23
+      9b      23
       9f      25
    }
 
@@ -262,11 +261,11 @@ class 'pkg/TestSwitchPatternMatching19' {
 
 Lines mapping:
 5 <-> 7
-6 <-> 13
-7 <-> 15
-8 <-> 18
-9 <-> 21
-11 <-> 10
+6 <-> 9
+7 <-> 11
+8 <-> 14
+9 <-> 17
+11 <-> 24
 13 <-> 26
 16 <-> 29
 17 <-> 35