From d8fe7372719b91db2c7a9fb1fcbf31ca140f6f8a Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 16 Jul 2012 16:40:50 +0200 Subject: [PATCH] allow unregistered org.jetbrains annotations as ignore-annotations (IDEA-88776) --- .../intellij/codeInspection/util/SpecialAnnotationsUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java b/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java index bc0afa733045..666b30eeb786 100644 --- a/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java +++ b/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java @@ -16,6 +16,7 @@ package com.intellij.codeInspection.util; +import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.InspectionProfile; import com.intellij.codeInspection.InspectionsBundle; @@ -31,6 +32,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.profile.codeInspection.InspectionProfileManager; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.*; @@ -216,7 +218,8 @@ public class SpecialAnnotationsUtil { for (PsiAnnotation psiAnnotation : psiAnnotations) { @NonNls final String name = psiAnnotation.getQualifiedName(); if (name == null) continue; - if (name.startsWith("java.") || name.startsWith("javax.") || name.startsWith("org.jetbrains.")) continue; + if (name.startsWith("java.") || name.startsWith("javax.") || + (name.startsWith("org.jetbrains.") && !AnnotationUtil.isJetbrainsAnnotation(StringUtil.getShortName(name)))) continue; if (!processor.process(name)) break; } }