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

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

@@ -0,0 +1,14 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 2:
+                s = "x";
+                break;
+            case 1:
+                s = "x";
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 2:
+                s = "x";
+                break;
+            case 1:
+                s = "x";
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            // 3
+            case 2: // 4
+                // 5
+                s = "x"; // 6
+                // 7
+                break; // 8
+// 1
+            case 1: // 2
+                // 5
+                s = "x"; // 6
+                // 7
+                break; // 8
+            //9
+        }
+    }
+}

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

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

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

@@ -0,0 +1,16 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+                s = "x";
+                break;
+            case 2:
+                s = "x";
+                break;
+            case 4:
+                s = "y";
+        }
+    }
+}

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

@@ -0,0 +1,14 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+                s = "x";
+                break;
+            case 2:
+                s = "x";
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+                s = "x";
+                break;
+            case 2:
+                s = "x";
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            // 1
+            case 1: // 2
+                // 5
+                s = "x"; // 6
+                // 7
+                break; // 8
+            // 3
+            case 2: // 4
+                // 5
+                s = "x"; // 6
+                // 7
+                break; // 8
+            // 9
+        }
+    }
+}

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

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

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

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

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

@@ -0,0 +1,15 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+            case 3:
+                s = "x";
+                break;
+            <caret>case 2:
+                s = "x";
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,17 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+            case 3:
+                s = "x";
+                break;
+            <caret>case 2:
+                s = "x";
+                break;
+            case 4:
+                s = "y";
+        }
+    }
+}

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

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

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

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

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

@@ -0,0 +1,10 @@
+// "Split values of 'switch' rule" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            /*1*/case /*2*/1/*3*//*4*/ ->/*5*/ s /*6*/= "x";
+            case 2 -> s /*6*/= "x";/*7*/ //8
+        }
+    }
+}

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

@@ -0,0 +1,10 @@
+// "Split values of 'switch' rule" "false"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1, 2 -> s = "x";
+            <caret>default -> s = "";
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            <caret>case 1:
+            case 2:
+                s = "x";
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+// "Copy 'switch' branch" "false"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            <caret>case 1:
+            case 2:
+                s = "x";
+            case 3:
+                System.out.println(s);
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            <caret>case 1:
+            case 2:
+                s = "x";
+        }
+    }
+}

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

@@ -0,0 +1,17 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            // 1
+            <caret>case 1: // 2
+            // 3
+            case 2: // 4
+                // 5
+                s = "x"; // 6
+                // 7
+                break; // 8
+            //9
+        }
+    }
+}

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

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

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

@@ -0,0 +1,14 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+            <caret>case 2:
+                s = "x";
+                break;
+            case 4:
+                s = "y";
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+            case 2:<caret>
+                s = "x";
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+            case 2:<caret>
+                s = "x";
+        }
+    }
+}

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

@@ -0,0 +1,17 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            // 1
+            case 1: // 2
+            // 3
+            case 2:<caret> // 4
+                // 5
+                s = "x"; // 6
+                // 7
+                break; // 8
+            // 9
+        }
+    }
+}

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

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

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

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

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

@@ -0,0 +1,13 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+            <caret>case 2:
+            case 3:
+                s = "x";
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,15 @@
+// "Copy 'switch' branch" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            case 1:
+            <caret>case 2:
+            case 3:
+                s = "x";
+                break;
+            case 4:
+                s = "y";
+        }
+    }
+}

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

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

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

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

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

@@ -0,0 +1,9 @@
+// "Split values of 'switch' rule" "true"
+class C {
+    void foo(int n) {
+        String s = "";
+        switch (n) {
+            /*1*/<caret>case /*2*/1,/*3*/ 2/*4*/ ->/*5*/ s /*6*/= "x";/*7*/ //8
+        }
+    }
+}