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

Create method for resolving delegate with scope (for resolve from ResolveSessionUtils)

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-05-14 13:19:44 +04:00
parent 3795af90d9
commit aca6e97cf5
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+11 -1
View File
@@ -472,6 +472,17 @@ public class BodyResolver {
@NotNull PropertyDescriptor propertyDescriptor, @NotNull PropertyDescriptor propertyDescriptor,
@NotNull JetExpression delegateExpression, @NotNull JetExpression delegateExpression,
@NotNull JetScope parentScopeForAccessor @NotNull JetScope parentScopeForAccessor
) {
JetScope propertyDeclarationInnerScope = getScopeForProperty(jetProperty);
resolvePropertyDelegate(jetProperty, propertyDescriptor, delegateExpression, parentScopeForAccessor, propertyDeclarationInnerScope);
}
public void resolvePropertyDelegate(
@NotNull JetProperty jetProperty,
@NotNull PropertyDescriptor propertyDescriptor,
@NotNull JetExpression delegateExpression,
@NotNull JetScope parentScopeForAccessor,
@NotNull JetScope propertyScope
) { ) {
JetPropertyAccessor getter = jetProperty.getGetter(); JetPropertyAccessor getter = jetProperty.getGetter();
if (getter != null) { if (getter != null) {
@@ -483,7 +494,6 @@ public class BodyResolver {
trace.report(ACCESSOR_FOR_DELEGATED_PROPERTY.on(setter)); trace.report(ACCESSOR_FOR_DELEGATED_PROPERTY.on(setter));
} }
JetScope propertyScope = getScopeForProperty(jetProperty);
JetScope propertyDeclarationInnerScope = descriptorResolver.getPropertyDeclarationInnerScopeForInitializer( JetScope propertyDeclarationInnerScope = descriptorResolver.getPropertyDeclarationInnerScopeForInitializer(
propertyScope, propertyDescriptor.getTypeParameters(), NO_RECEIVER_PARAMETER, trace); propertyScope, propertyDescriptor.getTypeParameters(), NO_RECEIVER_PARAMETER, trace);
JetType delegateType = expressionTypingServices.safeGetType(propertyDeclarationInnerScope, delegateExpression, NO_EXPECTED_TYPE, JetType delegateType = expressionTypingServices.safeGetType(propertyDeclarationInnerScope, delegateExpression, NO_EXPECTED_TYPE,