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

Elvis DFA: now only left part is taken into account #KT-9100 Fixed

Browse Source 
I had to fix a few incorrect tests using something like x!! in Elvis right part, and also one bug in our code
This commit is contained in:
Mikhail Glukhikh
2015-09-09 15:59:06 +03:00
committed by Mikhail Glukhikh
parent 9fd968d59e
commit 9b11b5300c
13 changed files with 103 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/smartCasts/loops/assignElvisIfBreakInsideWhileTrue.kt
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@ public fun foo(x: String?, y: String?): Int {
val z = x ?: if (y == null) break else <!DEBUG_INFO_SMARTCAST!>y<!>
// z is not null in both branches
z.length()
// y is not null in both branches
<!DEBUG_INFO_SMARTCAST!>y<!>.length()
// y is nullable if x != null
y<!UNSAFE_CALL!>.<!>length()
}
// y is null because of the break
return y<!UNSAFE_CALL!>.<!>length()
compiler/testData/diagnostics/tests/smartCasts/loops/elvisIfBreakInsideWhileTrue.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
public fun foo(x: String?, y: String?): Int {
while (true) {
x ?: if (y == null) break
// y is not null in both branches
<!DEBUG_INFO_SMARTCAST!>y<!>.length()
// y is nullable if x != null
y<!UNSAFE_CALL!>.<!>length()
}
// y is null because of the break
return y<!UNSAFE_CALL!>.<!>length()
compiler/testData/diagnostics/tests/smartCasts/loops/elvisLeftBreakInsideWhileTrue.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
public fun foo(x: String?, y: String?): Int {
while (true) {
(if (x != null) break else y) ?: y!!
// x is not null in both branches
<!DEBUG_INFO_SMARTCAST!>y<!>.length()
// y is not null in both branches but it's hard to determine
y<!UNSAFE_CALL!>.<!>length()
}
// y can be null because of the break
return y<!UNSAFE_CALL!>.<!>length()