From 9d5bd29e8b10e696b6ca8033b121881d9b2a35fe Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 4 Sep 2018 19:48:51 +0300 Subject: [PATCH] Misc: Render MemberInfo as 'abstract' only if it's present in source #KT-26533 Fixed --- .../kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt index c975365cc3a..03dbd5e3ae3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.descriptors.MemberDescriptor import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.idea.refactoring.isInterfaceClass import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers +import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.renderer.DescriptorRendererModifier import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull @@ -63,7 +64,7 @@ class KotlinMemberInfo @JvmOverloads constructor( } else { displayName = RENDERER.render(memberDescriptor) - if (memberDescriptor is MemberDescriptor && memberDescriptor.modality == Modality.ABSTRACT) { + if (member.hasModifier(KtTokens.ABSTRACT_KEYWORD)) { displayName = "abstract $displayName" } if (isCompanionMember) {