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

Reformat & cleanup: LiftReturnOrAssignmentInspection

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-10-25 06:22:12 +03:00
committed by Mikhail Glukhikh
parent ebc998d710
commit f771ed5dd8
1 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/LiftReturnOrAssignmentInspection.kt
+50 -50
View File
@@ -29,59 +29,59 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
class LiftReturnOrAssignmentInspection : AbstractKotlinInspection() { class LiftReturnOrAssignmentInspection : AbstractKotlinInspection() {
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession) = override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession) =
object : KtVisitorVoid() { object : KtVisitorVoid() {
private fun visitIfOrWhenOrTry(expression: KtExpression, keyword: PsiElement) { private fun visitIfOrWhenOrTry(expression: KtExpression, keyword: PsiElement) {
if (expression.lineCount() > LINES_LIMIT) return if (expression.lineCount() > LINES_LIMIT) return
if (expression.isElseIf()) return if (expression.isElseIf()) return
val foldableReturns = BranchedFoldingUtils.getFoldableReturns(expression) val foldableReturns = BranchedFoldingUtils.getFoldableReturns(expression)
if (foldableReturns?.isNotEmpty() == true) { if (foldableReturns?.isNotEmpty() == true) {
val hasOtherReturns = expression.anyDescendantOfType<KtReturnExpression> { it !in foldableReturns } val hasOtherReturns = expression.anyDescendantOfType<KtReturnExpression> { it !in foldableReturns }
val isSerious = !hasOtherReturns && foldableReturns.size > 1 val isSerious = !hasOtherReturns && foldableReturns.size > 1
val verb = if (isSerious) "should" else "can" val verb = if (isSerious) "should" else "can"
holder.registerProblemWithoutOfflineInformation( holder.registerProblemWithoutOfflineInformation(
keyword, keyword,
"Return $verb be lifted out of '${keyword.text}'", "Return $verb be lifted out of '${keyword.text}'",
isOnTheFly, isOnTheFly,
if (isSerious) ProblemHighlightType.GENERIC_ERROR_OR_WARNING if (isSerious) ProblemHighlightType.GENERIC_ERROR_OR_WARNING
else ProblemHighlightType.INFORMATION, else ProblemHighlightType.INFORMATION,
LiftReturnOutFix(keyword.text) LiftReturnOutFix(keyword.text)
) )
return return
}
val assignmentNumber = BranchedFoldingUtils.getFoldableAssignmentNumber(expression)
if (assignmentNumber > 0) {
val verb = if (assignmentNumber > 1) "should" else "can"
holder.registerProblemWithoutOfflineInformation(
keyword,
"Assignment $verb be lifted out of '${keyword.text}'",
isOnTheFly,
if (assignmentNumber > 1) ProblemHighlightType.GENERIC_ERROR_OR_WARNING
else ProblemHighlightType.INFORMATION,
LiftAssignmentOutFix(keyword.text)
)
}
} }
val assignmentNumber = BranchedFoldingUtils.getFoldableAssignmentNumber(expression)
override fun visitIfExpression(expression: KtIfExpression) { if (assignmentNumber > 0) {
super.visitIfExpression(expression) val verb = if (assignmentNumber > 1) "should" else "can"
visitIfOrWhenOrTry(expression, expression.ifKeyword) holder.registerProblemWithoutOfflineInformation(
} keyword,
"Assignment $verb be lifted out of '${keyword.text}'",
override fun visitWhenExpression(expression: KtWhenExpression) { isOnTheFly,
super.visitWhenExpression(expression) if (assignmentNumber > 1) ProblemHighlightType.GENERIC_ERROR_OR_WARNING
visitIfOrWhenOrTry(expression, expression.whenKeyword) else ProblemHighlightType.INFORMATION,
} LiftAssignmentOutFix(keyword.text)
)
override fun visitTryExpression(expression: KtTryExpression) {
super.visitTryExpression(expression)
expression.tryKeyword?.let {
visitIfOrWhenOrTry(expression, it)
}
} }
} }
private class LiftReturnOutFix (private val keyword: String) : LocalQuickFix { override fun visitIfExpression(expression: KtIfExpression) {
super.visitIfExpression(expression)
visitIfOrWhenOrTry(expression, expression.ifKeyword)
}
override fun visitWhenExpression(expression: KtWhenExpression) {
super.visitWhenExpression(expression)
visitIfOrWhenOrTry(expression, expression.whenKeyword)
}
override fun visitTryExpression(expression: KtTryExpression) {
super.visitTryExpression(expression)
expression.tryKeyword?.let {
visitIfOrWhenOrTry(expression, it)
}
}
}
private class LiftReturnOutFix(private val keyword: String) : LocalQuickFix {
override fun getName() = "Lift return out of '$keyword'" override fun getName() = "Lift return out of '$keyword'"
override fun getFamilyName() = name override fun getFamilyName() = name
@@ -91,7 +91,7 @@ class LiftReturnOrAssignmentInspection : AbstractKotlinInspection() {
} }
} }
private class LiftAssignmentOutFix (private val keyword: String) : LocalQuickFix { private class LiftAssignmentOutFix(private val keyword: String) : LocalQuickFix {
override fun getName() = "Lift assignment out of '$keyword'" override fun getName() = "Lift assignment out of '$keyword'"
override fun getFamilyName() = name override fun getFamilyName() = name
@@ -102,6 +102,6 @@ class LiftReturnOrAssignmentInspection : AbstractKotlinInspection() {
} }
companion object { companion object {
private val LINES_LIMIT = 15 private const val LINES_LIMIT = 15
} }
} }