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

Delegate properties break "Debug..." and "Run..." actions when type is specified

Browse Source 
#KT-3594 Fixed
This commit is contained in:
Natalia.Ukhorskaya
2013-05-14 13:06:10 +04:00
parent de446a83f9
commit 04120f432c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
+5 -1
View File
@@ -189,11 +189,15 @@ public class ResolveSessionUtils {
PropertyDescriptor descriptor = (PropertyDescriptor) resolveSession.resolveToDescriptor(jetProperty); PropertyDescriptor descriptor = (PropertyDescriptor) resolveSession.resolveToDescriptor(jetProperty);
JetExpression propertyInitializer = jetProperty.getInitializer(); JetExpression propertyInitializer = jetProperty.getInitializer();
if (propertyInitializer != null) { if (propertyInitializer != null) {
bodyResolver.resolvePropertyInitializer(jetProperty, descriptor, propertyInitializer, propertyResolutionScope); bodyResolver.resolvePropertyInitializer(jetProperty, descriptor, propertyInitializer, propertyResolutionScope);
} }
JetExpression propertyDelegate = jetProperty.getDelegateExpression();
if (propertyDelegate != null) {
bodyResolver.resolvePropertyDelegate(jetProperty, descriptor, propertyDelegate, propertyResolutionScope, propertyResolutionScope);
}
bodyResolver.resolvePropertyAccessors(jetProperty, descriptor); bodyResolver.resolvePropertyAccessors(jetProperty, descriptor);
} }
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DelegatedPropertyUtils.java
+2 -4
View File
@@ -88,11 +88,9 @@ public class DelegatedPropertyUtils {
scope, true); scope, true);
JetType returnType = getDelegateGetMethodReturnType(trace.getBindingContext(), propertyDescriptor); JetType returnType = getDelegateGetMethodReturnType(trace.getBindingContext(), propertyDescriptor);
JetType propertyType = propertyDescriptor.getType(); JetType propertyType = propertyDescriptor.getType();
if (propertyType instanceof DeferredType) {
assert ((DeferredType) propertyType).isComputed() : "Property type should be computed when resolving delegate convention method";
}
if (returnType != null && !JetTypeChecker.INSTANCE.isSubtypeOf(returnType, propertyType)) { /* Do not check return type of get() method of delegate for properties with DeferredType because property type is taken from it */
if (!(propertyType instanceof DeferredType) && returnType != null && !JetTypeChecker.INSTANCE.isSubtypeOf(returnType, propertyType)) {
Call call = trace.getBindingContext().get(DELEGATED_PROPERTY_CALL, propertyDescriptor.getGetter()); Call call = trace.getBindingContext().get(DELEGATED_PROPERTY_CALL, propertyDescriptor.getGetter());
assert call != null : "Call should exists for " + propertyDescriptor.getGetter(); assert call != null : "Call should exists for " + propertyDescriptor.getGetter();
trace.report(DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH trace.report(DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH