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-163678 "Passing non-null argument to 'Optional'" warning expected

Browse Source
This commit is contained in:
peter
2016-11-09 14:31:09 +01:00
parent 20ed942a28
commit b261c7fd57
2 changed files with 9 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/ControlFlowAnalyzer.java
+3 -2
View File
@@ -1252,7 +1252,8 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
}
PsiExpression[] expressions = expression.getArgumentList().getExpressions();
PsiElement method = methodExpression.resolve();
JavaResolveResult result = methodExpression.advancedResolve(false);
PsiElement method = result.getElement();
PsiParameter[] parameters = method instanceof PsiMethod ? ((PsiMethod)method).getParameterList().getParameters() : null;
boolean isEqualsCall = expressions.length == 1 && method instanceof PsiMethod &&
"equals".equals(((PsiMethod)method).getName()) && parameters.length == 1 &&
@@ -1263,7 +1264,7 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
PsiExpression paramExpr = expressions[i];
paramExpr.accept(this);
if (parameters != null && i < parameters.length) {
generateBoxingUnboxingInstructionFor(paramExpr, parameters[i].getType());
generateBoxingUnboxingInstructionFor(paramExpr, result.getSubstitutor().substitute(parameters[i].getType()));
}
if (i == 0 && isEqualsCall) {
// stack: .., qualifier, arg1
java/java-tests/testData/inspection/dataFlow/fixture/OptionalOfNullable.java
+6
View File
@@ -20,5 +20,11 @@ class Test {
return Optional.ofNullable(<warning descr="Passing 'null' argument to 'Optional'">null</warning>);
}
long field;
Optional<Long> getName4() {
return Optional.ofNullable(<warning descr="Passing a non-null argument to 'Optional'">field</warning>);
}
}