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

Support smart casts after if (nullable ?: boolean) #KT-8492 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-08-10 16:38:38 +03:00
parent 9be5cf89b4
commit b2d931fb1f
8 changed files with 160 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/smartCasts/elvis/basicOff.kt
Vendored
+50
View File
@@ -0,0 +1,50 @@
// !LANGUAGE: -BooleanElvisBoundSmartCasts
interface Order {
val expired: Boolean?
fun notExpired(): Boolean
fun doSomething()
}
fun foo(o: Any) {
val order = o as? Order
if (order?.expired ?: false) {
order<!UNSAFE_CALL!>.<!>doSomething()
}
else {
}
if (order?.notExpired() ?: false) {
order<!UNSAFE_CALL!>.<!>doSomething()
}
}
fun bar(o: Any) {
val order = o as? Order
if (order?.expired ?: true) {
}
else {
order!!.doSomething()
}
if (order?.notExpired() ?: true) {
}
else {
order!!.doSomething()
}
}
fun baz(o: Boolean?) {
if (o ?: false) {
o<!UNSAFE_CALL!>.<!>hashCode()
}
if (o ?: true) {
}
else {
o<!UNSAFE_CALL!>.<!>hashCode()
}
}
compiler/testData/diagnostics/tests/smartCasts/elvis/basicOff.txt
Vendored
+14
View File
@@ -0,0 +1,14 @@
package
public fun bar(/*0*/ o: kotlin.Any): kotlin.Unit
public fun baz(/*0*/ o: kotlin.Boolean?): kotlin.Unit
public fun foo(/*0*/ o: kotlin.Any): kotlin.Unit
public interface Order {
public abstract val expired: kotlin.Boolean?
public abstract fun doSomething(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract fun notExpired(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/smartCasts/elvis/basicOn.kt
Vendored
+50
View File
@@ -0,0 +1,50 @@
// !LANGUAGE: +BooleanElvisBoundSmartCasts
interface Order {
val expired: Boolean?
fun notExpired(): Boolean
fun doSomething()
}
fun foo(o: Any) {
val order = o as? Order
if (order?.expired ?: false) {
<!DEBUG_INFO_SMARTCAST!>order<!>.doSomething()
}
else {
}
if (order?.notExpired() ?: false) {
<!DEBUG_INFO_SMARTCAST!>order<!>.doSomething()
}
}
fun bar(o: Any) {
val order = o as? Order
if (order?.expired ?: true) {
}
else {
order<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.doSomething()
}
if (order?.notExpired() ?: true) {
}
else {
order<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.doSomething()
}
}
fun baz(o: Boolean?) {
if (o ?: false) {
<!DEBUG_INFO_SMARTCAST!>o<!>.hashCode()
}
if (o ?: true) {
}
else {
<!DEBUG_INFO_SMARTCAST!>o<!>.hashCode()
}
}
compiler/testData/diagnostics/tests/smartCasts/elvis/basicOn.txt
Vendored
+14
View File
@@ -0,0 +1,14 @@
package
public fun bar(/*0*/ o: kotlin.Any): kotlin.Unit
public fun baz(/*0*/ o: kotlin.Boolean?): kotlin.Unit
public fun foo(/*0*/ o: kotlin.Any): kotlin.Unit
public interface Order {
public abstract val expired: kotlin.Boolean?
public abstract fun doSomething(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract fun notExpired(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}