IDEA-82925 ('Surround with cast' for conditional, polyadic and assignment expressions should parenthesize those expressions)

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundAssignmentWithCast.java

@@ -0,0 +1,7 @@
+class Test {
+  void foo(int a, double b) {
+    if (<selection><caret>a = b</selection>) {
+
+    }
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundAssignmentWithCast_after.java

@@ -0,0 +1,7 @@
+class Test {
+  void foo(int a, double b) {
+    if (((<caret>) (a = b))) {
+
+    }
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundBinaryWithCast.java

@@ -1,6 +1,6 @@
 class Test {
   void foo(int a, double b) {
-    if (<selection><caret>a + b</selection>) {
+    if (<selection><caret>a + b + 1</selection>) {
 
     }
   }

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundBinaryWithCast_after.java

@@ -1,6 +1,6 @@
 class Test {
   void foo(int a, double b) {
-    if (((<caret>) (a + b))) {
+    if (((<caret>) (a + b + 1))) {
 
     }
   }

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundConditionalWithCast.java

@@ -0,0 +1,7 @@
+class Test {
+  void foo(int a, double b) {
+    if (<selection><caret>true ? a : b</selection>) {
+
+    }
+  }
+}

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundConditionalWithCast_after.java

@@ -0,0 +1,7 @@
+class Test {
+  void foo(int a, double b) {
+    if (((<caret>) (true ? a : b))) {
+
+    }
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/generation/surroundWith/JavaSurroundWithTest.java

@@ -117,6 +117,28 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
     }
   }
 
+  public void testSurroundConditionalWithCast() {
+    final TemplateManagerImpl templateManager = (TemplateManagerImpl)TemplateManager.getInstance(getProject());
+    templateManager.setTemplateTesting(true);
+    try {
+      doTest(getTestName(false), new JavaWithCastSurrounder());
+    }
+    finally {
+      templateManager.setTemplateTesting(false);
+    }
+  }
+
+  public void testSurroundAssignmentWithCast() {
+    final TemplateManagerImpl templateManager = (TemplateManagerImpl)TemplateManager.getInstance(getProject());
+    templateManager.setTemplateTesting(true);
+    try {
+      doTest(getTestName(false), new JavaWithCastSurrounder());
+    }
+    finally {
+      templateManager.setTemplateTesting(false);
+    }
+  }
+
   private void doTest(@NotNull String fileName, final Surrounder surrounder) {
     configureByFile(BASE_PATH + fileName + ".java");
     SurroundWithHandler.invoke(getProject(), getEditor(), getFile(), surrounder);