From b828bc93125ca8999d2d8439fb491eeb43151f33 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Tue, 25 Sep 2018 12:54:22 +0700
Subject: [PATCH] TrivialIfInspection: remove asserts (for some reason javac
 compiles this file incorrectly if asserts present)

---
 .../com/siyeh/ig/controlflow/TrivialIfInspection.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java
index cb2d07e95062..0c054401125a 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java
@@ -142,11 +142,13 @@ public class TrivialIfInspection extends BaseInspection implements CleanupLocalI
     if (condition == null) {
       return;
     }
-    CommentTracker tr = new CommentTracker();
     PsiReturnStatement nextStatement = ControlFlowUtils.getNextReturnStatement(statement);
+    if (nextStatement == null) {
+      return;
+    }
+    CommentTracker tr = new CommentTracker();
     @NonNls final String newStatement = "return " + tr.text(condition) + ';';
     PsiReplacementUtil.replaceStatement(statement, newStatement, tr);
-    assert nextStatement != null;
     if (!ControlFlowUtils.isReachable(nextStatement)) {
       nextStatement.delete();
     }
@@ -219,7 +221,7 @@ public class TrivialIfInspection extends BaseInspection implements CleanupLocalI
   private static void replaceSimplifiableImplicitAssignmentNegated(PsiIfStatement statement) {
     final PsiElement prevStatement = PsiTreeUtil.skipWhitespacesBackward(statement);
     final PsiExpression condition = statement.getCondition();
-    if (condition == null) {
+    if (condition == null || prevStatement == null) {
       return;
     }
     final String conditionText = BoolUtils.getNegatedExpressionText(condition);
@@ -234,7 +236,6 @@ public class TrivialIfInspection extends BaseInspection implements CleanupLocalI
     final PsiExpression lhs = assignmentExpression.getLExpression();
     final String lhsText = lhs.getText();
     PsiReplacementUtil.replaceStatement(statement, lhsText + operand + conditionText + ';');
-    assert prevStatement != null;
     prevStatement.delete();
   }