Safe call arguments are now handled as nullable in generic resolver #KT-9985 Fixed

2016-02-01 16:07:39 +03:00
parent 187694d1b0
commit 60d56b30bf
7 changed files with 103 additions and 8 deletions
@@ -0,0 +1,42 @@
+// !CHECK_TYPE
+// Incorrect "type mismatch" error for generic extension safe call (required not-null, found nullable)
+
+// FILE: B.java
+
+public class B<T> {
+    public String gav() {
+        return ""
+    }
+
+    public static <T> B<T> create() {
+        return new B();
+    }
+}
+
+// FILE: A.kt
+
+class A<T> {
+    fun gav() = ""
+}
+fun <R> foo(x: R) = x
+fun <T> A<T>.bar() = ""
+fun <T> B<T>.bar() = ""
+
+fun foo(l: A<String>?) {
+    // No errors should be here
+    foo(l?.bar()) checkType { _<String?>() }
+    foo(l?.gav()) checkType { _<String?>() }
+}
+
+fun fooNotNull(l: A<String>) {
+    // No errors should be here
+    foo(l<!UNNECESSARY_SAFE_CALL!>?.<!>bar()) checkType { _<String>() }
+    foo(l<!UNNECESSARY_SAFE_CALL!>?.<!>gav()) checkType { _<String>() }
+}
+
+fun bar() {
+    val l = B.create<String>()
+    foo(l?.bar()) checkType { _<String?>() }
+    foo(l?.gav()) checkType { _<String?>() }
+}
+
@@ -0,0 +1,27 @@
+package
+
+public fun bar(): kotlin.Unit
+public fun foo(/*0*/ l: A<kotlin.String>?): kotlin.Unit
+public fun </*0*/ R> foo(/*0*/ x: R): R
+public fun fooNotNull(/*0*/ l: A<kotlin.String>): kotlin.Unit
+public fun </*0*/ T> A<T>.bar(): kotlin.String
+public fun </*0*/ T> B<T>.bar(): kotlin.String
+
+public final class A</*0*/ T> {
+    public constructor A</*0*/ T>()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun gav(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class B</*0*/ T : kotlin.Any!> {
+    public constructor B</*0*/ T : kotlin.Any!>()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open fun gav(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public open fun </*0*/ T : kotlin.Any!> create(): B<T!>!
+}