fix after merge
This commit is contained in:
@@ -843,7 +843,7 @@ public class DescriptorResolver {
|
|||||||
name == null ? "<no name>" : name
|
name == null ? "<no name>" : name
|
||||||
);
|
);
|
||||||
JetType inType = isMutable ? type : null;
|
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);
|
PropertyGetterDescriptor getter = createDefaultGetter(propertyDescriptor);
|
||||||
PropertySetterDescriptor setter = createDefaultSetter(propertyDescriptor);
|
PropertySetterDescriptor setter = createDefaultSetter(propertyDescriptor);
|
||||||
|
|||||||
Reference in New Issue
Block a user