From d01484e0027c8b559cd673402f076daf4ee38aff Mon Sep 17 00:00:00 2001
From: "Andrey.Cherkasov" <andrey.cherkasov@jetbrains.com>
Date: Mon, 21 Dec 2020 12:16:43 +0300
Subject: [PATCH] IDEA-220039: Disable the "Unwrap 'else' branch" intention
 action if the 'else' is not redundant

GitOrigin-RevId: 9ff561b38bce316cbcbd1e24c738b77cf6495460
---
 .../codeInsight/intention/impl/UnwrapElseBranchAction.java      | 2 +-
 .../testData/codeInsight/unwrapElseBranch/beforeBlock3.java     | 2 +-
 .../testData/codeInsight/unwrapElseBranch/beforeChainedIf2.java | 2 +-
 .../testData/codeInsight/unwrapElseBranch/beforeChainedIf3.java | 2 +-
 .../testData/codeInsight/unwrapElseBranch/beforeChainedIf4.java | 2 +-
 .../testData/codeInsight/unwrapElseBranch/beforeSimple3.java    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapElseBranchAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapElseBranchAction.java
index 3dd54a4a1e66..c2f9404d1c6c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapElseBranchAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapElseBranchAction.java
@@ -77,7 +77,7 @@ public class UnwrapElseBranchAction extends PsiElementBaseIntentionAction {
               setText(JavaBundle.message("intention.unwrap.else.branch.changes.semantics"));
             }
             else {
-              setText(JavaBundle.message("intention.unwrap.else.branch"));
+              return false;
             }
             return true;
           }
diff --git a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeBlock3.java b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeBlock3.java
index 2ca04c3317c2..b1ecf0f5de46 100644
--- a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeBlock3.java
+++ b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeBlock3.java
@@ -1,4 +1,4 @@
-// "Unwrap 'else' branch" "true"
+// "Unwrap 'else' branch" "false"
 
 class T {
     void f(boolean b) {
diff --git a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf2.java b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf2.java
index c4502c12f3b2..31ab7fb5a4fa 100644
--- a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf2.java
+++ b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf2.java
@@ -1,4 +1,4 @@
-// "Unwrap 'else' branch" "true"
+// "Unwrap 'else' branch" "false"
 
 class T {
     String f(boolean a, boolean b) {
diff --git a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf3.java b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf3.java
index 858c9fee462f..b7a4c1d3c29c 100644
--- a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf3.java
+++ b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf3.java
@@ -1,4 +1,4 @@
-// "Unwrap 'else' branch" "true"
+// "Unwrap 'else' branch" "false"
 
 class T {
     String f(boolean a, boolean b) {
diff --git a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf4.java b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf4.java
index 980aa98c3656..3ce3d7d66d12 100644
--- a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf4.java
+++ b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeChainedIf4.java
@@ -1,4 +1,4 @@
-// "Unwrap 'else' branch" "true"
+// "Unwrap 'else' branch" "false"
 
 class T {
     String f(boolean a, boolean b) {
diff --git a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeSimple3.java b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeSimple3.java
index bb4d542680da..da80194a1fc9 100644
--- a/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeSimple3.java
+++ b/java/java-tests/testData/codeInsight/unwrapElseBranch/beforeSimple3.java
@@ -1,4 +1,4 @@
-// "Unwrap 'else' branch" "true"
+// "Unwrap 'else' branch" "false"
 
 class T {
     String f(boolean b) {