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

don't infer ->null contracts in scope of @MethodAreNonNullByDefault (addendum to IDEA-160991)

Browse Source
This commit is contained in:
peter
2016-09-21 10:50:31 +02:00
parent 54fabc098c
commit b571394209
2 changed files with 7 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/ContractInference.java
+1 -1
View File
@@ -76,7 +76,7 @@ class ContractInferenceInterpreter {
contracts = boxReturnValues(contracts);
}
List<MethodContract> compatible = ContainerUtil.filter(contracts, contract -> {
if (contract.returnValue == NOT_NULL_VALUE &&
if ((contract.returnValue == NOT_NULL_VALUE || contract.returnValue == NULL_VALUE) &&
NullableNotNullManager.getInstance(myMethod.getProject()).isNotNull(myMethod, false)) {
return false;
}
java/java-tests/testData/inspection/dataFlow/fixture/CustomTypeQualifierDefault.java
+6 -1
View File
@@ -24,10 +24,15 @@ class NotNullClass {
return <warning descr="'null' is returned by the method declared as @MethodsAreNotNullByDefault">null</warning>;
}
private Object privateFoo() {
private String privateFoo() {
return <warning descr="'null' is returned by the method declared as @MethodsAreNotNullByDefault">null</warning>;
}
{
String s2 = privateFoo();
int i2 = s2.length();
}
@Nullable
public Object foo2() {
return null;