Revert "[NI] Disable capturing/approximation type in TypeSubstitutor with enabled NI"

This reverts commit f20ec3e0a6.
2019-05-29 00:58:46 +03:00
parent 86a95e1a7b
commit 848640253a
80 changed files with 171 additions and 864 deletions
@@ -108,7 +108,7 @@ fun testImplicitCoercion() {
    val <!UNUSED_VARIABLE!>h<!> = if (false) <!IMPLICIT_CAST_TO_ANY!>4<!> else <!IMPLICIT_CAST_TO_ANY!>{}<!>

    bar(<!NI;TYPE_MISMATCH!>if (true) {
-        <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>4<!>
+        <!CONSTANT_EXPECTED_TYPE_MISMATCH, NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>4<!>
    }
        else {
        <!UNUSED_VALUE!>z =<!> 342