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

USELESS_ELVIS_RIGHT_IS_NULL : build fix (add to different files in DiagnosticsTestGenerated), do not report if USELESS_ELVIS already exists

Browse Source 
(cherry picked from commit c71b656)
This commit is contained in:
Mikhail Glukhikh
2016-08-23 16:25:04 +03:00
committed by Mikhail Glukhikh
parent df86840515
commit d08d8af407
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.kt
Vendored
+2 -2
View File
@@ -27,9 +27,9 @@ val b = null ?: ( l() ?: false)
val bb = null ?: ( l() ?: null!!)
val bbb = null ?: ( l() ?: null)
val bbb = null ?: ( l() <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)
val bbbb = ( l() ?: null) ?: ( l() ?: null)
val bbbb = ( l() <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>) ?: ( l() <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)
fun f(x : Long?): Long {
var a = x ?: (<!TYPE_MISMATCH!>fun() {}<!> <!USELESS_ELVIS!><!USELESS_ELVIS_ON_LAMBDA_EXPRESSION!>?:<!> <!TYPE_MISMATCH!>fun() {}<!><!>)
compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt
Vendored
+1 -1
View File
@@ -5,5 +5,5 @@ operator fun String.invoke(i: Int) {}
fun foo(s: String?) {
<!UNSAFE_CALL!>s<!>(1)
<!UNSAFE_CALL!>(s ?: null)<!>(1)
<!UNSAFE_CALL!>(s <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)<!>(1)
}
compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.kt
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@ fun baz(s: String?, r: String?): String {
}
fun withNull(s: String?): String {
val t = s ?: null
val t = s <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>
// Error: nullable
return <!TYPE_MISMATCH!>t<!>
}