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-109222 Nullity is not inferred correctly.

Browse Source
This commit is contained in:
peter
2013-07-04 19:55:10 +02:00
parent 6d07a5421a
commit 97e82d7a5d
5 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+6 -6
View File
@@ -1599,15 +1599,16 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
return null;
}
PsiVariable var = resolveToVariable(refExpr);
PsiElement target = refExpr.resolve();
PsiVariable var = getAccessedVariable(target);
if (var == null) {
return null;
}
boolean isCall = expression instanceof PsiMethodCallExpression;
PsiMethod accessMethod = target instanceof PsiMethod ? (PsiMethod)target : null;
PsiExpression qualifier = refExpr.getQualifierExpression();
if (qualifier == null) {
DfaVariableValue result = myFactory.getVarFactory().createVariableValue(var, refExpr.getType(), false, null, isCall);
DfaVariableValue result = myFactory.getVarFactory().createVariableValue(var, refExpr.getType(), false, null, accessMethod);
if (var instanceof PsiField) {
myFields.add(result);
}
@@ -1617,15 +1618,14 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
if (DfaPsiUtil.isFinalField(var) || DfaPsiUtil.isPlainMutableField(var)) {
DfaVariableValue qualifierValue = createChainedVariableValue(qualifier);
if (qualifierValue != null) {
return myFactory.getVarFactory().createVariableValue(var, refExpr.getType(), false, qualifierValue, isCall || qualifierValue.isViaMethods());
return myFactory.getVarFactory().createVariableValue(var, refExpr.getType(), false, qualifierValue, accessMethod);
}
}
return null;
}
@Nullable
private static PsiVariable resolveToVariable(PsiReferenceExpression refExpr) {
PsiElement target = refExpr.resolve();
private static PsiVariable getAccessedVariable(final PsiElement target) {
if (target instanceof PsiVariable) {
return (PsiVariable)target;
}
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class DfaValueFactory {
}
if (!variable.hasModifierProperty(PsiModifier.VOLATILE) && isEffectivelyUnqualified(referenceExpression)) {
return getVarFactory().createVariableValue(variable, referenceExpression.getType(), false, null, false);
return getVarFactory().createVariableValue(variable, referenceExpression.getType(), false, null, null);
}
return null;
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java
+31 -18
View File
@@ -49,15 +49,15 @@ public class DfaVariableValue extends DfaValue {
}
public DfaVariableValue createVariableValue(PsiVariable myVariable, boolean isNegated) {
return createVariableValue(myVariable, myVariable.getType(), isNegated, null, false);
return createVariableValue(myVariable, myVariable.getType(), isNegated, null, null);
}
@NotNull
public DfaVariableValue createVariableValue(PsiVariable myVariable,
@Nullable PsiType varType, boolean isNegated, @Nullable DfaVariableValue qualifier, boolean viaMethods) {
@Nullable PsiType varType, boolean isNegated, @Nullable DfaVariableValue qualifier, @Nullable PsiMethod accessMethod) {
mySharedInstance.myVariable = myVariable;
mySharedInstance.myIsNegated = isNegated;
mySharedInstance.myQualifier = qualifier;
mySharedInstance.myViaMethods = viaMethods;
mySharedInstance.myAccessMethod = accessMethod;
String id = mySharedInstance.toString();
ArrayList<DfaVariableValue> conditions = myStringToObject.get(id);
@@ -71,7 +71,7 @@ public class DfaVariableValue extends DfaValue {
}
}
DfaVariableValue result = new DfaVariableValue(myVariable, varType, isNegated, myFactory, qualifier, viaMethods);
DfaVariableValue result = new DfaVariableValue(myVariable, varType, isNegated, myFactory, qualifier, accessMethod);
if (qualifier != null) {
myQualifiersToChainedVariables.putValue(qualifier, result);
}
@@ -92,18 +92,18 @@ public class DfaVariableValue extends DfaValue {
private PsiVariable myVariable;
private PsiType myVarType;
private PsiMethod myAccessMethod;
@Nullable private DfaVariableValue myQualifier;
private boolean myIsNegated;
private boolean myViaMethods;
private Nullness myInherentNullability;
private DfaVariableValue(PsiVariable variable, PsiType varType, boolean isNegated, DfaValueFactory factory, @Nullable DfaVariableValue qualifier, boolean viaMethods) {
private DfaVariableValue(PsiVariable variable, PsiType varType, boolean isNegated, DfaValueFactory factory, @Nullable DfaVariableValue qualifier, PsiMethod accessMethod) {
super(factory);
myVariable = variable;
myIsNegated = isNegated;
myQualifier = qualifier;
myViaMethods = viaMethods;
myVarType = varType;
myAccessMethod = accessMethod;
}
private DfaVariableValue(DfaValueFactory factory) {
@@ -128,7 +128,7 @@ public class DfaVariableValue extends DfaValue {
@Override
public DfaVariableValue createNegated() {
return myFactory.getVarFactory().createVariableValue(myVariable, myVarType, !myIsNegated, myQualifier, myViaMethods);
return myFactory.getVarFactory().createVariableValue(myVariable, myVarType, !myIsNegated, myQualifier, myAccessMethod);
}
@SuppressWarnings({"HardCodedStringLiteral"})
@@ -140,7 +140,7 @@ public class DfaVariableValue extends DfaValue {
private boolean hardEquals(DfaVariableValue aVar) {
return aVar.myVariable == myVariable &&
aVar.myIsNegated == myIsNegated &&
aVar.myViaMethods == myViaMethods &&
aVar.myAccessMethod == myAccessMethod &&
(myQualifier == null ? aVar.myQualifier == null : myQualifier.hardEquals(aVar.myQualifier));
}
@@ -150,7 +150,7 @@ public class DfaVariableValue extends DfaValue {
}
public boolean isViaMethods() {
return myViaMethods;
return myAccessMethod != null || myQualifier != null && myQualifier.isViaMethods();
}
public Nullness getInherentNullability() {
@@ -158,19 +158,32 @@ public class DfaVariableValue extends DfaValue {
return myInherentNullability;
}
return myInherentNullability = calcInherentNullability();
}
private Nullness calcInherentNullability() {
PsiMethod accessMethod = myAccessMethod;
Nullness nullability = DfaPsiUtil.getElementNullability(getVariableType(), accessMethod);
if (nullability != Nullness.UNKNOWN) {
return nullability;
}
PsiVariable var = getPsiVariable();
Nullness nullability = DfaPsiUtil.getElementNullability(getVariableType(), var);
if (nullability == Nullness.UNKNOWN && var != null) {
nullability = DfaPsiUtil.getElementNullability(getVariableType(), var);
if (nullability != Nullness.UNKNOWN) {
return nullability;
}
if (var != null) {
if (DfaPsiUtil.isNullableInitialized(var, true)) {
nullability = Nullness.NULLABLE;
} else if (DfaPsiUtil.isNullableInitialized(var, false)) {
nullability = Nullness.NOT_NULL;
return Nullness.NULLABLE;
}
if (DfaPsiUtil.isNullableInitialized(var, false)) {
return Nullness.NOT_NULL;
}
}
myInherentNullability = nullability;
return nullability;
return Nullness.UNKNOWN;
}
public boolean isLocalVariable() {
java/java-tests/testData/inspection/dataFlow/fixture/HonorGetterAnnotation.java
+19
View File
@@ -0,0 +1,19 @@
import org.jetbrains.annotations.Nullable;
public class Goo {
Permission permission;
{
Object category = permission.getCategory();
System.out.println(<warning descr="Method invocation 'category.hashCode()' may produce 'java.lang.NullPointerException'">category.hashCode()</warning>);
}
}
class Permission {
Object category;
@Nullable Object getCategory() {
return category;
}
}
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
+2
View File
@@ -171,6 +171,8 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase {
public void testEqualsHasNoSideEffects() { doTest(); }
public void testHonorGetterAnnotation() { doTest(); }
public void testIsNullCheck() throws Exception {
ConditionCheckManager.getInstance(myModule.getProject()).getIsNullCheckMethods().add(
buildConditionChecker("Value", "isNull", ConditionChecker.Type.IS_NULL_METHOD,