From 08632d322759dfc1f3ebd8d996574849f652f9c9 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <tagir.valeev@jetbrains.com>
Date: Fri, 17 Nov 2023 12:19:04 +0100
Subject: [PATCH] [java-inspections] SimplifyBooleanExpressionFix: disallow
 retarget to existing pattern variable if variable was changed (IDEA-336123)

GitOrigin-RevId: 82ce60a815b80bad2593de8f5a20af7e53acb5c7
---
 .../impl/quickfix/SimplifyBooleanExpressionFix.java | 12 ++++++++++--
 .../afterPatternRetargetExistingChanged.java        | 13 +++++++++++++
 .../beforePatternRetargetExistingChanged.java       | 12 ++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/afterPatternRetargetExistingChanged.java
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/beforePatternRetargetExistingChanged.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java
index b860facd8fcb..0c967995e1af 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java
@@ -140,7 +140,15 @@ public class SimplifyBooleanExpressionFix extends PsiUpdateModCommandAction<PsiE
       (PsiTypeCastExpression)JavaPsiFacade.getElementFactory(expression.getProject()).createExpressionFromText("(a)b", expression);
     Objects.requireNonNull(cast.getCastType()).replace(checkType);
     Objects.requireNonNull(cast.getOperand()).replace(instanceOf.getOperand());
-    return InstanceOfUtils.findPatternCandidate(cast);
+    PsiInstanceOfExpression candidate = InstanceOfUtils.findPatternCandidate(cast);
+    if (candidate == null) return null;
+    PsiPrimaryPattern pattern = candidate.getPattern();
+    if (pattern != null) {
+      if (!(pattern instanceof PsiTypeTestPattern existingTypeTest)) return null;
+      PsiPatternVariable existingVar = existingTypeTest.getPatternVariable();
+      if (existingVar != null && VariableAccessUtils.variableIsAssigned(existingVar)) return null;
+    }
+    return candidate;
   }
 
   private static boolean containsBreakOrContinue(PsiDoWhileStatement doWhileLoop) {
@@ -238,7 +246,6 @@ public class SimplifyBooleanExpressionFix extends PsiUpdateModCommandAction<PsiE
     Objects.requireNonNull(newPattern.getCheckType()).replace(checkType);
     PsiPatternVariable newVariable = (PsiPatternVariable)Objects.requireNonNull(newPattern.getPatternVariable()).replace(variable);
     variable.delete();
-    target.replace(updated);
     String name = new VariableNameGenerator(target, VariableKind.LOCAL_VARIABLE).byName(variable.getName())
       .generate(true);
     if (!name.equals(newVariable.getName())) {
@@ -249,6 +256,7 @@ public class SimplifyBooleanExpressionFix extends PsiUpdateModCommandAction<PsiE
         }
       }
     }
+    target.replace(updated);
   }
 
   private PsiExpression ensureCodeBlock(@NotNull Project project, PsiExpression subExpression) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/afterPatternRetargetExistingChanged.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/afterPatternRetargetExistingChanged.java
new file mode 100644
index 000000000000..a453063238fb
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/afterPatternRetargetExistingChanged.java
@@ -0,0 +1,13 @@
+// "Simplify 'obj instanceof String str' to true extracting side effects" "true"
+class Test {
+  void test(Object obj) {
+    if (obj instanceof String s) {
+      s = s.trim();
+        String str = (String) obj;
+        if (str.isEmpty()) {
+
+      }
+      System.out.println(s);
+    }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/beforePatternRetargetExistingChanged.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/beforePatternRetargetExistingChanged.java
new file mode 100644
index 000000000000..963a6a97280f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/beforePatternRetargetExistingChanged.java
@@ -0,0 +1,12 @@
+// "Simplify 'obj instanceof String str' to true extracting side effects" "true"
+class Test {
+  void test(Object obj) {
+    if (obj instanceof String s) {
+      s = s.trim();
+      if (obj instanceof<caret> String str && str.isEmpty()) {
+
+      }
+      System.out.println(s);
+    }
+  }
+}
\ No newline at end of file