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

ProtectedInFinalInspection: reformat

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-11-08 12:21:29 +09:00
committed by Mikhail Glukhikh
parent 9c18e24de5
commit b935f52a63
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/ProtectedInFinalInspection.kt
+11 -9
View File
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.psi.declarationVisitor
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.psi.psiUtil.visibilityModifier import org.jetbrains.kotlin.psi.psiUtil.visibilityModifier
class ProtectedInFinalInspection : AbstractKotlinInspection() { class ProtectedInFinalInspection : AbstractKotlinInspection() {
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor {
return declarationVisitor(fun(declaration) { return declarationVisitor(fun(declaration) {
val visibilityModifier = declaration.visibilityModifier() ?: return val visibilityModifier = declaration.visibilityModifier() ?: return
@@ -27,12 +27,14 @@ class ProtectedInFinalInspection : AbstractKotlinInspection() {
if (modifierType == KtTokens.PROTECTED_KEYWORD) { if (modifierType == KtTokens.PROTECTED_KEYWORD) {
val parentClass = declaration.getParentOfType<KtClass>(true) ?: return val parentClass = declaration.getParentOfType<KtClass>(true) ?: return
if (!parentClass.isInheritable() && !parentClass.isEnum() && if (!parentClass.isInheritable() && !parentClass.isEnum() &&
declaration.implicitVisibility() != KtTokens.PROTECTED_KEYWORD) { declaration.implicitVisibility() != KtTokens.PROTECTED_KEYWORD
holder.registerProblem(visibilityModifier, ) {
"'protected' visibility is effectively 'private' in a final class", holder.registerProblem(
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, visibilityModifier,
MakePrivateFix(), "'protected' visibility is effectively 'private' in a final class",
MakeOpenFix() ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
MakePrivateFix(),
MakeOpenFix()
) )
} }
} }
@@ -47,7 +49,7 @@ class ProtectedInFinalInspection : AbstractKotlinInspection() {
override fun applyFix(project: Project, descriptor: ProblemDescriptor) { override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
if (!FileModificationService.getInstance().preparePsiElementForWrite(descriptor.psiElement)) return if (!FileModificationService.getInstance().preparePsiElementForWrite(descriptor.psiElement)) return
val modifierListOwner = descriptor.psiElement.getParentOfType<KtModifierListOwner>(true) val modifierListOwner = descriptor.psiElement.getParentOfType<KtModifierListOwner>(true)
?: throw IllegalStateException("Can't find modifier list owner for modifier") ?: throw IllegalStateException("Can't find modifier list owner for modifier")
addModifier(modifierListOwner, KtTokens.PRIVATE_KEYWORD) addModifier(modifierListOwner, KtTokens.PRIVATE_KEYWORD)
} }
} }
@@ -60,7 +62,7 @@ class ProtectedInFinalInspection : AbstractKotlinInspection() {
override fun applyFix(project: Project, descriptor: ProblemDescriptor) { override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
if (!FileModificationService.getInstance().preparePsiElementForWrite(descriptor.psiElement)) return if (!FileModificationService.getInstance().preparePsiElementForWrite(descriptor.psiElement)) return
val modifierListOwner = descriptor.psiElement.getParentOfType<KtModifierListOwner>(true) val modifierListOwner = descriptor.psiElement.getParentOfType<KtModifierListOwner>(true)
?: throw IllegalStateException("Can't find modifier list owner for modifier") ?: throw IllegalStateException("Can't find modifier list owner for modifier")
val parentClass = modifierListOwner.getParentOfType<KtClass>(true) ?: return val parentClass = modifierListOwner.getParentOfType<KtClass>(true) ?: return
addModifier(parentClass, KtTokens.OPEN_KEYWORD) addModifier(parentClass, KtTokens.OPEN_KEYWORD)
} }