MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-224474 Add an option to exclude all "maybe"-warnings from Constant conditions & exceptions result

Browse Source 
GitOrigin-RevId: 387b1924a36c392eadcb9c39a89f3c7a33e9ff3c
This commit is contained in:
Tagir Valeev
2019-10-09 11:02:23 +00:00
committed by intellij-monorepo-bot
parent ad9dd8917e
commit 69601cef2c
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
+17 -2
View File
@@ -56,6 +56,7 @@ public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspec
public boolean REPORT_CONSTANT_REFERENCE_VALUES = true;
public boolean REPORT_NULLS_PASSED_TO_NOT_NULL_PARAMETER = true;
public boolean REPORT_NULLABLE_METHODS_RETURNING_NOT_NULL = true;
public boolean REPORT_UNSOUND_WARNINGS = true;
@Override
public JComponent createOptionsPanel() {
@@ -81,6 +82,9 @@ public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspec
if (!REPORT_NULLABLE_METHODS_RETURNING_NOT_NULL) {
node.addContent(new Element("option").setAttribute("name", "REPORT_NULLABLE_METHODS_RETURNING_NOT_NULL").setAttribute("value", "false"));
}
if (!REPORT_UNSOUND_WARNINGS) {
node.addContent(new Element("option").setAttribute("name", "REPORT_UNSOUND_WARNINGS").setAttribute("value", "false"));
}
}
@Override
@@ -133,6 +137,7 @@ public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspec
@Override
public void visitMethodReferenceExpression(PsiMethodReferenceExpression expression) {
super.visitMethodReferenceExpression(expression);
if (!REPORT_UNSOUND_WARNINGS) return;
final PsiElement resolve = expression.resolve();
if (resolve instanceof PsiMethod) {
final PsiType methodReturnType = ((PsiMethod)resolve).getReturnType();
@@ -490,6 +495,13 @@ public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspec
Map<PsiExpression, ConstantResult> expressions) {
for (NullabilityProblem<?> problem : problems) {
PsiExpression expression = problem.getDereferencedExpression();
if (!REPORT_UNSOUND_WARNINGS) {
if (expression == null) continue;
PsiExpression unwrapped = PsiUtil.skipParenthesizedExprDown(expression);
if (!ExpressionUtils.isNullLiteral(unwrapped) && expressions.get(expression) != DataFlowInstructionVisitor.ConstantResult.NULL) {
continue;
}
}
NullabilityProblemKind.innerClassNPE.ifMyProblem(problem, newExpression -> {
List<LocalQuickFix> fixes = createNPEFixes(newExpression.getQualifier(), newExpression, reporter.isOnTheFly());
reporter
@@ -702,6 +714,7 @@ public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspec
private void reportFailingCasts(ProblemReporter reporter, DataFlowInstructionVisitor visitor) {
visitor.getFailingCastExpressions().forKeyValue((typeCast, alwaysFails) -> {
if (!REPORT_UNSOUND_WARNINGS && !alwaysFails) return;
PsiExpression operand = typeCast.getOperand();
PsiTypeElement castType = typeCast.getCastType();
assert castType != null;
@@ -906,9 +919,11 @@ public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspec
final PsiExpression anchor = problem.getAnchor();
PsiExpression expr = problem.getDereferencedExpression();
boolean exactlyNull = isNullLiteralExpression(expr) || expressions.get(expr) == ConstantResult.NULL;
if (!REPORT_UNSOUND_WARNINGS && !exactlyNull) continue;
if (nullability == Nullability.NOT_NULL) {
String presentable = NullableStuffInspectionBase.getPresentableAnnoName(anno);
final String text = isNullLiteralExpression(expr) || expressions.get(expr) == ConstantResult.NULL
final String text = exactlyNull
? InspectionsBundle.message("dataflow.message.return.null.from.notnull", presentable)
: InspectionsBundle.message("dataflow.message.return.nullable.from.notnull", presentable);
reporter.registerProblem(expr, text, createNPEFixes(expr, expr, reporter.isOnTheFly()).toArray(LocalQuickFix.EMPTY_ARRAY));
@@ -916,7 +931,7 @@ public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspec
else if (AnnotationUtil.isAnnotatingApplicable(anchor)) {
final String defaultNullable = manager.getDefaultNullable();
final String presentableNullable = StringUtil.getShortName(defaultNullable);
final String text = isNullLiteralExpression(expr) || expressions.get(expr) == ConstantResult.NULL
final String text = exactlyNull
? InspectionsBundle.message("dataflow.message.return.null.from.notnullable", presentableNullable)
: InspectionsBundle.message("dataflow.message.return.nullable.from.notnullable", presentableNullable);
final LocalQuickFix[] fixes =
java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspection.java
+7
View File
@@ -251,6 +251,10 @@ public class DataFlowInspection extends DataFlowInspectionBase {
"Report nullable methods that always return a non-null value",
REPORT_NULLABLE_METHODS_RETURNING_NOT_NULL, box -> REPORT_NULLABLE_METHODS_RETURNING_NOT_NULL = box.isSelected());
JCheckBox reportUnsoundWarnings = createCheckBoxWithHTML(
"Report problems where exception occurs only for some code path",
REPORT_UNSOUND_WARNINGS, box -> REPORT_UNSOUND_WARNINGS = box.isSelected());
gc.insets = JBUI.emptyInsets();
gc.gridy = 0;
add(suggestNullables, gc);
@@ -282,6 +286,9 @@ public class DataFlowInspection extends DataFlowInspectionBase {
gc.gridy++;
add(reportNullableMethodsReturningNotNull, gc);
gc.gridy++;
add(reportUnsoundWarnings, gc);
}
@Override