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

Misc: Render MemberInfo as 'abstract' only if it's present in source

Browse Source 
#KT-26533 Fixed
This commit is contained in:
Alexey Sedunov
2018-09-04 19:48:51 +03:00
parent be30761ec4
commit 9d5bd29e8b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfo.kt
+2 -1
View File
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.descriptors.MemberDescriptor
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.idea.refactoring.isInterfaceClass import org.jetbrains.kotlin.idea.refactoring.isInterfaceClass
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.renderer.DescriptorRendererModifier import org.jetbrains.kotlin.renderer.DescriptorRendererModifier
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
@@ -63,7 +64,7 @@ class KotlinMemberInfo @JvmOverloads constructor(
} }
else { else {
displayName = RENDERER.render(memberDescriptor) displayName = RENDERER.render(memberDescriptor)
if (memberDescriptor is MemberDescriptor && memberDescriptor.modality == Modality.ABSTRACT) { if (member.hasModifier(KtTokens.ABSTRACT_KEYWORD)) {
displayName = "abstract $displayName" displayName = "abstract $displayName"
} }
if (isCompanionMember) { if (isCompanionMember) {