From 4ab4358d22db2e2eed1749671b8d411331c062eb Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 20 Nov 2018 16:31:22 +0300 Subject: [PATCH] OverrideMemberChooserObject cleanup: remove forceAbstract (function gen) --- .../core/overrideImplement/OverrideMemberChooserObject.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt index c46a3fc02a5..bff577a4e25 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt @@ -256,11 +256,11 @@ private fun PropertyDescriptor.wrap(forceOverride: Boolean): PropertyDescriptor return newDescriptor } -private fun FunctionDescriptor.wrap(forceOverride: Boolean, forceAbstract: Boolean): FunctionDescriptor { +private fun FunctionDescriptor.wrap(forceOverride: Boolean): FunctionDescriptor { if (this is ClassConstructorDescriptor) return this.wrap() return object : FunctionDescriptor by this { override fun isExpect() = false - override fun getModality() = if (forceAbstract) Modality.ABSTRACT else if (forceOverride) Modality.OPEN else this@wrap.modality + override fun getModality() = if (forceOverride) Modality.OPEN else this@wrap.modality override fun getReturnType() = this@wrap.returnType?.approximateFlexibleTypes(preferNotNull = true, preferStarForRaw = true) override fun getOverriddenDescriptors() = if (forceOverride) listOf(this@wrap) else this@wrap.overriddenDescriptors override fun accept(visitor: DeclarationDescriptorVisitor, data: D) = @@ -316,9 +316,7 @@ private fun generateFunction( renderer: DescriptorRenderer, bodyType: OverrideMemberChooserObject.BodyType ): KtFunction { - val newDescriptor = descriptor.wrap( - forceAbstract = renderer === ACTUAL_RENDERER && bodyType == NO_BODY, forceOverride = renderer === OVERRIDE_RENDERER - ) + val newDescriptor = descriptor.wrap(forceOverride = renderer === OVERRIDE_RENDERER) val returnType = descriptor.returnType val returnsNotUnit = returnType != null && !KotlinBuiltIns.isUnit(returnType)