From eda747c0bf8982c96f1d1f619e6168a4b75edcda Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 18 Jul 2017 20:06:16 +0300 Subject: [PATCH] Minor: Fix tests --- .../core/overrideImplement/OverrideMemberChooserObject.kt | 4 ++-- .../createFunction/call/callWithClassLiteral.kt.after | 2 +- 2 files changed, 3 insertions(+), 3 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 bdbc2cfa5e1..ccaf52333ea 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 @@ -136,9 +136,9 @@ private val OVERRIDE_RENDERER = DescriptorRenderer.withOptions { } private fun PropertyDescriptor.wrap(): PropertyDescriptor { - val newDescriptor = object : PropertyDescriptor by this { + val delegate = copy(containingDeclaration, Modality.OPEN, visibility, kind, true) as PropertyDescriptor + val newDescriptor = object : PropertyDescriptor by delegate { override fun isHeader() = false - override fun getModality() = Modality.OPEN } newDescriptor.setSingleOverridden(this) return newDescriptor diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt.after index 62f63d019df..bd0356c4b18 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt.after @@ -11,4 +11,4 @@ fun main(args: Array) { fun checkProperty(kClass: KClass) { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. -} \ No newline at end of file +}