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

Check nullability in array initializers (IDEA-174042)

Browse Source
This commit is contained in:
Tagir Valeev
2017-08-22 15:20:32 +07:00
parent 0d3f684496
commit d8da2fd7ec
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+15 -9
View File
@@ -1013,16 +1013,24 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
public void visitArrayInitializerExpression(PsiArrayInitializerExpression expression) {
startElement(expression);
PsiType type = expression.getType();
PsiType componentType = type instanceof PsiArrayType ? ((PsiArrayType)type).getComponentType() : null;
processArrayInitializers(expression, componentType);
pushUnknown();
finishElement(expression);
}
private void processArrayInitializers(@NotNull PsiArrayInitializerExpression expression, PsiType componentType) {
PsiExpression[] initializers = expression.getInitializers();
for (PsiExpression initializer : initializers) {
initializer.accept(this);
if (type instanceof PsiArrayType) {
generateBoxingUnboxingInstructionFor(initializer, ((PsiArrayType)type).getComponentType());
if (componentType != null) {
generateBoxingUnboxingInstructionFor(initializer, componentType);
if (DfaPsiUtil.getTypeNullability(componentType) == Nullness.NOT_NULL) {
addInstruction(new CheckNotNullInstruction(initializer, NullabilityProblem.assigningToNotNull));
}
}
addInstruction(new PopInstruction());
}
pushUnknown();
finishElement(expression);
}
@Override
@@ -1517,7 +1525,8 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
pushUnknown();
if (expression.getType() instanceof PsiArrayType) {
PsiType type = expression.getType();
if (type instanceof PsiArrayType) {
final PsiExpression[] dimensions = expression.getArrayDimensions();
for (final PsiExpression dimension : dimensions) {
dimension.accept(this);
@@ -1527,10 +1536,7 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
}
final PsiArrayInitializerExpression arrayInitializer = expression.getArrayInitializer();
if (arrayInitializer != null) {
for (final PsiExpression initializer : arrayInitializer.getInitializers()) {
initializer.accept(this);
addInstruction(new PopInstruction());
}
processArrayInitializers(arrayInitializer, ((PsiArrayType)type).getComponentType());
}
addConditionalRuntimeThrow();
addInstruction(new MethodCallInstruction(expression, null, Collections.emptyList()));
java/java-tests/testData/inspection/dataFlow/fixture/ArrayComponentAndMethodAnnotationConflict.java
+5 -2
View File
@@ -18,8 +18,11 @@ class FooImpl implements Foo {
if (Math.random() > 0.5) {
return null;
}
else {
return new Object[]{null, new Object()};
else if (Math.random() > 0.5) {
@NotNull Object @Nullable [] arr1 = new Object[]{null, new Object(), Math.random() > 0.5 ? new Object() : null};
@NotNull Object @Nullable [] arr2 = {<warning descr="'null' is assigned to a variable that is annotated with @NotNull">null</warning>, new Object(), <warning descr="Expression 'Math.random() > 0.5 ? new Object() : null' might evaluate to null but is assigned to a variable that is annotated with @NotNull">Math.random() > 0.5 ? new Object() : null</warning>};
return new Object[]{null, new Object(), Math.random() > 0.5 ? new Object() : null};
}
return new @NotNull Object @Nullable []{<warning descr="'null' is assigned to a variable that is annotated with @NotNull">null</warning>, new Object(), <warning descr="Expression 'Math.random() > 0.5 ? new Object() : null' might evaluate to null but is assigned to a variable that is annotated with @NotNull">Math.random() > 0.5 ? new Object() : null</warning>};
}
}