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

Optimize ChangeVisibilityModifierIntention: do not analyze element if declaration isn't local

Browse Source
This commit is contained in:
Natalia Selezneva
2019-01-22 10:27:28 +03:00
parent 869fb46c0b
commit 3b4d1dd7bf
1 changed files with 2 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
+2 -2
View File
@@ -39,12 +39,12 @@ open class ChangeVisibilityModifierIntention protected constructor(
val modifierList = element.modifierList val modifierList = element.modifierList
if (modifierList?.hasModifier(modifier) == true) return null if (modifierList?.hasModifier(modifier) == true) return null
if (KtPsiUtil.isLocal((element as? KtPropertyAccessor)?.property ?: element)) return null
val descriptor = element.toDescriptor() as? DeclarationDescriptorWithVisibility ?: return null val descriptor = element.toDescriptor() as? DeclarationDescriptorWithVisibility ?: return null
val targetVisibility = modifier.toVisibility() val targetVisibility = modifier.toVisibility()
if (descriptor.visibility == targetVisibility) return null if (descriptor.visibility == targetVisibility) return null
if (KtPsiUtil.isLocal((element as? KtPropertyAccessor)?.property ?: element)) return null
if (modifierList?.hasModifier(KtTokens.OVERRIDE_KEYWORD) == true) { if (modifierList?.hasModifier(KtTokens.OVERRIDE_KEYWORD) == true) {
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