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

Resolve refactoring: resolvePropertyDeclarationBodies

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-06-10 15:08:21 +03:00
parent 40513bda56
commit f03a35d7ce
1 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+29 -33
View File
@@ -533,6 +533,32 @@ public class BodyResolver {
return parameterScope; return parameterScope;
} }
private void resolveProperty(
@NotNull BodiesResolveContext c,
@Nullable JetScope parentScope,
@NotNull JetProperty property,
@NotNull PropertyDescriptor propertyDescriptor
) {
computeDeferredType(propertyDescriptor.getReturnType());
JetExpression initializer = property.getInitializer();
JetScope propertyScope = getScopeForProperty(c, property);
if (parentScope == null) {
parentScope = propertyScope;
}
if (initializer != null) {
resolvePropertyInitializer(c, property, propertyDescriptor, initializer, propertyScope);
}
JetExpression delegateExpression = property.getDelegateExpression();
if (delegateExpression != null) {
assert initializer == null : "Initializer should be null for delegated property : " + property.getText();
resolvePropertyDelegate(c, property, propertyDescriptor, delegateExpression, parentScope, propertyScope);
}
resolvePropertyAccessors(c, property, propertyDescriptor);
}
private void resolvePropertyDeclarationBodies(@NotNull BodiesResolveContext c) { private void resolvePropertyDeclarationBodies(@NotNull BodiesResolveContext c) {
// Member properties // Member properties
@@ -546,23 +572,7 @@ public class BodyResolver {
PropertyDescriptor propertyDescriptor = c.getProperties().get(property); PropertyDescriptor propertyDescriptor = c.getProperties().get(property);
assert propertyDescriptor != null; assert propertyDescriptor != null;
computeDeferredType(propertyDescriptor.getReturnType()); resolveProperty(c, classDescriptor.getScopeForMemberDeclarationResolution(), property, propertyDescriptor);
JetExpression initializer = property.getInitializer();
JetScope propertyScope = getScopeForProperty(c, property);
if (initializer != null) {
resolvePropertyInitializer(c, property, propertyDescriptor, initializer, propertyScope);
}
JetExpression delegateExpression = property.getDelegateExpression();
if (delegateExpression != null) {
assert initializer == null : "Initializer should be null for delegated property : " + property.getText();
resolvePropertyDelegate(c, property, propertyDescriptor, delegateExpression, classDescriptor.getScopeForMemberDeclarationResolution(), propertyScope);
}
ForceResolveUtil.forceResolveAllContents(propertyDescriptor.getAnnotations());
resolvePropertyAccessors(c, property, propertyDescriptor);
processed.add(property); processed.add(property);
} }
} }
@@ -574,21 +584,7 @@ public class BodyResolver {
PropertyDescriptor propertyDescriptor = entry.getValue(); PropertyDescriptor propertyDescriptor = entry.getValue();
computeDeferredType(propertyDescriptor.getReturnType()); resolveProperty(c, null, property, propertyDescriptor);
JetExpression initializer = property.getInitializer();
JetScope propertyScope = getScopeForProperty(c, property);
if (initializer != null) {
resolvePropertyInitializer(c, property, propertyDescriptor, initializer, propertyScope);
}
JetExpression delegateExpression = property.getDelegateExpression();
if (delegateExpression != null) {
assert initializer == null : "Initializer should be null for delegated property : " + property.getText();
resolvePropertyDelegate(c, property, propertyDescriptor, delegateExpression, propertyScope, propertyScope);
}
resolvePropertyAccessors(c, property, propertyDescriptor);
} }
} }
@@ -696,7 +692,7 @@ public class BodyResolver {
} }
@NotNull @NotNull
private JetScope getScopeForProperty(@NotNull BodiesResolveContext c, @NotNull JetProperty property) { private static JetScope getScopeForProperty(@NotNull BodiesResolveContext c, @NotNull JetProperty property) {
JetScope scope = c.getDeclaringScopes().apply(property); JetScope scope = c.getDeclaringScopes().apply(property);
assert scope != null : "Scope for property " + property.getText() + " should exists"; assert scope != null : "Scope for property " + property.getText() + " should exists";
return scope; return scope;