Fix type inference issues for 'if' and 'when'.

Use 'expectedType' (when present) as an explicit type argument for a special construct call.
Unfortunately, this approach can't be used for elvis due to other elvis-related inference hacks.
Fixes KT-10807, KT-10811.
This also affects KT-6189: now we can infer proper type for 'if'.

If type inference for special call failed, and we found no type errors in sub-expressions,
report TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT error.
This (and the hack above) fixes KT-10809: code no longer compiles.

This commit is contained in:

Dmitry Petrov

2016-01-26 21:20:24 +03:00

parent e3e463ef70

commit 9db3440e72

28 changed files with 498 additions and 18 deletions

compiler/testData/diagnostics/testsWithStdLib/when/kt10192.txt

Vendored

View File

@@ -0,0 +1,4 @@
 package
 public fun test1(): kotlin.Unit
 public fun test2(): kotlin.Unit