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

refactoring

Browse Source 
use method instead of its realisation, inline method
This commit is contained in:
Svetlana Isakova
2013-09-30 12:49:41 +04:00
parent b32bb2302d
commit 0cd131fcfe
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DelegatedPropertyUtils.java
+3 -9
View File
@@ -66,13 +66,8 @@ public class DelegatedPropertyUtils {
) {
resolveDelegatedPropertyConventionMethod(propertyDescriptor, delegateExpression, delegateType, expressionTypingServices, trace,
scope, true);
return getDelegateGetMethodReturnType(trace.getBindingContext(), propertyDescriptor);
}
@Nullable
private static JetType getDelegateGetMethodReturnType(@NotNull BindingContext context, @NotNull PropertyDescriptor descriptor) {
ResolvedCall<FunctionDescriptor> resolvedCall =
context.get(DELEGATED_PROPERTY_RESOLVED_CALL, descriptor.getGetter());
trace.getBindingContext().get(DELEGATED_PROPERTY_RESOLVED_CALL, propertyDescriptor.getGetter());
return resolvedCall != null ? resolvedCall.getResultingDescriptor().getReturnType() : null;
}
@@ -84,9 +79,8 @@ public class DelegatedPropertyUtils {
@NotNull BindingTrace trace,
@NotNull JetScope scope
) {
resolveDelegatedPropertyConventionMethod(propertyDescriptor, delegateExpression, delegateType, expressionTypingServices, trace,
scope, true);
JetType returnType = getDelegateGetMethodReturnType(trace.getBindingContext(), propertyDescriptor);
JetType returnType = getDelegatedPropertyGetMethodReturnType(
propertyDescriptor, delegateExpression, delegateType, expressionTypingServices, trace, scope);
JetType propertyType = propertyDescriptor.getType();
/* Do not check return type of get() method of delegate for properties with DeferredType because property type is taken from it */