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

Add modifier fix: improve style a bit

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-12-29 17:17:38 +03:00
parent 184651d366
commit 50eaca1ac4
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
+18 -16
View File
@@ -106,23 +106,25 @@ open class AddModifierFix(
} }
fun createIfApplicable(modifierListOwner: KtModifierListOwner, modifier: KtModifierKeywordToken): AddModifierFix? { fun createIfApplicable(modifierListOwner: KtModifierListOwner, modifier: KtModifierKeywordToken): AddModifierFix? {
if (modifier == ABSTRACT_KEYWORD || modifier == OPEN_KEYWORD) { when (modifier) {
if (modifierListOwner is KtObjectDeclaration) return null ABSTRACT_KEYWORD, OPEN_KEYWORD -> {
if (modifierListOwner is KtEnumEntry) return null if (modifierListOwner is KtObjectDeclaration) return null
if (modifierListOwner is KtDeclaration && modifierListOwner !is KtClass) { if (modifierListOwner is KtEnumEntry) return null
val parentClassOrObject = modifierListOwner.containingClassOrObject ?: return null if (modifierListOwner is KtDeclaration && modifierListOwner !is KtClass) {
if (parentClassOrObject is KtObjectDeclaration) return null val parentClassOrObject = modifierListOwner.containingClassOrObject ?: return null
if (parentClassOrObject is KtEnumEntry) return null if (parentClassOrObject is KtObjectDeclaration) return null
if (parentClassOrObject is KtEnumEntry) return null
}
} }
} INNER_KEYWORD -> {
if (modifier == INNER_KEYWORD) { if (modifierListOwner is KtObjectDeclaration) return null
if (modifierListOwner is KtObjectDeclaration) return null if (modifierListOwner is KtClass) {
if (modifierListOwner is KtClass) { if (modifierListOwner.isInterface() ||
if (modifierListOwner.isInterface() || modifierListOwner.isSealed() ||
modifierListOwner.isSealed() || modifierListOwner.isEnum() ||
modifierListOwner.isEnum() || modifierListOwner.isData() ||
modifierListOwner.isData() || modifierListOwner.isAnnotation()) return null
modifierListOwner.isAnnotation()) return null }
} }
} }
return AddModifierFix(modifierListOwner, modifier) return AddModifierFix(modifierListOwner, modifier)