From 5d73f3dfb09f823e03e81ec9368f2d6cd5c53133 Mon Sep 17 00:00:00 2001 From: anna Date: Thu, 15 Sep 2011 16:16:04 +0200 Subject: [PATCH] disable propagate nullable when configured annotation is not found in classpath (IDEA-74296 ) --- .../codeInspection/nullable/NullableStuffInspection.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java index b14c62b9c346..ab7e642c5272 100644 --- a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java @@ -85,7 +85,12 @@ public class NullableStuffInspection extends BaseLocalInspectionTool { if (psiExpression.getType() == PsiType.NULL) { final PsiParameter parameter = parameters[i]; if (!AnnotationUtil.isNullable(parameter) && !AnnotationUtil.isNotNull(parameter)) { - holder.registerProblem(psiExpression, "Null is passed to parameter which is not yet @Nullable", new MyAddNullableAnnotationFix(parameter)); + final PsiClass annotationsClass = + JavaPsiFacade.getInstance(holder.getProject()).findClass(NullableNotNullManager.getInstance(holder.getProject()).getDefaultNullable(), + psiMethod.getResolveScope()); + if (annotationsClass != null) { + holder.registerProblem(psiExpression, "Null is passed to parameter which is not yet @Nullable", new MyAddNullableAnnotationFix(parameter)); + } } } }