azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Assert that reference annotation argument is always an enum value

Browse Source 
Rename JavaReferenceAnnotationArgument on that occasion to
JavaEnumValueAnnotationArgument. Also add a test on a nested enum annotation
argument
This commit is contained in:
Alexander Udalov
2014-08-27 12:36:11 +04:00
parent 13eeb18219
commit ec02382976
7 changed files with 70 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java
+1 -1
View File
@@ -39,7 +39,7 @@ public abstract class JavaAnnotationArgumentImpl<Psi extends PsiAnnotationMember
}
if (argument instanceof PsiReferenceExpression) {
return new JavaReferenceAnnotationArgumentImpl((PsiReferenceExpression) argument, name);
return new JavaEnumValueAnnotationArgumentImpl((PsiReferenceExpression) argument, name);
}
else if (argument instanceof PsiArrayInitializerMemberValue) {
return new JavaArrayAnnotationArgumentImpl((PsiArrayInitializerMemberValue) argument, name);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaReferenceAnnotationArgumentImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaEnumValueAnnotationArgumentImpl.java
+11 -12
View File
@@ -22,25 +22,24 @@ import com.intellij.psi.PsiField;
import com.intellij.psi.PsiReferenceExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaElement;
import org.jetbrains.jet.lang.resolve.java.structure.JavaReferenceAnnotationArgument;
import org.jetbrains.jet.lang.resolve.java.structure.JavaEnumValueAnnotationArgument;
import org.jetbrains.jet.lang.resolve.java.structure.JavaField;
import org.jetbrains.jet.lang.resolve.name.Name;
public class JavaReferenceAnnotationArgumentImpl extends JavaAnnotationArgumentImpl<PsiReferenceExpression>
implements JavaReferenceAnnotationArgument {
protected JavaReferenceAnnotationArgumentImpl(@NotNull PsiReferenceExpression psiReferenceExpression, @Nullable Name name) {
public class JavaEnumValueAnnotationArgumentImpl extends JavaAnnotationArgumentImpl<PsiReferenceExpression>
implements JavaEnumValueAnnotationArgument {
protected JavaEnumValueAnnotationArgumentImpl(@NotNull PsiReferenceExpression psiReferenceExpression, @Nullable Name name) {
super(psiReferenceExpression, name);
}
@Override
@Nullable
public JavaElement resolve() {
PsiReferenceExpression expression = getPsi();
PsiElement element = expression.resolve();
if (element instanceof PsiEnumConstant) {
return new JavaFieldImpl((PsiField) element);
public JavaField resolve() {
PsiElement element = getPsi().resolve();
if (element == null) return null;
if (!(element instanceof PsiEnumConstant)) {
throw new IllegalStateException("Reference argument should be an enum value, but was " + element + ": " + element.getText());
}
// TODO: other types of references
return null;
return new JavaFieldImpl((PsiField) element);
}
}