jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-04 00:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify boolean == true / false is no longer applicable on flexible boolean #KT-15087 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-12-02 14:02:42 +03:00
parent 4b86c4aa27
commit ea8548c55b
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
View File

@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.lexer.KtTokens.*
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.CompileTimeConstantUtils
import org.jetbrains.kotlin.resolve.calls.callUtil.getType
import org.jetbrains.kotlin.types.isFlexible
class SimplifyBooleanWithConstantsInspection : IntentionBasedInspection<KtBinaryExpression>(SimplifyBooleanWithConstantsIntention::class)
@@ -136,7 +137,7 @@ class SimplifyBooleanWithConstantsIntention : SelfTargetingOffsetIndependentInte
private fun KtExpression?.hasBooleanType(): Boolean {
val type = this?.getType(this.analyze()) ?: return false
return KotlinBuiltIns.isBoolean(type)
return KotlinBuiltIns.isBoolean(type) && !type.isFlexible()
}
private fun KtExpression.canBeReducedToBooleanConstant(constant: Boolean? = null): Boolean {

5
idea/testData/intentions/simplifyBooleanWithConstants/flexibleBoolean.1.java vendored Normal file
View File

@@ -0,0 +1,5 @@
class FromJava {
static Boolean foo() {
return Boolean.TRUE;
}
}

4
idea/testData/intentions/simplifyBooleanWithConstants/flexibleBoolean.kt vendored Normal file
View File

@@ -0,0 +1,4 @@
// IS_APPLICABLE: false
// WITH_RUNTIME
fun bar() = <caret>FromJava.foo() == true

6
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
View File

@@ -12939,6 +12939,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
doTest(fileName);
}
@TestMetadata("flexibleBoolean.kt")
public void testFlexibleBoolean() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/flexibleBoolean.kt");
doTest(fileName);
}
@TestMetadata("inapplicableNoConstants.kt")
public void testInapplicableNoConstants() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableNoConstants.kt");