java invert if: ignore redundant return stmts (IDEA-258495)

GitOrigin-RevId: 4a1fc182d5e8e053dd60288b85764a511e72c08a

java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java

@@ -327,7 +327,8 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
           }
         }
       }
-      if (thenBranch instanceof PsiContinueStatement) {
+      if (thenBranch instanceof PsiContinueStatement || 
+          thenBranch instanceof PsiReturnStatement && ((PsiReturnStatement)thenBranch).getReturnValue() == null) {
         PsiStatement elseBranch = ifStatement.getElseBranch();
         if (elseBranch != null) {
           elseBranch.delete();

java/java-tests/testData/codeInsight/invertIfCondition/afterBrokenCodeWithTypeParameterDeclaredInside.java

@@ -12,8 +12,5 @@ class A {
 
             });
         }
-        else {
-            return;
-        }
     }
 }

java/java-tests/testData/codeInsight/invertIfCondition/afterFlow3.java

@@ -4,8 +4,5 @@ class A {
         <caret>if (c) {
             foo();
         }
-        else {
-            return;
-        }
     }
 }