From 0cd131fcfe554074be0f9cdca13675e12cfed39c Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Mon, 30 Sep 2013 12:49:41 +0400 Subject: [PATCH] refactoring use method instead of its realisation, inline method --- .../types/expressions/DelegatedPropertyUtils.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DelegatedPropertyUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DelegatedPropertyUtils.java index 2165091bd94..f5f09cf4e85 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DelegatedPropertyUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DelegatedPropertyUtils.java @@ -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 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 */