From 35ff2722015a8c9e261ba7022868a64a24da8435 Mon Sep 17 00:00:00 2001
From: Mikhail Pyltsin <Mikhail.Pyltsin@jetbrains.com>
Date: Tue, 13 Feb 2024 15:39:15 +0100
Subject: [PATCH] Revert "[java-highlighting] IJ-CR-125397 IDEA-344235 support
 calls with checked exceptions for instanceOf patterns"

This reverts commit a6218b0150d17dc44940b392817e30c17f18adc0.

GitOrigin-RevId: 9283459df91e19bb1ad094a4101bdfebb865013b
---
 .../intellij/psi/controlFlow/ControlFlowOptions.java  | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowOptions.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowOptions.java
index 0a76c537f070..fdbe00e70939 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowOptions.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowOptions.java
@@ -70,15 +70,8 @@ public class ControlFlowOptions {
    * @see #shouldEvaluateConstantIfCondition() 
    */
   public ControlFlowOptions dontEvaluateConstantIfCondition() {
-    if (myEvaluateConstantIfCondition) {
-      if (!myOnlyExplicitExceptions) {
-        return create(myEnableShortCircuit, false, myExceptionAfterAssignment);
-      }
-      else {
-        return new ControlFlowOptions(myEnableShortCircuit, false, myExceptionAfterAssignment, myOnlyExplicitExceptions);
-      }
-    }
-    return this;
+    return myEvaluateConstantIfCondition ?
+           create(myEnableShortCircuit, false, myExceptionAfterAssignment) : this;
   }
 
   @Override