PatternMatchingTypingVisitor:

rewrite type inference for 'when' using special constructs.
This fixes several type inference issues for 'when':
KT-9929, KT-9972, KT-10439, KT-10463
along with some other diagnostics-related issues.
This commit is contained in:
Dmitry Petrov
2016-01-20 15:28:58 +03:00
parent b49e08fe04
commit f371e67ce8
23 changed files with 280 additions and 152 deletions
@@ -1,11 +1,10 @@
fun foo(s: Any?): String {
val t = when {
// To resolve: String U Nothing? = String?
s is String -> s
s is String -> <!DEBUG_INFO_SMARTCAST!>s<!>
else -> null
} ?: ""
// Ideally we should have smart cast to String here
return <!TYPE_MISMATCH!>t<!>
return t
}
fun bar(s: Any?): String {
@@ -24,10 +23,10 @@ fun bar(s: Any?): String {
fun baz(s: String?, r: String?): String {
val t = r ?: when {
s != null -> s
s != null -> <!DEBUG_INFO_SMARTCAST!>s<!>
else -> ""
}
return <!DEBUG_INFO_SMARTCAST!>t<!>
return t
}
fun withNull(s: String?): String {