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

Reformat ReplaceRangeToWithUntilInspection

Browse Source
This commit is contained in:
Toshiaki Kameyama
2019-02-02 20:50:38 +09:00
committed by Mikhail Glukhikh
parent 9c468ef2aa
commit c183f0285d
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceRangeToWithUntilInspection.kt
+8 -9
View File
@@ -29,20 +29,18 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.psi.createExpressionByPattern import org.jetbrains.kotlin.psi.createExpressionByPattern
class ReplaceRangeToWithUntilInspection : AbstractPrimitiveRangeToInspection() { class ReplaceRangeToWithUntilInspection : AbstractPrimitiveRangeToInspection() {
override fun visitRangeToExpression(expression: KtExpression, holder: ProblemsHolder) { override fun visitRangeToExpression(expression: KtExpression, holder: ProblemsHolder) {
if (expression.getArguments()?.second?.isMinusOne() != true) return if (expression.getArguments()?.second?.isMinusOne() != true) return
holder.registerProblem( holder.registerProblem(
expression, expression,
"'rangeTo' or the '..' call should be replaced with 'until'", "'rangeTo' or the '..' call should be replaced with 'until'",
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
ReplaceWithUntilQuickFix() ReplaceWithUntilQuickFix()
) )
} }
class ReplaceWithUntilQuickFix : LocalQuickFix { class ReplaceWithUntilQuickFix : LocalQuickFix {
override fun getName() = "Replace with until" override fun getName() = "Replace with until"
override fun getFamilyName() = name override fun getFamilyName() = name
@@ -50,13 +48,14 @@ class ReplaceRangeToWithUntilInspection : AbstractPrimitiveRangeToInspection() {
override fun applyFix(project: Project, descriptor: ProblemDescriptor) { override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
val element = descriptor.psiElement as KtExpression val element = descriptor.psiElement as KtExpression
val args = element.getArguments() ?: return val args = element.getArguments() ?: return
element.replace(KtPsiFactory(element).createExpressionByPattern( element.replace(
KtPsiFactory(element).createExpressionByPattern(
"$0 until $1", "$0 until $1",
args.first ?: return, args.first ?: return,
(args.second as? KtBinaryExpression)?.left ?: return) (args.second as? KtBinaryExpression)?.left ?: return
)
) )
} }
} }
private fun KtExpression.isMinusOne(): Boolean { private fun KtExpression.isMinusOne(): Boolean {