From de446a83f9265c2342ce1e472a7eaed2de8c55ac Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Tue, 14 May 2013 13:24:15 +0400
Subject: [PATCH] Refactoring: introduce variables for property scope

---
 .../org/jetbrains/jet/lang/resolve/BodyResolver.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
index c959002b284..19c1188212f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
@@ -382,17 +382,18 @@ public class BodyResolver {
                 computeDeferredType(propertyDescriptor.getReturnType());
 
                 JetExpression initializer = property.getInitializer();
+                JetScope propertyScope = getScopeForProperty(property);
                 if (initializer != null) {
                     ConstructorDescriptor primaryConstructor = classDescriptor.getUnsubstitutedPrimaryConstructor();
                     if (primaryConstructor != null) {
-                        resolvePropertyInitializer(property, propertyDescriptor, initializer, getScopeForProperty(property));
+                        resolvePropertyInitializer(property, propertyDescriptor, initializer, propertyScope);
                     }
                 }
 
                 JetExpression delegateExpression = property.getDelegateExpression();
                 if (delegateExpression != null) {
                     assert initializer == null : "Initializer should be null for delegated property : " + property.getText();
-                    resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, classDescriptor.getScopeForMemberResolution(), getScopeForProperty(property));
+                    resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, classDescriptor.getScopeForMemberResolution(), propertyScope);
                 }
 
                 resolvePropertyAccessors(property, propertyDescriptor);
@@ -411,15 +412,15 @@ public class BodyResolver {
             computeDeferredType(propertyDescriptor.getReturnType());
 
             JetExpression initializer = property.getInitializer();
+            JetScope propertyScope = getScopeForProperty(property);
             if (initializer != null) {
-                resolvePropertyInitializer(property, propertyDescriptor, initializer, getScopeForProperty(property));
+                resolvePropertyInitializer(property, propertyDescriptor, initializer, propertyScope);
             }
 
             JetExpression delegateExpression = property.getDelegateExpression();
             if (delegateExpression != null) {
                 assert initializer == null : "Initializer should be null for delegated property : " + property.getText();
-                JetScope scope = context.getDeclaringScopes().apply(property);
-                resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, scope, getScopeForProperty(property));
+                resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, propertyScope, propertyScope);
             }
 
             resolvePropertyAccessors(property, propertyDescriptor);