IDEA-142912 (Intention: replace switch with if failed with bit operator (operator precedence))

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.siyeh.ig.psiutils.ParenthesesUtils;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -117,7 +118,9 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
     else {
       hadSideEffects = false;
       declarationString = null;
-      expressionText = switchExpression.getText();
+      expressionText = ParenthesesUtils.getPrecedence(switchExpression) > ParenthesesUtils.EQUALITY_PRECEDENCE
+                       ? '(' + switchExpression.getText() + ')'
+                       : switchExpression.getText();
     }
     final PsiCodeBlock body = switchStatement.getBody();
     if (body == null) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/after4.java

@@ -0,0 +1,13 @@
+// "Replace 'switch' with 'if'" "true"
+class Precedence {
+
+  void m() {
+    int a = 10;
+      if ((a & 1) == 0) {
+          System.out.println("0");
+
+      } else if ((a & 1) == 1) {
+          System.out.println("1");
+      }
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/before4.java

@@ -0,0 +1,14 @@
+// "Replace 'switch' with 'if'" "true"
+class Precedence {
+
+  void m() {
+    int a = 10;
+    switch<caret>(a & 1) {
+      case 0:
+        System.out.println("0");
+        break;
+      case 1:
+        System.out.println("1");
+    }
+  }
+}