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

Reformat: AddModifierFix

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-07-25 17:13:30 +03:00
parent 48017a81ee
commit 54b63ea43a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
+9 -6
View File
@@ -42,8 +42,8 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.TypeUtils
open class AddModifierFix( open class AddModifierFix(
element: KtModifierListOwner, element: KtModifierListOwner,
protected val modifier: KtModifierKeywordToken protected val modifier: KtModifierKeywordToken
) : KotlinQuickFixAction<KtModifierListOwner>(element), KotlinUniversalQuickFix { ) : KotlinQuickFixAction<KtModifierListOwner>(element), KotlinUniversalQuickFix {
override fun getText(): String { override fun getText(): String {
val element = element ?: return "" val element = element ?: return ""
@@ -82,8 +82,7 @@ open class AddModifierFix(
if (nameIdentifier != null) { if (nameIdentifier != null) {
name = nameIdentifier.text name = nameIdentifier.text
} }
} } else if (modifierListOwner is KtPropertyAccessor) {
else if (modifierListOwner is KtPropertyAccessor) {
name = modifierListOwner.namePlaceholder.text name = modifierListOwner.namePlaceholder.text
} }
if (name == null) { if (name == null) {
@@ -96,7 +95,10 @@ open class AddModifierFix(
return createFactory(modifier, KtModifierListOwner::class.java) return createFactory(modifier, KtModifierListOwner::class.java)
} }
fun <T : KtModifierListOwner> createFactory(modifier: KtModifierKeywordToken, modifierOwnerClass: Class<T>): KotlinSingleIntentionActionFactory { fun <T : KtModifierListOwner> createFactory(
modifier: KtModifierKeywordToken,
modifierOwnerClass: Class<T>
): KotlinSingleIntentionActionFactory {
return object : KotlinSingleIntentionActionFactory() { return object : KotlinSingleIntentionActionFactory() {
public override fun createAction(diagnostic: Diagnostic): IntentionAction? { public override fun createAction(diagnostic: Diagnostic): IntentionAction? {
val modifierListOwner = QuickFixUtil.getParentElementOfType(diagnostic, modifierOwnerClass) ?: return null val modifierListOwner = QuickFixUtil.getParentElementOfType(diagnostic, modifierOwnerClass) ?: return null
@@ -123,7 +125,8 @@ open class AddModifierFix(
modifierListOwner.isSealed() || modifierListOwner.isSealed() ||
modifierListOwner.isEnum() || modifierListOwner.isEnum() ||
modifierListOwner.isData() || modifierListOwner.isData() ||
modifierListOwner.isAnnotation()) return null modifierListOwner.isAnnotation()
) return null
} }
} }
} }