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

Reformat RemoveModifierFix

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-05-10 18:08:58 +03:00
committed by Mikhail Glukhikh
parent 0100dfb2fd
commit 5e4d571693
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.kt
+8 -7
View File
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.quickfix
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil
import org.jetbrains.kotlin.lexer.KtModifierKeywordToken import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
@@ -28,9 +27,9 @@ import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.Variance
class RemoveModifierFix( class RemoveModifierFix(
element: KtModifierListOwner, element: KtModifierListOwner,
private val modifier: KtModifierKeywordToken, private val modifier: KtModifierKeywordToken,
private val isRedundant: Boolean private val isRedundant: Boolean
) : KotlinQuickFixAction<KtModifierListOwner>(element) { ) : KotlinQuickFixAction<KtModifierListOwner>(element) {
private val text = run { private val text = run {
@@ -49,8 +48,7 @@ class RemoveModifierFix(
override fun getText() = text override fun getText() = text
override fun isAvailable(project: Project, editor: Editor?, file: KtFile) = override fun isAvailable(project: Project, editor: Editor?, file: KtFile) = (element?.hasModifier(modifier) ?: false)
(element?.hasModifier(modifier) ?: false)
override fun invoke(project: Project, editor: Editor?, file: KtFile) { override fun invoke(project: Project, editor: Editor?, file: KtFile) {
invoke() invoke()
@@ -65,7 +63,10 @@ class RemoveModifierFix(
} }
companion object { companion object {
fun createRemoveModifierFromListOwnerFactory(modifier: KtModifierKeywordToken, isRedundant: Boolean = false): KotlinSingleIntentionActionFactory { fun createRemoveModifierFromListOwnerFactory(
modifier: KtModifierKeywordToken,
isRedundant: Boolean = false
): KotlinSingleIntentionActionFactory {
return object : KotlinSingleIntentionActionFactory() { return object : KotlinSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtModifierListOwner>? { override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtModifierListOwner>? {
val modifierListOwner = QuickFixUtil.getParentElementOfType(diagnostic, KtModifierListOwner::class.java) ?: return null val modifierListOwner = QuickFixUtil.getParentElementOfType(diagnostic, KtModifierListOwner::class.java) ?: return null