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

K2: Emulate K1 behavior in case of when-elvis combination

Browse Source 
^KT-55692 Related
This commit is contained in:
Denis.Zharkov
2022-12-07 09:57:42 +01:00
committed by Space Team
parent e46ef0bbec
commit 181f23bd8d
6 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirControlFlowStatementsResolveTransformer.kt
+7
View File
@@ -243,6 +243,13 @@ class FirControlFlowStatementsResolveTransformer(transformer: FirAbstractBodyRes
if (elvisExpression.calleeReference is FirResolvedNamedReference) return elvisExpression
elvisExpression.transformAnnotations(transformer, data)
// Do not use expect type when it's came from if/when (when it doesn't require completion)
// It returns us to K1 behavior in the case of when-elvis combination (see testData/diagnostics/tests/inference/elvisInsideWhen.kt)
// But this is mostly a hack that I hope might be lifted once KT-55692 is considered
// NB: Currently situation `it is ResolutionMode.WithExpectedType && !it.forceFullCompletion` might only happen in case of when branches
@Suppress("NAME_SHADOWING")
val data = data.takeUnless { it is ResolutionMode.WithExpectedType && !it.forceFullCompletion } ?: ResolutionMode.ContextDependent
val expectedType = data.expectedType?.coneTypeSafe<ConeKotlinType>()
val mayBeCoercionToUnitApplied = (data as? ResolutionMode.WithExpectedType)?.mayBeCoercionToUnitApplied == true