IG: disable "Assertion can be replaced with if statement" inspection on invalid code (IDEA-176562)

plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/AssertionCanBeIfInspection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2013 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2017 Dave Griffith, Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,7 @@ package com.siyeh.ig.asserttoif;
 
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiAssertStatement;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiExpression;
+import com.intellij.psi.*;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
@@ -56,24 +54,20 @@ public class AssertionCanBeIfInspection extends BaseInspection {
     return new AssertToIfFix();
   }
 
-  private static void doFixImpl(@NotNull PsiElement element) {
-    final PsiAssertStatement assertStatement = (PsiAssertStatement)element;
-    @NonNls final StringBuilder newStatement = new StringBuilder();
-    final PsiExpression condition = assertStatement.getAssertCondition();
-    newStatement.append("if(").append(BoolUtils.getNegatedExpressionText(condition)).append(") throw new java.lang.AssertionError(");
-    final PsiExpression description = assertStatement.getAssertDescription();
-    if (description != null) {
-      newStatement.append(description.getText());
-    }
-    newStatement.append(");");
-    PsiReplacementUtil.replaceStatement(assertStatement, newStatement.toString());
-  }
-
   private static class AssertToIfVisitor extends BaseInspectionVisitor {
     @Override
     public void visitAssertStatement(PsiAssertStatement assertStatement) {
       super.visitAssertStatement(assertStatement);
-      if (assertStatement.getAssertCondition() != null) {
+      if (assertStatement.getAssertCondition() == null) {
+        return;
+      }
+      if (assertStatement.getLastChild() instanceof PsiErrorElement) {
+        return;
+      }
+      if (isVisibleHighlight(assertStatement)) {
+        registerStatementError(assertStatement);
+      }
+      else {
         registerError(assertStatement);
       }
     }
@@ -89,7 +83,18 @@ public class AssertionCanBeIfInspection extends BaseInspection {
 
     @Override
     protected void doFix(Project project, ProblemDescriptor descriptor) {
-      doFixImpl(descriptor.getPsiElement());
+      final PsiElement element = descriptor.getPsiElement();
+      final PsiAssertStatement assertStatement =
+        element instanceof PsiKeyword ? (PsiAssertStatement)element.getParent() : (PsiAssertStatement)element;
+      final PsiExpression condition = assertStatement.getAssertCondition();
+      @NonNls final StringBuilder newStatement =
+        new StringBuilder("if(").append(BoolUtils.getNegatedExpressionText(condition)).append(") throw new java.lang.AssertionError(");
+      final PsiExpression description = assertStatement.getAssertDescription();
+      if (description != null) {
+        newStatement.append(description.getText());
+      }
+      newStatement.append(");");
+      PsiReplacementUtil.replaceStatement(assertStatement, newStatement.toString());
     }
   }
 }

plugins/InspectionGadgets/test/com/siyeh/igfixes/asserttoif/assert_to_if/Incomplete.after.java

@@ -1,8 +0,0 @@
-package com.siyeh.ipp.asserttoif.assert_to_if;
-
-public class Incomplete {
-
-  void x(Object o) {
-      if (o == null) throw new AssertionError();
-  }
-}

plugins/InspectionGadgets/test/com/siyeh/igfixes/asserttoif/assert_to_if/Incomplete.java

@@ -3,6 +3,6 @@ package com.siyeh.ipp.asserttoif.assert_to_if;
 public class Incomplete {
 
   void x(Object o) {
-    assert <caret>o != null :
+    assert<caret> o != null :
   }
 }

plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/asserttoif/AssertionCanBeIfInspectionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,6 @@ public class AssertionCanBeIfInspectionTest extends IGQuickFixesTestCase {
     myDefaultHint = InspectionGadgetsBundle.message("assert.can.be.if.quickfix");
   }
 
-  public void testIncomplete() { doTest(); }
+  public void testIncomplete() { assertQuickfixNotAvailable(); }
   public void testMessage() { doTest(); }
 }