IDEA-203119 Unwrap switch statement: support expressions

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterDeleteWhenOtherIsAlwaysTrue.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff() {
         System.out.println("one");

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrap.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapCannotConvertBreaks.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpression2Java12Preview.java

@@ -0,0 +1,20 @@
+// "Remove unreachable branches" "true"
+class Main {
+    static void fff(int x) {
+        if (x == 5) {
+            //1
+            //2
+            //3
+            //4
+            //5
+            //6
+            //7
+            //other
+            System.out.println("five-ten-fifteen");
+        }
+    }
+
+    public static void main(String[] args) {
+        fff();
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpressionJava12Preview.java

@@ -0,0 +1,24 @@
+// "Remove unreachable branches" "true"
+class Main {
+    static void fff(int x) {
+        if (x == 5) {
+            System.out.println(switch (x) {
+                //1
+                //2
+                //3
+                //4
+                case 5 -> {
+                    System.out.println("something");
+                    break "five-ten-fifteen"; //5
+                }
+                //6
+                //7
+                //other
+            });
+        }
+    }
+
+    public static void main(String[] args) {
+        fff();
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapJava12Preview.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleConflictingDeclarationJava12Preview.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleExpressionJava12Preview.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleJava12Preview.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeDeleteWhenOtherIsAlwaysTrue.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff() {
         switch ("one") {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrap.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapCannotConvertBreaks.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpression2Java12Preview.java

@@ -0,0 +1,21 @@
+// "Remove unreachable branches" "true"
+class Main {
+    static void fff(int x) {
+        if (x == 5) {
+            System.out.println(switch (x) {
+                case 1 -> "one"; //1
+                case 2 -> "two"; //2
+                case 3 -> "three"; //3
+                case 4 -> "four"; //4
+                case 0, <caret>5, 10 -> "five-ten-fifteen"; //5
+                case 6 -> "six"; //6
+                case 7 -> "seven"; //7
+                default -> "and more"; //other
+            });
+        }
+    }
+
+    public static void main(String[] args) {
+        fff();
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpressionJava12Preview.java

@@ -0,0 +1,24 @@
+// "Remove unreachable branches" "true"
+class Main {
+    static void fff(int x) {
+        if (x == 5) {
+            System.out.println(switch (x) {
+                case 1 -> "one"; //1
+                case 2 -> "two"; //2
+                case 3 -> "three"; //3
+                case 4 -> "four"; //4
+                case 0, <caret>5, 10 -> {
+                    System.out.println("something");
+                    break "five-ten-fifteen"; //5
+                }
+                case 6 -> "six"; //6
+                case 7 -> "seven"; //7
+                default -> "and more"; //other
+            });
+        }
+    }
+
+    public static void main(String[] args) {
+        fff();
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapJava12Preview.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleConflictingDeclarationJava12Preview.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleExpressionJava12Preview.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleJava12Preview.java

@@ -1,4 +1,4 @@
-// "Unwrap 'switch' statement" "true"
+// "Remove unreachable branches" "true"
 class Main {
     static void fff(int x) {
         if (x == 5) {