MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 21:55:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

nullable problems: do not suggest to annotate as @Nullable when parameter is referenced (IDEA-93083)

Browse Source
This commit is contained in:
anna
2012-10-18 19:36:59 +02:00
parent 7bf48f5252
commit b87a66990c
4 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
+19 -7
View File
@@ -174,13 +174,25 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
new AddAnnotationFix(anno, parameter, ArrayUtil.toStringArray(annoToRemove)));
}
else if (annotated.isDeclaredNullable && manager.isNotNull(parameter, false)) {
final PsiIdentifier nameIdentifier2 = parameter.getNameIdentifier();
assert nameIdentifier2 != null : parameter;
holder.registerProblem(nameIdentifier2, InspectionsBundle.message(
"inspection.nullable.problems.annotated.field.constructor.parameter.conflict", StringUtil.getShortName(anno),
notNullSimpleName),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
new AddAnnotationFix(anno, parameter, ArrayUtil.toStringArray(annoToRemove)));
boolean usedAsQualifier = !ReferencesSearch.search(parameter).forEach(new Processor<PsiReference>() {
@Override
public boolean process(PsiReference reference) {
final PsiElement element = reference.getElement();
if (element instanceof PsiReferenceExpression && element.getParent() instanceof PsiReferenceExpression) {
return false;
}
return true;
}
});
if (!usedAsQualifier) {
final PsiIdentifier nameIdentifier2 = parameter.getNameIdentifier();
assert nameIdentifier2 != null : parameter;
holder.registerProblem(nameIdentifier2, InspectionsBundle.message(
"inspection.nullable.problems.annotated.field.constructor.parameter.conflict", StringUtil.getShortName(anno),
notNullSimpleName),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
new AddAnnotationFix(anno, parameter, ArrayUtil.toStringArray(annoToRemove)));
}
}
}
java/java-tests/testData/inspection/nullableProblems/nullableFieldNotnullParam/expected.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<problems>
<problem>
<file>Test.java</file>
<line>8</line>
<description>Constructor parameter for @Nullable field is annotated @NotNull</description>
</problem>
</problems>
java/java-tests/testData/inspection/nullableProblems/nullableFieldNotnullParam/src/Test.java
+21
View File
@@ -0,0 +1,21 @@
import org.jetbrains.annotations.*;
class Test {
@Nullable private final String baseFile;
@Nullable private final String baseFile1;
public Test(@NotNull String baseFile) {
this.baseFile = baseFile;
this.baseFile1 = null;
}
public Test(@NotNull String baseFile1, boolean a) {
this.baseFile1 = baseFile1;
if (baseFile1.contains("foo")) {
this.baseFile = null;
} else {
this.baseFile = null;
}
}
}
java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java
+1
View File
@@ -43,6 +43,7 @@ public class NullableStuffInspectionTest extends InspectionTestCase {
public void testProblems() throws Exception{ doTest(); }
public void testProblems2() throws Exception{ doTest(); }
public void testNullableFieldNotnullParam() throws Exception{ doTest(); }
public void testJdk14() throws Exception{ doTest14(); }
public void testGetterSetterProblems() throws Exception{ doTest(); }