From 4f4893cebd536e4043e847b14635ae6dbadeb9df Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Mon, 22 Aug 2016 22:16:07 +0300 Subject: [PATCH] null argument index: do not update default settings of inspections --- .../codeInspection/dataFlow/DataFlowInspectionBase.java | 3 +++ .../codeInspection/nullable/NullableStuffInspectionBase.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java index 3fab583b5455..24521a279148 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java @@ -90,6 +90,9 @@ public class DataFlowInspectionBase extends BaseJavaBatchLocalInspectionTool { if (TREAT_UNKNOWN_MEMBERS_AS_NULLABLE) { node.addContent(new Element("option").setAttribute("name", "TREAT_UNKNOWN_MEMBERS_AS_NULLABLE").setAttribute("value", "true")); } + if (!REPORT_NULLS_PASSED_TO_NOT_NULL_PARAMETER) { + node.addContent(new Element("option").setAttribute("name", "REPORT_NULLS_PASSED_TO_NOT_NULL_PARAMETER").setAttribute("value", "false")); + } } @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java index a41cf4512a1c..e4043a483aa0 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java @@ -70,7 +70,8 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo String value = child.getAttributeValue("value"); if ("IGNORE_EXTERNAL_SUPER_NOTNULL".equals(name) && "false".equals(value) || "REPORT_NOTNULL_PARAMETERS_OVERRIDES_NOT_ANNOTATED".equals(name) && "false".equals(value) || - "REQUIRE_NOTNULL_FIELDS_INITIALIZED".equals(name) && "true".equals(value)) { + "REQUIRE_NOTNULL_FIELDS_INITIALIZED".equals(name) && "true".equals(value) || + "REPORT_NULLS_PASSED_TO_NOT_NULL_PARAMETER".equals(name) && "true".equals(value)) { node.removeContent(child); } }