invert if: fix parent ifStatement (IDEA-191327)

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

@@ -213,6 +213,11 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
       PsiStatement statement = factory.createStatementFromText("return;", ifStatement);
       statement = (PsiStatement) codeStyle.reformat(statement);
       if (thenBranch instanceof PsiBlockStatement) {
+        if (ifStatement.getParent() instanceof PsiIfStatement) {
+          ifStatement = (PsiIfStatement)wrapWithCodeBlock(ifStatement);
+          thenBranch = ifStatement.getThenBranch();
+          assert thenBranch != null;
+        }
         PsiCodeBlock codeBlock = ((PsiBlockStatement)thenBranch).getCodeBlock();
         PsiElement firstElement = codeBlock.getFirstBodyElement();
         PsiElement lastElement = codeBlock.getLastBodyElement();

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

@@ -0,0 +1,12 @@
+// "Invert 'if' condition" "true"
+class A {
+    public void foo(boolean c, boolean c2) {
+        if (c) a();
+        else {
+            if (c2) {
+                return;
+            }
+            b();
+        }
+    }
+}

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

@@ -0,0 +1,7 @@
+// "Invert 'if' condition" "true"
+class A {
+    public void foo(boolean c, boolean c2) {
+        if (c) a();
+        else if (!c<caret>2) b();
+    }
+}