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

Minor refactoring: implicitVisibility

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-10-09 11:50:21 +03:00
parent 3be5f2b843
commit 2e5ee242c7
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt
+7 -12
View File
@@ -253,19 +253,14 @@ fun KtModifierListOwner.setVisibility(visibilityModifier: KtModifierKeywordToken
} }
fun KtDeclaration.implicitVisibility(): KtModifierKeywordToken? { fun KtDeclaration.implicitVisibility(): KtModifierKeywordToken? {
if (this is KtPropertyAccessor && this.isSetter) {
val property = this.property
if (property.hasModifier(KtTokens.OVERRIDE_KEYWORD)) {
val visibility = (property.descriptor as? PropertyDescriptor)
?.overriddenDescriptors
?.firstOrNull()
?.setter
?.visibility
?.toKeywordToken()
if (visibility != null) return visibility
}
}
return when { return when {
this is KtPropertyAccessor && isSetter && property.hasModifier(KtTokens.OVERRIDE_KEYWORD) -> {
(property.descriptor as? PropertyDescriptor)?.overriddenDescriptors?.forEach {
val visibility = it.setter?.visibility?.toKeywordToken()
if (visibility != null) return visibility
}
KtTokens.DEFAULT_VISIBILITY_KEYWORD
}
this is KtConstructor<*> -> { this is KtConstructor<*> -> {
val klass = getContainingClassOrObject() val klass = getContainingClassOrObject()
if (klass is KtClass && (klass.isEnum() || klass.isSealed())) KtTokens.PRIVATE_KEYWORD if (klass is KtClass && (klass.isEnum() || klass.isSealed())) KtTokens.PRIVATE_KEYWORD