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

Reformat ConvertTwoComparisonsToRangeCheckIntention

Browse Source
This commit is contained in:
Toshiaki Kameyama
2019-09-19 14:30:48 +09:00
committed by Dmitry Gridin
parent 6c2eb3dd16
commit 54df0aad16
1 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertTwoComparisonsToRangeCheckIntention.kt
+32 -24
View File
@@ -34,12 +34,12 @@ import org.jetbrains.kotlin.types.typeUtil.isPrimitiveNumberType
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
class ConvertTwoComparisonsToRangeCheckInspection : IntentionBasedInspection<KtBinaryExpression>( class ConvertTwoComparisonsToRangeCheckInspection : IntentionBasedInspection<KtBinaryExpression>(
ConvertTwoComparisonsToRangeCheckIntention::class ConvertTwoComparisonsToRangeCheckIntention::class
) )
class ConvertTwoComparisonsToRangeCheckIntention : SelfTargetingOffsetIndependentIntention<KtBinaryExpression>( class ConvertTwoComparisonsToRangeCheckIntention : SelfTargetingOffsetIndependentIntention<KtBinaryExpression>(
KtBinaryExpression::class.java, KtBinaryExpression::class.java,
"Convert to range check" "Convert to range check"
) { ) {
private data class RangeExpressionData(val value: KtExpression, val min: String, val max: String) private data class RangeExpressionData(val value: KtExpression, val min: String, val max: String)
@@ -49,9 +49,13 @@ class ConvertTwoComparisonsToRangeCheckIntention : SelfTargetingOffsetIndependen
override fun applyTo(element: KtBinaryExpression, editor: Editor?) { override fun applyTo(element: KtBinaryExpression, editor: Editor?) {
val rangeData = generateRangeExpressionData(element) ?: return val rangeData = generateRangeExpressionData(element) ?: return
val factory = KtPsiFactory(element) val factory = KtPsiFactory(element)
element.replace(factory.createExpressionByPattern("$0 in $1..$2", rangeData.value, element.replace(
factory.createExpression(rangeData.min), factory.createExpressionByPattern(
factory.createExpression(rangeData.max))) "$0 in $1..$2", rangeData.value,
factory.createExpression(rangeData.min),
factory.createExpression(rangeData.max)
)
)
} }
private fun generateRangeExpressionData(condition: KtBinaryExpression): RangeExpressionData? { private fun generateRangeExpressionData(condition: KtBinaryExpression): RangeExpressionData? {
@@ -85,27 +89,31 @@ class ConvertTwoComparisonsToRangeCheckIntention : SelfTargetingOffsetIndependen
private fun KtExpression.isSimple() = this is KtConstantExpression || this is KtNameReferenceExpression private fun KtExpression.isSimple() = this is KtConstantExpression || this is KtNameReferenceExpression
private fun generateRangeExpressionData( private fun generateRangeExpressionData(
firstLess: KtExpression, firstGreater: KtExpression, firstStrict: Boolean, firstLess: KtExpression, firstGreater: KtExpression, firstStrict: Boolean,
secondLess: KtExpression, secondGreater: KtExpression, secondStrict: Boolean secondLess: KtExpression, secondGreater: KtExpression, secondStrict: Boolean
) = when { ) = when {
firstGreater !is KtConstantExpression && firstGreater.evaluatesTo(secondLess) -> firstGreater !is KtConstantExpression && firstGreater.evaluatesTo(secondLess) ->
generateRangeExpressionData(firstGreater, generateRangeExpressionData(
min = firstLess, firstGreater,
max = secondGreater, min = firstLess,
incrementMinByOne = firstStrict, max = secondGreater,
decrementMaxByOne = secondStrict) incrementMinByOne = firstStrict,
decrementMaxByOne = secondStrict
)
firstLess !is KtConstantExpression && firstLess.evaluatesTo(secondGreater) -> firstLess !is KtConstantExpression && firstLess.evaluatesTo(secondGreater) ->
generateRangeExpressionData(firstLess, generateRangeExpressionData(
min = secondLess, firstLess,
max = firstGreater, min = secondLess,
incrementMinByOne = secondStrict, max = firstGreater,
decrementMaxByOne = firstStrict) incrementMinByOne = secondStrict,
decrementMaxByOne = firstStrict
)
else -> else ->
null null
} }
private fun generateRangeExpressionData( private fun generateRangeExpressionData(
value: KtExpression, min: KtExpression, max: KtExpression, incrementMinByOne: Boolean, decrementMaxByOne: Boolean value: KtExpression, min: KtExpression, max: KtExpression, incrementMinByOne: Boolean, decrementMaxByOne: Boolean
): RangeExpressionData? { ): RangeExpressionData? {
fun KtExpression.getChangeBy(context: BindingContext, number: Int): String? { fun KtExpression.getChangeBy(context: BindingContext, number: Int): String? {
val type = getType(context) ?: return null val type = getType(context) ?: return null
@@ -171,7 +179,7 @@ class ConvertTwoComparisonsToRangeCheckIntention : SelfTargetingOffsetIndependen
return (intConst as? Number)?.toDouble()?.toString() return (intConst as? Number)?.toDouble()?.toString()
} }
private fun KotlinType.isComparable() = DescriptorUtils.isSubtypeOfClass(this, this.builtIns.getComparable()) private fun KotlinType.isComparable() = DescriptorUtils.isSubtypeOfClass(this, this.builtIns.comparable)
private fun KotlinType.isFloatingPoint(): Boolean { private fun KotlinType.isFloatingPoint(): Boolean {
return KotlinBuiltIns.isFloat(this) || KotlinBuiltIns.isDouble(this) return KotlinBuiltIns.isFloat(this) || KotlinBuiltIns.isDouble(this)
@@ -179,13 +187,13 @@ class ConvertTwoComparisonsToRangeCheckIntention : SelfTargetingOffsetIndependen
private fun KotlinType.isInteger(): Boolean { private fun KotlinType.isInteger(): Boolean {
return KotlinBuiltIns.isInt(this) || return KotlinBuiltIns.isInt(this) ||
KotlinBuiltIns.isLong(this) || KotlinBuiltIns.isLong(this) ||
KotlinBuiltIns.isShort(this) || KotlinBuiltIns.isShort(this) ||
KotlinBuiltIns.isByte(this) KotlinBuiltIns.isByte(this)
} }
private fun KotlinType?.isValidTypeForIncrementDecrementByOne(): Boolean { private fun KotlinType?.isValidTypeForIncrementDecrementByOne(): Boolean {
this ?: return false this ?: return false
return this.isInteger()|| KotlinBuiltIns.isChar(this) return this.isInteger() || KotlinBuiltIns.isChar(this)
} }
} }