fix after merge

2011-12-08 19:25:11 +04:00
parent b0ba456bd0
commit a41452a01e
1 changed files with 1 additions and 1 deletions
@@ -843,7 +843,7 @@ public class DescriptorResolver {
                name == null ? "<no name>" : name
        );
        JetType inType = isMutable ? type : null;
-        propertyDescriptor.setType(inType, type, Collections.<TypeParameterDescriptor>emptyList(), ReceiverDescriptor.NO_RECEIVER);
+        propertyDescriptor.setType(inType, type, Collections.<TypeParameterDescriptor>emptyList(), DescriptorUtils.getExpectedThisObjectIfNeeded(classDescriptor), ReceiverDescriptor.NO_RECEIVER);

        PropertyGetterDescriptor getter = createDefaultGetter(propertyDescriptor);
        PropertySetterDescriptor setter = createDefaultSetter(propertyDescriptor);