MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 05:10:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-69645 (bad code is green: attribute value must be constant)

Browse Source
This commit is contained in:
Bas Leijdekkers
2011-05-16 19:37:27 +02:00
parent 72063660af
commit af4873b8aa
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,8 +173,9 @@ public class AnnotationsHighlightUtil {
Set<String> names = new HashSet<String>();
PsiNameValuePair[] attributes = annotation.getParameterList().getAttributes();
for (PsiNameValuePair attribute : attributes) {
if (attribute.getName() != null) {
names.add(attribute.getName());
final String name = attribute.getName();
if (name != null) {
names.add(name);
}
else {
names.add(PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME);
@@ -211,8 +212,9 @@ public class AnnotationsHighlightUtil {
@Nullable
public static HighlightInfo checkConstantExpression(PsiExpression expression) {
if (expression.getParent() instanceof PsiAnnotationMethod || expression.getParent() instanceof PsiNameValuePair) {
if (PsiType.NULL.equals(expression.getType()) || !PsiUtil.isConstantExpression(expression)) {
final PsiElement parent = expression.getParent();
if (parent instanceof PsiAnnotationMethod || parent instanceof PsiNameValuePair || parent instanceof PsiArrayInitializerMemberValue) {
if (!PsiUtil.isConstantExpression(expression)) {
return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, expression, JavaErrorMessages.message("annotation.nonconstant.attribute.value"));
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/nonConstantInitializer.java
View File

@@ -1,10 +1,14 @@
@interface Ann {
int i ();
String[] j();
}
class D {
int field;
@Ann(i=<error descr="Attribute value must be constant">field</error>) void foo () {}
@Ann(j={<error descr="Attribute value must be constant">null</error>}) void bar() {}
}
@interface ManistaDouble