[FIR] Render original type before smartcasted type in DEBUG_INFO_EXPRESSION_TYPE
This is made for keep consistency with same renderer in FE 1.0
This commit is contained in:
@@ -6,11 +6,11 @@
|
||||
fun case_1() {
|
||||
var a: Any? = null
|
||||
if (a == null) return
|
||||
val b = select(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a<!>)
|
||||
val c = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a<!>
|
||||
val b = select(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any")!>a<!>)
|
||||
val c = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any")!>a<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>b<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>c<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>c<!>.equals(10)
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any")!>c<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Any")!>c<!>.equals(10)
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>b<!>.equals(10)
|
||||
}
|
||||
|
||||
@@ -18,8 +18,8 @@ fun case_1() {
|
||||
fun case_2(a: Any?) {
|
||||
if (a is String) {
|
||||
val b = a
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.Any?")!>b<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.Any?")!>b<!>.length
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.String")!>b<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.String")!>b<!>.length
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,8 +30,8 @@ fun case_3(a: Any?) {
|
||||
val c = b
|
||||
val d = c
|
||||
val e = d
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.Any?")!>e<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.Any?")!>e<!>.length
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.String")!>e<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.String")!>e<!>.length
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,12 +46,12 @@ fun case_4(a: Any?) {
|
||||
if (d is ClassLevel4) {
|
||||
val e = d
|
||||
if (e is ClassLevel5) {
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?")!>e<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?")!>e<!>.test1()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?")!>e<!>.test2()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?")!>e<!>.test3()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?")!>e<!>.test4()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?")!>e<!>.test5()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5")!>e<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5")!>e<!>.test1()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5")!>e<!>.test2()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5")!>e<!>.test3()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5")!>e<!>.test4()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5")!>e<!>.test5()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -81,12 +81,12 @@ fun case_5(a: Any?) {
|
||||
&& if (true) {e = <!UNINITIALIZED_VARIABLE!>d<!>;false} else {e = <!UNINITIALIZED_VARIABLE!>d<!>;true}
|
||||
&& if (true) {<!UNINITIALIZED_VARIABLE!>e<!> as? ClassLevel5 ?: <!UNINITIALIZED_VARIABLE!>e<!> as ClassLevel5;true} else {<!UNINITIALIZED_VARIABLE!>e<!> as? ClassLevel5 ?: <!UNINITIALIZED_VARIABLE!>e<!> as ClassLevel5;false}
|
||||
) {
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?"), UNINITIALIZED_VARIABLE!>e<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?"), UNINITIALIZED_VARIABLE!>e<!>.test1()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?"), UNINITIALIZED_VARIABLE!>e<!>.test2()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?"), UNINITIALIZED_VARIABLE!>e<!>.test3()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?"), UNINITIALIZED_VARIABLE!>e<!>.test4()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel5 & kotlin.Any?"), UNINITIALIZED_VARIABLE!>e<!>.test5()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5"), UNINITIALIZED_VARIABLE!>e<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5"), UNINITIALIZED_VARIABLE!>e<!>.test1()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5"), UNINITIALIZED_VARIABLE!>e<!>.test2()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5"), UNINITIALIZED_VARIABLE!>e<!>.test3()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5"), UNINITIALIZED_VARIABLE!>e<!>.test4()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel5"), UNINITIALIZED_VARIABLE!>e<!>.test5()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,18 +104,18 @@ fun case_6() {
|
||||
when (if (true) {d.test2(); e = d; e as ClassLevel3} else {d.test2(); e = d; e as ClassLevel3}) {
|
||||
else -> ClassLevel2()
|
||||
} -> {
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>.inv())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>.test1())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>.test2())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>.test3())
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>.inv())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>.test1())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>.test2())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>.test3())
|
||||
}
|
||||
else -> {
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>.inv())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>.test1())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>.test2())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & ClassLevel3 & kotlin.Any?")!>e<!>.test3())
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>.inv())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>.test1())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>.test2())
|
||||
println(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int & ClassLevel3")!>e<!>.test3())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -133,7 +133,7 @@ fun case_7() {
|
||||
e as ClassLevel2
|
||||
e = d
|
||||
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel2 & kotlin.Any?")!>e<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel2 & kotlin.Any?")!>e<!>.test1()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel2 & kotlin.Any?")!>e<!>.test2()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel2")!>e<!>
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel2")!>e<!>.test1()
|
||||
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & ClassLevel2")!>e<!>.test2()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user