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

Refactoring: inline methods call

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-05-14 13:22:27 +04:00
parent aca6e97cf5
commit 389563dd18
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+4 -23
View File
@@ -385,14 +385,14 @@ public class BodyResolver {
if (initializer != null) { if (initializer != null) {
ConstructorDescriptor primaryConstructor = classDescriptor.getUnsubstitutedPrimaryConstructor(); ConstructorDescriptor primaryConstructor = classDescriptor.getUnsubstitutedPrimaryConstructor();
if (primaryConstructor != null) { if (primaryConstructor != null) {
resolvePropertyInitializer(property, propertyDescriptor, initializer); resolvePropertyInitializer(property, propertyDescriptor, initializer, getScopeForProperty(property));
} }
} }
JetExpression delegateExpression = property.getDelegateExpression(); JetExpression delegateExpression = property.getDelegateExpression();
if (delegateExpression != null) { if (delegateExpression != null) {
assert initializer == null : "Initializer should be null for delegated property : " + property.getText(); assert initializer == null : "Initializer should be null for delegated property : " + property.getText();
resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, classDescriptor.getScopeForMemberResolution()); resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, classDescriptor.getScopeForMemberResolution(), getScopeForProperty(property));
} }
resolvePropertyAccessors(property, propertyDescriptor); resolvePropertyAccessors(property, propertyDescriptor);
@@ -412,14 +412,14 @@ public class BodyResolver {
JetExpression initializer = property.getInitializer(); JetExpression initializer = property.getInitializer();
if (initializer != null) { if (initializer != null) {
resolvePropertyInitializer(property, propertyDescriptor, initializer); resolvePropertyInitializer(property, propertyDescriptor, initializer, getScopeForProperty(property));
} }
JetExpression delegateExpression = property.getDelegateExpression(); JetExpression delegateExpression = property.getDelegateExpression();
if (delegateExpression != null) { if (delegateExpression != null) {
assert initializer == null : "Initializer should be null for delegated property : " + property.getText(); assert initializer == null : "Initializer should be null for delegated property : " + property.getText();
JetScope scope = context.getDeclaringScopes().apply(property); JetScope scope = context.getDeclaringScopes().apply(property);
resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, scope); resolvePropertyDelegate(property, propertyDescriptor, delegateExpression, scope, getScopeForProperty(property));
} }
resolvePropertyAccessors(property, propertyDescriptor); resolvePropertyAccessors(property, propertyDescriptor);
@@ -467,16 +467,6 @@ public class BodyResolver {
}); });
} }
private void resolvePropertyDelegate(
@NotNull JetProperty jetProperty,
@NotNull PropertyDescriptor propertyDescriptor,
@NotNull JetExpression delegateExpression,
@NotNull JetScope parentScopeForAccessor
) {
JetScope propertyDeclarationInnerScope = getScopeForProperty(jetProperty);
resolvePropertyDelegate(jetProperty, propertyDescriptor, delegateExpression, parentScopeForAccessor, propertyDeclarationInnerScope);
}
public void resolvePropertyDelegate( public void resolvePropertyDelegate(
@NotNull JetProperty jetProperty, @NotNull JetProperty jetProperty,
@NotNull PropertyDescriptor propertyDescriptor, @NotNull PropertyDescriptor propertyDescriptor,
@@ -509,15 +499,6 @@ public class BodyResolver {
} }
} }
private void resolvePropertyInitializer(
@NotNull JetProperty property,
@NotNull PropertyDescriptor propertyDescriptor,
@NotNull JetExpression initializer
) {
JetScope propertyDeclarationInnerScope = getScopeForProperty(property);
resolvePropertyInitializer(property, propertyDescriptor, initializer, propertyDeclarationInnerScope);
}
public void resolvePropertyInitializer( public void resolvePropertyInitializer(
@NotNull JetProperty property, @NotNull JetProperty property,
@NotNull PropertyDescriptor propertyDescriptor, @NotNull PropertyDescriptor propertyDescriptor,