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

Minor

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-26 23:11:36 +03:00
parent b6eda35345
commit 55acce5e0d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
+4 -2
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
public open class ChangeVisibilityModifierIntention protected( public open class ChangeVisibilityModifierIntention protected constructor(
val modifier: JetModifierKeywordToken val modifier: JetModifierKeywordToken
) : JetSelfTargetingRangeIntention<JetDeclaration>(javaClass(), "Make ${modifier.getValue()}") { ) : JetSelfTargetingRangeIntention<JetDeclaration>(javaClass(), "Make ${modifier.getValue()}") {
@@ -52,7 +52,9 @@ public open class ChangeVisibilityModifierIntention protected(
if (modifierList?.hasModifier(JetTokens.OVERRIDE_KEYWORD) ?: false) { if (modifierList?.hasModifier(JetTokens.OVERRIDE_KEYWORD) ?: false) {
val callableDescriptor = descriptor as? CallableDescriptor ?: return null val callableDescriptor = descriptor as? CallableDescriptor ?: return null
// cannot make visibility less than (or non-comparable with) any of the supers // cannot make visibility less than (or non-comparable with) any of the supers
if (callableDescriptor.getOverriddenDescriptors().any { val c = Visibilities.compare(it.getVisibility(), targetVisibility); c == null || c > 0 }) return null if (callableDescriptor.getOverriddenDescriptors()
.map { Visibilities.compare(it.getVisibility(), targetVisibility) }
.any { it == null || it > 0 }) return null
} }
setText(defaultText) setText(defaultText)