EA-31560 - IOE: PsiJavaParserFacadeImpl.createExpressionFromText

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

@@ -29,6 +29,7 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
@@ -254,7 +255,7 @@ public class SimplifyBooleanExpressionFix implements IntentionAction {
         }
         else {
           final PsiJavaToken javaToken = expression.getTokenBeforeOperand(operand);
-          if (javaToken != null) {
+          if (javaToken != null && !PsiTreeUtil.hasErrorElements(operand)) {
             resultExpression = JavaPsiFacade.getElementFactory(expression.getProject()).createExpressionFromText(lExpr.getText() + javaToken.getText() + operand.getText(), expression);
           } else {
             resultExpression = null;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/simplifyBooleanExpression/beforeBrokenInsidePolyadic.java

@@ -0,0 +1,6 @@
+// "Simplify boolean expression" "false"
+class X {
+    void f(int a, int b, int c) {
+        if ( b - a == b - c - <caret>== b) return;
+    }
+}

platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java

@@ -210,6 +210,9 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
             }
           });
         }
+        if (!myWasShown && object instanceof PaintEvent){
+          return false;
+        }
         return isStarted() && !isRunning();
       }
     });