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

fix for KT-1515 wrong loading of annotations

Browse Source
This commit is contained in:
Alex Tkachman
2012-03-13 12:28:35 +02:00
parent 6b26d1ca31
commit c870eccc4f
8 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+27 -6
View File
@@ -1522,13 +1522,34 @@ public class JavaDescriptorResolver {
}
annotation.setAnnotationType(clazz.getDefaultType());
ArrayList<CompileTimeConstant<?>> valueArguments = new ArrayList<CompileTimeConstant<?>>();
if("jet.runtime.Intrinsic".equals(psiAnnotation.getQualifiedName())) {
// temporary hack
valueArguments.add(new StringValue(psiAnnotation.findAttributeValue("value").getText()));
annotation.setValueArguments(valueArguments); // TODO
PsiAnnotationParameterList parameterList = psiAnnotation.getParameterList();
for (PsiNameValuePair psiNameValuePair : parameterList.getAttributes()) {
PsiAnnotationMemberValue value = psiNameValuePair.getValue();
// todo
assert value instanceof PsiLiteralExpression;
Object literalValue = ((PsiLiteralExpression) value).getValue();
if(literalValue instanceof String)
valueArguments.add(new StringValue((String) literalValue));
else if(literalValue instanceof Byte)
valueArguments.add(new ByteValue((Byte) literalValue));
else if(literalValue instanceof Short)
valueArguments.add(new ShortValue((Short) literalValue));
else if(literalValue instanceof Character)
valueArguments.add(new CharValue((Character) literalValue));
else if(literalValue instanceof Integer)
valueArguments.add(new IntValue((Integer) literalValue));
else if(literalValue instanceof Long)
valueArguments.add(new LongValue((Long) literalValue));
else if(literalValue instanceof Float)
valueArguments.add(new FloatValue((Float) literalValue));
else if(literalValue instanceof Double)
valueArguments.add(new DoubleValue((Double) literalValue));
else if(literalValue == null)
valueArguments.add(NullValue.NULL);
}
else
annotation.setValueArguments(valueArguments); // TODO
annotation.setValueArguments(valueArguments); // TODO
return annotation;
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/PsiAnnotationUtils.java
+3
View File
@@ -27,6 +27,9 @@ import org.jetbrains.annotations.Nullable;
*/
public class PsiAnnotationUtils {
private PsiAnnotationUtils() {
}
@NotNull
public static String getStringAttribute(@Nullable PsiAnnotation annotation, @NotNull String field, @NotNull String defaultValue) {
return getAttribute(annotation, field, defaultValue);