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

NullityInferrer: infer if inferred annotation is available

Browse Source
This commit is contained in:
Tagir Valeev
2018-12-27 18:25:07 +07:00
parent d6d622d986
commit 8f492d0463
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java
+12 -3
View File
@@ -15,6 +15,8 @@
*/
package com.intellij.codeInspection.inferNullity;
import com.intellij.codeInsight.Nullability;
import com.intellij.codeInsight.NullabilityAnnotationInfo;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.codeInsight.intention.AddAnnotationFix;
import com.intellij.openapi.project.Project;
@@ -468,6 +470,14 @@ public class NullityInferrer {
return myNullableSet.contains(pointer);
}
private boolean hasNullability(@NotNull PsiModifierListOwner owner) {
NullableNotNullManager manager = NullableNotNullManager.getInstance(owner.getProject());
NullabilityAnnotationInfo info = manager.findEffectiveNullabilityInfo(owner);
if (info != null && !info.isInferred() && info.getNullability() != Nullability.UNKNOWN) return true;
final SmartPsiElementPointer<PsiModifierListOwner> pointer = myPointerManager.createSmartPsiElementPointer(owner);
return myNotNullSet.contains(pointer) || myNullableSet.contains(pointer);
}
private class NullityInferrerVisitor extends JavaRecursiveElementWalkingVisitor{
@Override
@@ -488,7 +498,7 @@ public class NullityInferrer {
registerNotNullAnnotation(method);
return;
}
if (isNotNull(method) || isNullable(method)) {
if (hasNullability(method)) {
return;
}
final PsiCodeBlock body = method.getBody();
@@ -555,8 +565,7 @@ public class NullityInferrer {
@Override
public void visitParameter(@NotNull PsiParameter parameter) {
super.visitParameter(parameter);
if (parameter.getType() instanceof PsiPrimitiveType ||
isNotNull(parameter) || isNullable(parameter)) {
if (parameter.getType() instanceof PsiPrimitiveType || hasNullability(parameter)) {
return;
}
final PsiElement grandParent = parameter.getDeclarationScope();
java/java-tests/testData/codeInsight/nullityinferrer/afterFieldsAssignment.java
+1
View File
@@ -39,6 +39,7 @@ class Test {
final String myFoo13 = null;
final Runnable myFoo14 = new Runnable() {
{foo();}
@Nullable
Object foo() {
return null;
}