From 89c8ee8614167a22d3777cac203b18d9e895c29a Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 14 Sep 2017 20:00:53 +0300 Subject: [PATCH] Migration: hasImpl -> hasExpectedModifier (OverrideMemberChooserObject) --- .../idea/core/overrideImplement/OverrideMemberChooserObject.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2e0cb9bb456..126f5a87cc0 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 @@ -35,6 +35,7 @@ import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.findDocComment.findDocComment +import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier import org.jetbrains.kotlin.renderer.* import org.jetbrains.kotlin.resolve.descriptorUtil.setSingleOverridden @@ -111,7 +112,7 @@ fun OverrideMemberChooserObject.generateMember(targetClass: KtClassOrObject, cop else -> error("Unknown member to override: $descriptor") } - if (!targetClass.hasModifier(KtTokens.IMPL_KEYWORD)) { + if (!targetClass.hasActualModifier()) { newMember.removeModifier(KtTokens.IMPL_KEYWORD) }