IDEA-50592 'Surround with cast' for binary expressions (e.g. a+b) should parenthesize those expressions

java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithCastSurrounder.java

@@ -25,6 +25,7 @@ import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.editor.ScrollType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.PsiBinaryExpression;
 import com.intellij.psi.PsiExpression;
 import com.intellij.psi.PsiType;
 import com.intellij.refactoring.introduceField.ElementToWorkOn;
@@ -44,7 +45,8 @@ class JavaWithCastSurrounder extends JavaExpressionSurrounder {
   public TextRange surroundExpression(final Project project, final Editor editor, PsiExpression expr) throws IncorrectOperationException {
     assert expr.isValid();
     PsiType[] types = GuessManager.getInstance(project).guessTypeToCast(expr);
-    final Template template = generateTemplate(project, expr.getText(), types);
+    String exprText = expr instanceof PsiBinaryExpression ? "(" + expr.getText() + ")" : expr.getText();
+    final Template template = generateTemplate(project, exprText, types);
     TextRange range;
     if (expr.isPhysical()) {
       range = expr.getTextRange();

java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundBinaryWithCast.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/SurroundBinaryWithCast_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/SurroundNonExpressionWithCast_after.java

@@ -1,7 +1,7 @@
 class Test {
   void foo() {
     String a = "", b = "", c = "";
-    if (a + (() b + c)) {
+    if (a + (() (b + c))) {
 
     }
   }

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

@@ -106,7 +106,18 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
     doTest(getTestName(false), new JavaWithNotSurrounder());
   }
 
-  private void doTest(@NotNull String fileName, final Surrounder surrounder) throws Exception {
+  public void testSurroundBinaryWithCast() {
+    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);
     checkResultByFile(BASE_PATH + fileName + "_after.java");

plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundExpressionTest.java

@@ -15,6 +15,7 @@ public class SurroundExpressionTest extends SurroundTestCase {
   public void testType_cast2() throws Exception { doTest(new TypeCastSurrounder()); }
   public void testWhile1() throws Exception { doTest(new WhileExprSurrounder()); }
   public void testWith2() throws Exception { doTest(new WithExprSurrounder()); }
+  public void testBinaryWithCast() throws Exception { doTest(new TypeCastSurrounder()); }
 
   @Override
   protected String getBasePath() {

plugins/groovy/testdata/groovy/surround/expr/binaryWithCast.test

@@ -0,0 +1,3 @@
+<selection>a + b</selection>
+-----
+(() (a + b))

plugins/groovy/testdata/groovy/surround/expr/type_cast1.test

@@ -1,3 +1,3 @@
 <selection>expr</selection>
 -----
-(() expr)
+((<caret>) expr)