MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 13:31:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix false annotation highlighting

Browse Source
This commit is contained in:
Roman Shevchenko
2012-10-20 11:22:05 +02:00
parent 2ddf489b92
commit 56a32c93a2
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
View File

@@ -26,12 +26,15 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.patterns.ElementPattern;
import com.intellij.patterns.PatternCondition;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.tree.java.PsiAnnotationImpl;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.ProcessingContext;
import com.intellij.util.containers.HashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -40,6 +43,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import static com.intellij.patterns.PsiJavaPatterns.psiElement;
/**
* @author ven
*/
@@ -235,6 +240,17 @@ public class AnnotationsHighlightUtil {
return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, typeElement, JavaErrorMessages.message("annotation.invalid.annotation.member.type"));
}
private static final ElementPattern<PsiElement> ANNOTATION_ALLOWED = psiElement().andOr(
psiElement().with(new PatternCondition<PsiElement>("annotationOwner") {
@Override
public boolean accepts(@NotNull PsiElement element, ProcessingContext context) {
return element instanceof PsiAnnotationOwner;
}
}),
psiElement().withParent(PsiNameValuePair.class),
psiElement().withParents(PsiArrayInitializerMemberValue.class, PsiNameValuePair.class)
);
@Nullable
public static HighlightInfo checkApplicability(final PsiAnnotation annotation) {
PsiAnnotationOwner owner = annotation.getOwner();
@@ -255,8 +271,7 @@ public class AnnotationsHighlightUtil {
return highlightInfo;
}
PsiElement parent = annotation.getParent();
if (!(parent instanceof PsiAnnotationOwner || parent instanceof PsiNameValuePair)) {
if (!ANNOTATION_ALLOWED.accepts(annotation)) {
String message = JavaErrorMessages.message("annotation.not.allowed.here");
HighlightInfo highlightInfo = HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, annotation, message);
QuickFixAction.registerQuickFixAction(highlightInfo, new DeleteNotApplicableAnnotationAction(annotation));

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/wrongPlace.java
View File

@@ -1,9 +1,14 @@
@interface Anno { }
@interface Anno {
Anno[] nested() default {};
}
abstract class C {
abstract void f();
void m() {
void wrong() {
<error descr="Annotations are not allowed here">@Anno</error> f();
}
@Anno(nested = {@Anno, @Anno})
void notWrong() { }
}