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

Resolve annotations in annotation arguments

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-07-04 16:51:17 +04:00
parent 42b0bdc54d
commit bbed2da4dd
3 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+38 -19
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument;
import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
import org.jetbrains.jet.lang.resolve.constants.AnnotationValue;
import org.jetbrains.jet.lang.resolve.constants.ArrayValue;
import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.constants.EnumValue;
@@ -173,27 +174,34 @@ public class AnnotationResolver {
) {
OverloadResolutionResults<FunctionDescriptor> results = resolveAnnotationCall(annotationEntry, scope, trace);
if (results.isSuccess()) {
for (Map.Entry<ValueParameterDescriptor, ResolvedValueArgument> descriptorToArgument :
results.getResultingCall().getValueArguments().entrySet()) {
AnnotationDescriptor annotationDescriptor = trace.getBindingContext().get(BindingContext.ANNOTATION, annotationEntry);
assert annotationDescriptor != null : "Annotation descriptor should be created before resolving arguments for " + annotationEntry.getText();
AnnotationDescriptor annotationDescriptor = trace.getBindingContext().get(BindingContext.ANNOTATION, annotationEntry);
assert annotationDescriptor != null : "Annotation descriptor should be created before resolving arguments for " + annotationEntry.getText();
resolveAnnotationArgument(annotationDescriptor, results.getResultingCall(), trace);
}
}
ValueParameterDescriptor parameterDescriptor = descriptorToArgument.getKey();
private void resolveAnnotationArgument(
@NotNull AnnotationDescriptor annotationDescriptor,
@NotNull ResolvedCall<? extends CallableDescriptor> call,
@NotNull BindingTrace trace
) {
for (Map.Entry<ValueParameterDescriptor, ResolvedValueArgument> descriptorToArgument :
call.getValueArguments().entrySet()) {
ValueParameterDescriptor parameterDescriptor = descriptorToArgument.getKey();
JetType varargElementType = parameterDescriptor.getVarargElementType();
List<CompileTimeConstant<?>> constants = resolveValueArguments(descriptorToArgument.getValue(), parameterDescriptor.getType(), trace);
if (varargElementType == null) {
for (CompileTimeConstant<?> constant : constants) {
annotationDescriptor.setValueArgument(parameterDescriptor, constant);
}
JetType varargElementType = parameterDescriptor.getVarargElementType();
List<CompileTimeConstant<?>> constants = resolveValueArguments(descriptorToArgument.getValue(), parameterDescriptor.getType(), trace);
if (varargElementType == null) {
for (CompileTimeConstant<?> constant : constants) {
annotationDescriptor.setValueArgument(parameterDescriptor, constant);
}
else {
JetType arrayType = KotlinBuiltIns.getInstance().getPrimitiveArrayJetTypeByPrimitiveJetType(varargElementType);
if (arrayType == null) {
arrayType = KotlinBuiltIns.getInstance().getArrayType(varargElementType);
}
annotationDescriptor.setValueArgument(parameterDescriptor, new ArrayValue(constants, arrayType));
}
else {
JetType arrayType = KotlinBuiltIns.getInstance().getPrimitiveArrayJetTypeByPrimitiveJetType(varargElementType);
if (arrayType == null) {
arrayType = KotlinBuiltIns.getInstance().getArrayType(varargElementType);
}
annotationDescriptor.setValueArgument(parameterDescriptor, new ArrayValue(constants, arrayType));
}
}
}
@@ -210,7 +218,7 @@ public class AnnotationResolver {
if (argumentExpression != null) {
CompileTimeConstant<?> constant = resolveAnnotationArgument(argumentExpression, expectedType, trace);
if (constant != null) {
constants.add(constant);
constants.add(constant);
}
}
}
@@ -284,8 +292,8 @@ public class AnnotationResolver {
ResolvedCall<? extends CallableDescriptor> call =
trace.getBindingContext().get(BindingContext.RESOLVED_CALL, (expression).getCalleeExpression());
if (call != null) {
CallableDescriptor resultingDescriptor = call.getResultingDescriptor();
if (AnnotationUtils.isArrayMethodCall(call)) {
CallableDescriptor resultingDescriptor = call.getResultingDescriptor();
JetType type = resultingDescriptor.getValueParameters().iterator().next().getVarargElementType();
List<CompileTimeConstant<?>> arguments = Lists.newArrayList();
for (ResolvedValueArgument descriptorToArgument : call.getValueArguments().values()) {
@@ -293,6 +301,17 @@ public class AnnotationResolver {
}
return new ArrayValue(arguments, resultingDescriptor.getReturnType());
}
if (resultingDescriptor instanceof ConstructorDescriptor) {
JetType constructorReturnType = resultingDescriptor.getReturnType();
assert constructorReturnType != null : "Constructor should have return type";
if (DescriptorUtils.isAnnotationClass(constructorReturnType.getConstructor().getDeclarationDescriptor())) {
AnnotationDescriptor descriptor = new AnnotationDescriptor();
descriptor.setAnnotationType(constructorReturnType);
resolveAnnotationArgument(descriptor, call, trace);
return new AnnotationValue(descriptor);
}
}
}
return null;
}
compiler/testData/resolveAnnotations/testFile.kt
+1
View File
@@ -45,6 +45,7 @@ annotation class AnnIntVararg(vararg a: Int)
annotation class AnnStringVararg(vararg a: String)
annotation class AnnStringArray(a: Array<String>)
annotation class AnnArrayOfEnum(a: Array<MyEnum>)
annotation class AnnAnn(a: AnnInt)
enum class MyEnum {
A
compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java
+6
View File
@@ -113,6 +113,12 @@ public class AnnotationDescriptorResolveTest extends JetLiteFixture {
doTest(content, expectedAnnotation);
}
public void testAnnotationAnnotation() throws Exception {
String content = getContent("AnnAnn(AnnInt(1))");
String expectedAnnotation = "AnnAnn[a = AnnInt[a = 1.toInt()]: test.AnnInt]";
doTest(content, expectedAnnotation);
}
private void doTest(@NotNull String content, @NotNull String expectedAnnotation) {
NamespaceDescriptor test = getNamespaceDescriptor(content);
ClassDescriptor myClass = getClassDescriptor(test, "MyClass");