Java: Add code block and break-with-value when wrapping result expression of a switch expression (IDEA-204012)

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> <selection>{ break "a"; }</selection>
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf_after.java

@@ -0,0 +1,12 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> {
+                if () {
+                    break "a";
+                }
+            }
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> <selection>"a".substring(1);</selection>
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf_after.java

@@ -0,0 +1,12 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> {
+                if () {
+                    break "a".substring(1);
+                }
+            }
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> /*0*/<selection>/*1*/"a" +/*2*/ "b"/*3*/;</selection>/*4*/
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized_after.java

@@ -0,0 +1,13 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> /*0*/{
+                synchronized () {
+                    /*1*/
+                    "a" +/*2*/ "b"/*3*/;
+                }
+            }/*4*/
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> <selection>throw new RuntimeException();</selection>
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock_after.java

@@ -0,0 +1,10 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> {
+                throw new RuntimeException();
+            }
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> <selection>throw new RuntimeException();</selection>
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf_after.java

@@ -0,0 +1,12 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> {
+                if () {
+                    throw new RuntimeException();
+                }
+            }
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> /*0*/<selection>/*1*/throw new /*2*/RuntimeException("a")/*3*/;</selection>/*4*/
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch_after.java

@@ -0,0 +1,15 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> /*0*/{
+                try {
+                    /*1*/
+                    throw new /*2*/RuntimeException("a")/*3*/;/*4*/
+                } catch (RuntimeException e) {
+                    e.printStackTrace();
+                }
+            }
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> <selection>{ break "a"; }</selection>
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor_after.java

@@ -0,0 +1,12 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> {
+                for () {
+                    break "a";
+                }
+            }
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> <selection>"a".substring(1);</selection>
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor_after.java

@@ -0,0 +1,12 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> {
+                for () {
+                    "a".substring(1);
+                }
+            }
+            default -> "";
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> <selection>{ break "a".substring(1); }</selection>;
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile_after.java

@@ -0,0 +1,12 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> {
+                do {
+                    break "a".substring(1);
+                } while (true);
+            };
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> /*0*/<selection>{/*1*/break /*2*/"a";/*3*/}</selection>/*4*/
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally_after.java

@@ -0,0 +1,15 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> /*0*/{
+                try {
+                    /*1*/
+                    break /*2*/"a";/*3*/
+                } finally {
+                    <caret>
+                }
+            }/*4*/
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> /*0*/<selection>/*1*/"a" + "b"/*2*/;</selection>/*3*/
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable_after.java

@@ -0,0 +1,15 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> /*0*/{
+                Runnable runnable = new Runnable() {
+                    public void run() {
+                        /*1*/
+                        "a" + "b"/*2*/;
+                    }
+                };
+            }/*3*/
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> <selection>"a" + "b";</selection>;
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally_after.java

@@ -0,0 +1,16 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> {
+                try {
+                    break "a" + "b";
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } finally {
+                }
+            }
+            ;
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> <selection>"a" + "b";</selection>
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile_after.java

@@ -0,0 +1,12 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> {
+                while (true) {
+                    "a" + "b";
+                }
+            }
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse.java

@@ -0,0 +1,8 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> <selection>throw new RuntimeException("a");</selection>
+        };
+    }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse_after.java

@@ -0,0 +1,13 @@
+class C {
+    void test(int n) {
+        String s = switch (n) {
+            case 1 -> "";
+            default -> {
+                if () {
+                    throw new RuntimeException("a");
+                } else {
+                }
+            }
+        };
+    }
+}