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

OverrideMemberChooserObject cleanup: remove forceAbstract (function gen)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-11-20 16:31:22 +03:00
parent 2277dcc76f
commit 4ab4358d22
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt
+3 -5
View File
@@ -256,11 +256,11 @@ private fun PropertyDescriptor.wrap(forceOverride: Boolean): PropertyDescriptor
return newDescriptor 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() if (this is ClassConstructorDescriptor) return this.wrap()
return object : FunctionDescriptor by this { return object : FunctionDescriptor by this {
override fun isExpect() = false 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 getReturnType() = this@wrap.returnType?.approximateFlexibleTypes(preferNotNull = true, preferStarForRaw = true)
override fun getOverriddenDescriptors() = if (forceOverride) listOf(this@wrap) else this@wrap.overriddenDescriptors override fun getOverriddenDescriptors() = if (forceOverride) listOf(this@wrap) else this@wrap.overriddenDescriptors
override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D) = override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D) =
@@ -316,9 +316,7 @@ private fun generateFunction(
renderer: DescriptorRenderer, renderer: DescriptorRenderer,
bodyType: OverrideMemberChooserObject.BodyType bodyType: OverrideMemberChooserObject.BodyType
): KtFunction { ): KtFunction {
val newDescriptor = descriptor.wrap( val newDescriptor = descriptor.wrap(forceOverride = renderer === OVERRIDE_RENDERER)
forceAbstract = renderer === ACTUAL_RENDERER && bodyType == NO_BODY, forceOverride = renderer === OVERRIDE_RENDERER
)
val returnType = descriptor.returnType val returnType = descriptor.returnType
val returnsNotUnit = returnType != null && !KotlinBuiltIns.isUnit(returnType) val returnsNotUnit = returnType != null && !KotlinBuiltIns.isUnit(returnType)