add assert != null fix should be disabled on the class level (EA-66814 - assert: AddAssertStatementFix.applyFix)

java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java

@@ -200,7 +200,7 @@ public class DataFlowInspectionBase extends BaseJavaBatchLocalInspectionTool {
         final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
         final PsiBinaryExpression binary = (PsiBinaryExpression)elementFactory.createExpressionFromText("a != null", null);
         binary.getLOperand().replace(qualifier);
-        ContainerUtil.addIfNotNull(fixes, createAssertFix(binary));
+        ContainerUtil.addIfNotNull(fixes, createAssertFix(binary, expression));
       }
 
       addSurroundWithIfFix(qualifier, fixes, onTheFly);
@@ -216,7 +216,7 @@ public class DataFlowInspectionBase extends BaseJavaBatchLocalInspectionTool {
     }
   }
 
-  protected LocalQuickFix createAssertFix(PsiBinaryExpression binary) {
+  protected LocalQuickFix createAssertFix(PsiBinaryExpression binary, PsiExpression expression) {
     return null;
   }
 

java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspection.java

@@ -26,6 +26,7 @@ import com.intellij.psi.PsiAssignmentExpression;
 import com.intellij.psi.PsiBinaryExpression;
 import com.intellij.psi.PsiExpression;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.refactoring.util.RefactoringUtil;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -59,8 +60,8 @@ public class DataFlowInspection extends DataFlowInspectionBase {
   }
 
   @Override
-  protected AddAssertStatementFix createAssertFix(PsiBinaryExpression binary) {
-    return new AddAssertStatementFix(binary);
+  protected AddAssertStatementFix createAssertFix(PsiBinaryExpression binary, PsiExpression expression) {
+    return RefactoringUtil.getParentStatement(expression, false) == null ? null : new AddAssertStatementFix(binary);
   }
 
   private class OptionsPanel extends JPanel {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeFieldInitializer.java

@@ -0,0 +1,5 @@
+// "Assert 'myFoo != null'" "false"
+class A{
+  private final String myFoo = null;
+  String myBar = my<caret>Foo.substring(0);
+}