From 366ed7d4caf4d279dff963efe30fa50a6261acc0 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Thu, 28 May 2020 16:25:44 +0300 Subject: [PATCH] Minor: reformat fakeDescriptorsForReferences.kt --- .../codegen/fakeDescriptorsForReferences.kt | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/fakeDescriptorsForReferences.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/fakeDescriptorsForReferences.kt index 8cb9b87b295..0de7769d4b5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/fakeDescriptorsForReferences.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/fakeDescriptorsForReferences.kt @@ -43,8 +43,7 @@ private fun createFreeDescriptor(descriptor: D): while (container != null) { if (container is ClassDescriptor) { typeParameters.addAll(container.declaredTypeParameters) - } - else if (container is CallableDescriptor && container !is ConstructorDescriptor) { + } else if (container is CallableDescriptor && container !is ConstructorDescriptor) { typeParameters.addAll(container.typeParameters) } container = container.containingDeclaration @@ -60,23 +59,28 @@ private fun createFreeDescriptor(descriptor: D): */ fun createFreeFakeLocalPropertyDescriptor(descriptor: LocalVariableDescriptor): PropertyDescriptor { val property = PropertyDescriptorImpl.create( - descriptor.containingDeclaration, descriptor.annotations, Modality.FINAL, descriptor.visibility, descriptor.isVar, - descriptor.name, CallableMemberDescriptor.Kind.DECLARATION, descriptor.source, false, descriptor.isConst, - false, false, false, @Suppress("DEPRECATION") descriptor.isDelegated + descriptor.containingDeclaration, descriptor.annotations, Modality.FINAL, descriptor.visibility, descriptor.isVar, + descriptor.name, CallableMemberDescriptor.Kind.DECLARATION, descriptor.source, false, descriptor.isConst, + false, false, false, @Suppress("DEPRECATION") descriptor.isDelegated + ) + property.setType( + descriptor.type, descriptor.typeParameters, + descriptor.dispatchReceiverParameter, descriptor.extensionReceiverParameter ) - property.setType(descriptor.type, descriptor.typeParameters, descriptor.dispatchReceiverParameter, descriptor.extensionReceiverParameter) property.initialize( - descriptor.getter?.run { - PropertyGetterDescriptorImpl(property, annotations, modality, visibility, true, isExternal, isInline, kind, null, source).apply { + descriptor.getter?.run { + PropertyGetterDescriptorImpl(property, annotations, modality, visibility, true, isExternal, isInline, kind, null, source) + .apply { initialize(this@run.returnType) } - }, - descriptor.setter?.run { - PropertySetterDescriptorImpl(property, annotations, modality, visibility, true, isExternal, isInline, kind, null, source).apply { + }, + descriptor.setter?.run { + PropertySetterDescriptorImpl(property, annotations, modality, visibility, true, isExternal, isInline, kind, null, source) + .apply { initialize(this@run.valueParameters.single()) } - } + } ) return createFreeDescriptor(property)