Java: Improvements in intention to split switch branch with multiple values into separate branches (IDEA-203895)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterFirstValueInRule.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterLastValueInRule.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterManyValuesRule.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterMultiValueLabel.java

@@ -0,0 +1,18 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            case 1:
+                System.out.println("hello");
+                break;
+            case 2:
+                System.out.println("hello");
+                break;
+            case 3:
+                System.out.println("hello");
+                break;
+            case 4:
+                System.out.println("bye");
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterMultiValueLabelFirst.java

@@ -0,0 +1,13 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            case 2:
+                System.out.println("hello");
+                break;
+            <caret>case 1:
+                System.out.println("hello");
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterMultiValueLabelFirstWithComments.java

@@ -0,0 +1,17 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            // 1
+            case /*2*/ /*3*/2: // 4
+                // 5
+                System.out.println("hello");
+                break;
+            case 1:
+                // 5
+                System.out.println("hello");
+                break;
+            /*6*/
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterMultiValueLabelLast.java

@@ -0,0 +1,13 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            case 1:
+                System.out.println("hello");
+                break;
+            <caret>case 2:
+                System.out.println("hello");
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterMultiValueLabelLastWithExpression.java

@@ -0,0 +1,13 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            case 1:
+                System.out.println("hello");
+                break;
+            case 1 + 1:
+                System.out.println("hello");
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterMultiValueLabelWithComments.java

@@ -0,0 +1,23 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            // 1
+            case /*2*/1 /*3*/ /*4*/: //5
+                // 6
+                System.out.println("hello");
+                break;
+            case 2:
+                // 6
+                System.out.println("hello");
+                break;
+            case 3:
+                // 6
+                System.out.println("hello");
+                break;
+            // 7
+            case 4:
+                System.out.println("bye");
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterRule.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterRuleInExpression.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = switch (n) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterRuleWithComments.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/afterRuleWithExpressionFirst.java

@@ -0,0 +1,10 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 3 -> s = "x";
+            case 1 + 1 -> s = "x";
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeDefaultRule.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "false"
+// "Split values of 'switch' branch" "false"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeFirstValueInRule.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeLastValueInRule.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeManyValuesRule.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeMultiValueLabel.java

@@ -0,0 +1,12 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            <caret>case 1, 2, 3:
+                System.out.println("hello");
+                break;
+            case 4:
+                System.out.println("bye");
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeMultiValueLabelFirst.java

@@ -0,0 +1,10 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            case 1<caret>, 2:
+                System.out.println("hello");
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeMultiValueLabelFirstWithComments.java

@@ -0,0 +1,13 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            // 1
+            case /*2*/1<caret>, /*3*/2: // 4
+                // 5
+                System.out.println("hello");
+                break;
+                /*6*/
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeMultiValueLabelLast.java

@@ -0,0 +1,10 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            case 1, <caret>2:
+                System.out.println("hello");
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeMultiValueLabelLastWithExpression.java

@@ -0,0 +1,10 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            case 1, 1+1<caret>:
+                System.out.println("hello");
+                break;
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeMultiValueLabelWithComments.java

@@ -0,0 +1,15 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void test(int i) {
+        switch (i) {
+            // 1
+            <caret>case /*2*/1, /*3*/2, /*4*/3: //5
+                // 6
+                System.out.println("hello");
+                break;
+            // 7
+            case 4:
+                System.out.println("bye");
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeRule.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeRuleInExpression.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = switch (n) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeRuleWithComments.java

@@ -1,4 +1,4 @@
-// "Split values of 'switch' rule" "true"
+// "Split values of 'switch' branch" "true"
 class C {
     void foo(int n) {
         String s = "";

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitSwitchBranchWithSeveralCaseValues/beforeRuleWithExpressionFirst.java

@@ -0,0 +1,9 @@
+// "Split values of 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case <caret>1 + 1, 3 -> s = "x";
+        }
+    }
+}