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

Minor. Rename method

Browse Source
This commit is contained in:
Andrey Breslav
2014-03-21 15:11:07 +04:00
parent f6439ade55
commit 368381a861
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt
+1 -1
View File
@@ -350,7 +350,7 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet
if (DescriptorUtils.isAnnotationClass(classDescriptor)) { if (DescriptorUtils.isAnnotationClass(classDescriptor)) {
val descriptor = AnnotationDescriptorImpl() val descriptor = AnnotationDescriptorImpl()
descriptor.setAnnotationType(classDescriptor.getDefaultType()) descriptor.setAnnotationType(classDescriptor.getDefaultType())
AnnotationResolver.resolveAnnotationArgument(descriptor, call, trace) AnnotationResolver.resolveAnnotationArguments(descriptor, call, trace)
return AnnotationValue(descriptor) return AnnotationValue(descriptor)
} }
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+2 -2
View File
@@ -215,11 +215,11 @@ public class AnnotationResolver {
if (results.isSingleResult()) { if (results.isSingleResult()) {
AnnotationDescriptorImpl annotationDescriptor = trace.getBindingContext().get(BindingContext.ANNOTATION, annotationEntry); AnnotationDescriptorImpl annotationDescriptor = trace.getBindingContext().get(BindingContext.ANNOTATION, annotationEntry);
assert annotationDescriptor != null : "Annotation descriptor should be created before resolving arguments for " + annotationEntry.getText(); assert annotationDescriptor != null : "Annotation descriptor should be created before resolving arguments for " + annotationEntry.getText();
resolveAnnotationArgument(annotationDescriptor, results.getResultingCall(), trace); resolveAnnotationArguments(annotationDescriptor, results.getResultingCall(), trace);
} }
} }
public static void resolveAnnotationArgument( public static void resolveAnnotationArguments(
@NotNull AnnotationDescriptorImpl annotationDescriptor, @NotNull AnnotationDescriptorImpl annotationDescriptor,
@NotNull ResolvedCall<?> resolvedCall, @NotNull ResolvedCall<?> resolvedCall,
@NotNull BindingTrace trace @NotNull BindingTrace trace